summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 15:39:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-24 15:39:09 +0000
commitc801f87e59c00f72bdeb5ce7bd0d276674665bac (patch)
tree70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/orbsvcs
parent98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff)
downloadATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp50
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h96
-rw-r--r--TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp15
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp4
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp55
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.h6
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp29
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp4
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp20
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp16
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp9
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp59
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp24
-rw-r--r--TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp30
-rw-r--r--TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h6
-rw-r--r--TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp4
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp48
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h8
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Server.cpp7
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.cpp9
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.h4
-rw-r--r--TAO/orbsvcs/IFR_Service/be_init.cpp1
-rw-r--r--TAO/orbsvcs/IFR_Service/be_produce.cpp15
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp265
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp33
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp11
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp32
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp34
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp5
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp7
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp7
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp11
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp6
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp8
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp41
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h6
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp8
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp98
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h6
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Iterator.cpp4
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Iterator.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp7
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp7
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Server_Info.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp15
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp4
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h8
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp10
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp21
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp10
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadManager.cpp30
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp36
-rw-r--r--TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Push_Handler.cpp4
-rw-r--r--TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp3
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp6
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp34
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h6
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp6
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp34
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h6
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp6
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp34
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h6
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp6
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp36
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h10
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp11
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Server.cpp4
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp14
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.h4
-rw-r--r--TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp4
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Server.cpp4
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.cpp44
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.h6
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp7
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp5
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp2
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp54
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h91
-rw-r--r--TAO/orbsvcs/TAO_Service/TAO_Service.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.cpp20
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.h2
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.cpp14
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.h2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp4
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Server.cpp4
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Server.cpp4
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.cpp5
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp34
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp56
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp18
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp54
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h12
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp13
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp82
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h22
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp33
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp31
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp31
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp13
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp52
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h6
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp29
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp30
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp37
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp16
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp39
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp23
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Service.cpp16
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp33
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp28
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp27
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h12
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp27
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp16
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h4
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp16
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp21
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp4
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp4
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp6
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp4
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h4
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/StockFactory.h2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/client.cpp9
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/server.cpp45
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp48
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/TLS_Client.h8
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/main.cpp4
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp17
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp59
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.h4
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp24
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp56
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h4
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp24
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp66
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h4
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp5
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp3
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Filter.cpp103
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Filter.h22
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/main.cpp4
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp38
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer.h10
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp42
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h6
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp12
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp4
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp36
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier.h10
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp41
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h8
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp95
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h22
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/main.cpp4
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp39
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h10
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp42
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h6
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp12
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp4
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp34
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h10
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp41
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h8
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_i.cpp14
-rw-r--r--TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp4
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp9
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h4
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp4
-rw-r--r--TAO/orbsvcs/examples/ORT/client.cpp4
-rw-r--r--TAO/orbsvcs/examples/ORT/gateway_server.cpp23
-rw-r--r--TAO/orbsvcs/examples/ORT/server.cpp18
-rw-r--r--TAO/orbsvcs/examples/PSS/Server_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/PSS/Server_i.h8
-rw-r--r--TAO/orbsvcs/examples/PSS/Simple_Naming.cpp24
-rw-r--r--TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/PSS/client.cpp18
-rw-r--r--TAO/orbsvcs/examples/PSS/server.cpp21
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp25
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp17
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp23
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp35
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp83
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp8
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h14
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp19
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.h4
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp62
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp22
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp52
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp25
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Service.cpp19
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp35
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp5
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h4
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp12
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp8
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client.cpp10
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server.cpp17
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp302
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h30
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp32
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp97
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h16
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp20
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp27
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp44
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp52
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp44
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp38
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp37
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp79
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp40
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp54
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp40
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp13
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl4
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl4
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp22
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp38
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl5
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp25
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl5
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp20
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp32
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp52
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp104
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h24
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp31
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp20
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl7
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp31
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp26
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp36
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp28
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp19
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp20
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp28
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp28
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp19
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp21
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp86
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp27
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp26
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp40
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp80
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp27
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp71
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp75
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp87
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp35
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp78
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp155
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp139
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp27
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp31
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp75
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp43
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp61
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp46
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp124
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp2144
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl154
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp6446
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl1358
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp3784
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl912
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp2044
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl344
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp67
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp19
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp121
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp39
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp119
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp30
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp25
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp58
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp68
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp35
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp50
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp25
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp84
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp40
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp27
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp215
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp53
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp35
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp25
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp75
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp22
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp44
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp28
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp48
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h46
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp19
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp13
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Iterator_i.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp29
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h20
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h54
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogStore.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp99
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.cpp326
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.h52
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp65
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h24
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp68
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h26
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp25
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl4
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp35
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h15
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp38
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp23
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp73
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h7
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp21
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Admin.cpp21
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Admin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Builder.cpp51
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp72
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h26
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp34
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.inl5
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp110
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannel.h24
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp86
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h24
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventType.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp22
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp22
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp101
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Object.cpp21
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Object.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Peer.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Peer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp26
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp22
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp13
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp62
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp73
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h16
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp26
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp46
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp95
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h16
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp15
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp29
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp19
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp30
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp30
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp21
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h16
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp127
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h22
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp64
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp36
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp33
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp38
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp13
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp110
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp75
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_T.h42
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp71
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h22
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp50
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h4
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp49
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h4
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp45
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp18
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp21
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp19
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp19
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp15
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp34
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp16
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp14
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp18
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp24
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp5
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp24
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp24
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp26
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp11
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp9
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp18
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp24
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp34
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp27
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp21
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp23
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp26
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp39
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp47
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp30
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp37
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp20
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp18
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/control.cpp14
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp15
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp15
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp25
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp31
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp19
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp24
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp36
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp34
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp20
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp30
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp28
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp23
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp24
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp23
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp30
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp23
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h4
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp29
-rw-r--r--TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp5
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp11
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h8
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp16
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp15
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp17
-rw-r--r--TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp6
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp45
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h6
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp19
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp7
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp59
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/client.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp25
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp22
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h20
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp23
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h6
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp31
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h6
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp29
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp17
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp54
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp41
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp6
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h8
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp9
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h6
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp15
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp56
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp6
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h6
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp7
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp21
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp32
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp20
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp15
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp8
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp5
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp6
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.cpp4
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.cpp14
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp6
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp3
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_tests.cpp15
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp56
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp59
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp56
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp52
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp94
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Random.h10
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp40
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp49
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h12
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp47
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h12
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp45
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h6
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp46
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h8
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp19
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp67
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp22
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h6
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp146
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h28
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp154
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h16
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp25
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp37
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp26
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp38
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp60
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h6
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp49
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.cpp7
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp64
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Complex.cpp78
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Control.cpp43
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp56
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Gateway.cpp82
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp59
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Negation.cpp60
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.cpp56
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.h4
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.cpp93
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.h10
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp34
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Reconnect.h6
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Schedule.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Schedule.h4
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp19
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Shutdown.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Timeout.cpp45
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp85
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp25
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h8
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp17
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp35
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp17
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp36
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp15
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp54
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Connect.cpp62
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Connect.h10
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Inversion.cpp12
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Inversion.h6
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.cpp53
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.h4
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp27
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Throughput.cpp4
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Throughput.h2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Consumer.cpp19
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Supplier.cpp22
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Supplier.h6
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/receiver.cpp48
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/sender.cpp49
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Consumer.cpp24
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Consumer.h6
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp23
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h6
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp45
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h10
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp143
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.h36
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.cpp25
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.h8
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Client.cpp51
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.cpp16
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp46
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h6
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp7
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp30
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h18
-rw-r--r--TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp20
-rw-r--r--TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp14
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp9
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp16
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h6
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp26
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h8
-rw-r--r--TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp15
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp11
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h6
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp9
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp37
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp4
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h4
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp48
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h6
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp13
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h4
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp11
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp14
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/consumer.cpp24
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/supplier.cpp18
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/client.cpp28
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/server.cpp20
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp35
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp25
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp30
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp12
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h8
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Hello.h4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/client.cpp12
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/server.cpp20
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp7
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server_i.cpp16
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp8
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp27
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.h6
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp26
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/client.cpp11
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server.cpp4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp44
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.h2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp7
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp63
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h14
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp17
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp7
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp117
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h6
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp10
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp575
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h24
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp37
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp33
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h4
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp5
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp7
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h6
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp21
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp15
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp9
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp24
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp9
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp9
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h8
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp34
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp9
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h8
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp13
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp31
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h8
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.h2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/client.cpp10
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/server.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp51
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h8
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp44
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.cpp39
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Filter.cpp49
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Filter.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp46
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp53
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h14
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp48
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp30
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.cpp31
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Updates.cpp35
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Updates.h8
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp23
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp22
-rw-r--r--TAO/orbsvcs/tests/Notify/Destroy/main.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp21
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp22
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp21
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp23
-rw-r--r--TAO/orbsvcs/tests/Notify/Driver/main.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp24
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp27
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp11
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp23
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp23
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp18
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp143
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h24
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp150
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h30
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp23
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp21
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp18
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp24
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp15
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h10
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp64
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp16
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h8
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp51
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Application_Command.h16
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command.cpp7
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Builder.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp29
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h10
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp10
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Driver.cpp12
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Driver.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp40
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h12
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp44
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.h12
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp27
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp33
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp35
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.h14
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp48
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h14
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp18
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp46
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h14
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp7
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp29
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h10
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp24
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp24
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp19
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp96
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h22
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp37
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h4
-rw-r--r--TAO/orbsvcs/tests/Property/client.cpp101
-rw-r--r--TAO/orbsvcs/tests/Property/client.h22
-rw-r--r--TAO/orbsvcs/tests/Property/main.cpp113
-rw-r--r--TAO/orbsvcs/tests/Property/server.cpp20
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/client.cpp15
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/server.cpp17
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/client.cpp20
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp13
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp19
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp16
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/client.cpp26
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/server.cpp27
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp12
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.h8
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/client.cpp8
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/server.cpp20
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.cpp25
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.cpp19
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/client.cpp14
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/server.cpp25
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp12
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp9
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp13
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h6
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp7
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp11
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp20
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp10
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h4
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp21
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp26
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp172
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/client.cpp172
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.cpp50
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp67
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.h16
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.cpp35
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.h4
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp38
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h12
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp5
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.h10
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.cpp54
-rw-r--r--TAO/orbsvcs/tests/Trading/export_test.cpp65
-rw-r--r--TAO/orbsvcs/tests/Trading/import_test.cpp9
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp9
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h2
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/server.cpp16
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/status_i.cpp4
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/status_i.h4
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp6
1418 files changed, 15696 insertions, 27550 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index a3245dae921..afbf70a7041 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// orbsvcs/Concurrecy_Service/Concurrency_Service
-//
-// = FILENAME
-// Concurrency_Service.cpp
-//
-// = DESCRIPTION
-// This class implements a Concurrency_Service object.
-//
-// = AUTHORS
-// Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ * @file Concurrency_Service.cpp
+ *
+ * $Id$
+ *
+ * This class implements a Concurrency_Service object.
+ *
+ *
+ * @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
#include "Concurrency_Service.h"
@@ -108,7 +105,6 @@ Concurrency_Service::init (int argc,
ACE_TEXT("%p\n"),
ACE_TEXT("init_child_poa")),
-1);
- ACE_CHECK_RETURN (-1);
if (this->parse_args (command_line.get_argc(), command_line.get_TCHAR_argv())!=0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,13 +145,13 @@ Concurrency_Service::init (int argc,
}
if (this->use_naming_service_)
- return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->init_naming_service ();
return 0;
}
int
-Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Concurrency_Service::init_naming_service (void)
{
ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
CORBA::ORB_var orb;
@@ -168,8 +164,7 @@ Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
if (result == -1)
return result;
lockset_factory_ =
- this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->my_concurrency_server_.GetLockSetFactory ()->_this ();
CosNaming::Name concurrency_context_name (1);
concurrency_context_name.length (1);
@@ -178,7 +173,6 @@ Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->concurrency_context_ =
this->naming_client_->bind_new_context (concurrency_context_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNaming::Name lockset_name (1);
lockset_name.length (1);
@@ -186,20 +180,18 @@ Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->concurrency_context_->bind (lockset_name,
lockset_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
// Run the ORB event loop.
int
-Concurrency_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Concurrency_Service::run (void)
{
ACE_DEBUG ((LM_DEBUG,
"Concurrency_Service::run (...)\n"));
- int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int retval = this->orb_manager_.run ();
if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Concurrency_Service::run"),
@@ -227,13 +219,11 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv)
ACE_TRY
{
int r = concurrency_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (r == -1)
return 1;
- concurrency_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ concurrency_service.run ();
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index ccd0fe73930..a27742a0df0 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// orbsvcs/Concurrency_Service/Concurency_Service
-//
-// = FILENAME
-// Concurrency_Service.h
-//
-// = DESCRIPTION
-// This class implements a subset of the functionality of the
-// CORBA Concurrency Service.
-//
-// = AUTHORS
-// Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ * @file Concurrency_Service.h
+ *
+ * $Id$
+ *
+ * This class implements a subset of the functionality of the
+ * CORBA Concurrency Service.
+ *
+ *
+ * @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
#ifndef _CONCURRENCY_SERVICE_H
#define _CONCURRENCY_SERVICE_H
@@ -31,73 +28,78 @@
#include "orbsvcs/Concurrency/Concurrency_Utils.h"
#include "orbsvcs/Naming/Naming_Client.h"
+/**
+ * @class Concurrency_Service
+ *
+ * @brief Defines a class that encapsulates the implementation of the
+ * concurrency service.
+ *
+ * This class uses the TAO_ORB_Manager, the TAO_Naming_Client, and
+ * the TAO_Concurrency_Server classes to implement a server for
+ * the concurrency service.
+ */
class Concurrency_Service : public TAO_ORB_Manager
{
- // = TITLE
- // Defines a class that encapsulates the implementation of the
- // concurrency service.
- // = DESCRIPTION
- // This class uses the TAO_ORB_Manager, the TAO_Naming_Client, and
- // the TAO_Concurrency_Server classes to implement a server for
- // the concurrency service.
public:
// = Initialization and termination methods.
+ /// Default Constructor.
Concurrency_Service (void);
- // Default Constructor.
+ /// Constructor taking the command-line arguments.
Concurrency_Service (int argc,
ACE_TCHAR **argv
ACE_ENV_ARG_DECL);
- // Constructor taking the command-line arguments.
+ /// Destructor.
~Concurrency_Service (void);
- // Destructor.
+ /// Initialize the Concurrency Service with the arguments.
int init (int argc,
ACE_TCHAR **argv
ACE_ENV_ARG_DECL);
- // Initialize the Concurrency Service with the arguments.
- int run (ACE_ENV_SINGLE_ARG_DECL);
- // Run the Concurrency_Service.
+ /// Run the Concurrency_Service.
+ int run (void);
private:
+ /// Parses the commandline arguments.
int parse_args (int argc, ACE_TCHAR** argv);
- // Parses the commandline arguments.
- 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
- // clients must keep track of the reference and pass 'by hand'
+ /**
+ * 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
+ * clients must keep track of the reference and pass 'by hand'
+ */
+ int init_naming_service (void);
+ /// Flag to tell wheter the naming service will be used.
int use_naming_service_;
- // Flag to tell wheter the naming service will be used.
+ /// The name of the file where we output the IOR.
const char *ior_file_name_;
- // The name of the file where we output the IOR.
+ /// The name of a file where the process stores its pid.
const char *pid_file_name_;
- // The name of a file where the process stores its pid.
+ /// The ORB manager
TAO_ORB_Manager orb_manager_;
- // The ORB manager
+ /// An instance of the name client used for registering the factory
+ /// objects.
TAO_Naming_Client naming_client_;
- // An instance of the name client used for registering the factory
- // objects.
+ /// An instance of the concurrency server.
TAO_Concurrency_Server my_concurrency_server_;
- // An instance of the concurrency server.
+ /// Factory var to register with the naming service.
CosConcurrencyControl::LockSetFactory_var lockset_factory_;
- // Factory var to register with the naming service.
+ /// Naming context for the concurrency service.
CosNaming::NamingContext_var concurrency_context_;
- // Naming context for the concurrency service.
+ /// Naming context for the naming service.
CosNaming::NamingContext_var naming_context_;
- // Naming context for the naming service.
};
#endif /* _CONCURRENCY_SERVICE_H */
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 2bb2e9205ac..d61f336f849 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -8,8 +8,8 @@
#include "ace/Argv_Type_Converter.h"
#include "ace/OS_main.h"
-ACE_RCSID (CosEvent_Service,
- CosEvent_Service,
+ACE_RCSID (CosEvent_Service,
+ CosEvent_Service,
"$Id$")
int
@@ -26,7 +26,6 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
// Intialize the ORB
CORBA::ORB_var orb =
CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Call TAO_CEC_Event_Loader::init (argc, argv) from here.
TAO_CEC_Event_Loader event_service;
@@ -49,21 +48,19 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
// Don't worry about this change yet... Let's get all the changes
// in and then we can fix the EC shutdown problem...
//
- // As inidicated above, The Typed EC implementation can now be
- // destroyed by passing -d at the command line and
+ // As inidicated above, The Typed EC implementation can now be
+ // destroyed by passing -d at the command line and
// calling destroy on the typed EC interface.
// Calling fini() completes the destruction, although most of
// this is done in TAO_CEC_TypedEventChannel::shutdown().
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
event_service.fini();
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
// Destroy the ORB
- orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index ec523388f64..5c05c2eb776 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -26,11 +26,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
// Initialize ORB.
CORBA::ORB_var orb =
CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,7 +37,6 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
const char *name = "ScheduleService";
if (command_line.get_argc() > 1)
@@ -60,7 +57,6 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
ACE_SCOPE_THREAD),
infos.out (), deps.out (), configs.out (), anomalies.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::dump_schedule (infos.in (),
deps.in (),
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index f0510a4fef0..8d57044cc9e 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -59,7 +59,6 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
// Initialize ORB.
this->orb_ =
CORBA::ORB_init (command.get_argc(), command.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
return 1;
@@ -67,7 +66,6 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
CORBA::Object_var root_poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the root POA.\n"),
@@ -75,14 +73,11 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// When we have a service name or a non local scheduler we must use the
// naming service.
@@ -98,7 +93,6 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
{
naming_obj=
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,
@@ -107,7 +101,6 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// This is the name we (potentially) register the Scheduling
@@ -125,15 +118,13 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
ACE_Config_Scheduler,
1);
- scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler = this->sched_impl_->_this ();
// Register the servant with the Naming Context....
if (!CORBA::is_nil (naming_context.in ()))
{
naming_context->rebind (schedule_name, scheduler.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
else if (this->scheduler_type_ == ES_SCHED_GLOBAL)
@@ -141,11 +132,9 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
// Get reference to a scheduler from naming service
CORBA::Object_var tmp =
naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (scheduler.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -167,13 +156,12 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
1);
this->ec_impl_ = ec_impl;
- ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl->activate ();
RtecEventChannelAdmin::EventChannel_var ec;
// If the object_id_ is empty and we don't use BiDIR GIOP, activate the
- // servant under the default POA, else create a new child POA with
+ // servant under the default POA, else create a new child POA with
// the needed policies
int persistent = ACE_OS::strcmp(this->object_id_.c_str(), "");
if ((persistent == 0) && (this->use_bidir_giop_ == false))
@@ -181,8 +169,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
// Notice that we activate *this* object with the POA, but we
// forward all the requests to the underlying EC
// implementation.
- ec = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec = this->_this ();
}
else
{
@@ -196,12 +183,10 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
policies[index++] =
root_poa->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[index++] =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if (this->use_bidir_giop_ == true)
@@ -212,7 +197,6 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
this->orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
pol
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
policies.length (index);
@@ -223,15 +207,13 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of persistentPOA is over. Destroy the Policy objects.
for (CORBA::ULong i = 0;
i < policies.length ();
++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
if (CORBA::is_nil (child_poa.in ()))
@@ -245,22 +227,18 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
child_poa->activate_object_with_id(ec_object_id.in(),
this
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var ec_obj =
child_poa->id_to_reference(ec_object_id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ec =
RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
CORBA::String_var str =
this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ACE_OS::strcmp(this->ior_file_name_.c_str(), "") != 0)
{
@@ -300,15 +278,13 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
channel_name.length (1);
channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
naming_context->rebind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT("%s; running event service\n"),
ACE_TEXT_CHAR_TO_TCHAR(__FILE__)));
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
if (bind_to_naming_service_ && !CORBA::is_nil (naming_context.in ()))
{
@@ -316,14 +292,12 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
channel_name.length (1);
channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if (!CORBA::is_nil (scheduler.in ()) &&
!CORBA::is_nil (naming_context.in ()))
{
naming_context->unbind (schedule_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -423,25 +397,24 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Event_Service::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->ec_impl_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ec_impl_->for_consumers ();
}
RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Event_Service::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->ec_impl_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ec_impl_->for_suppliers ();
}
void
-Event_Service::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Event_Service::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_impl_->destroy ();
this->orb_->shutdown ();
}
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index efd15738d4c..19b21434ce1 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -41,12 +41,12 @@ public:
// = The RtecEventChannelAdmin::Event_Channel methods
virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::Observer_Handle
append_observer (RtecEventChannelAdmin::Observer_ptr observer
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index add3c0f5153..70e156b0232 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -49,7 +49,6 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
orb_ = CORBA::ORB_init (command.get_argc(),
command.get_ASCII_argv(),
"" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
return 1;
@@ -57,7 +56,6 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
CORBA::Object_var root_poa_object =
orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the root POA.\n"),
@@ -65,18 +63,14 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var naming_obj =
orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the Naming Service.\n"),
@@ -84,14 +78,11 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
setup_scheduler(naming_context.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
- poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate();
// Activate the Event channel implementation
@@ -100,13 +91,11 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
FtRtecEventChannelAdmin::EventChannel_var ec_ior =
ec.activate(membership_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (report_factory(orb_.in(), ec_ior.in() )==-1)
return -1;
- orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb_->run();
}
ACE_CATCHANY
{
@@ -214,8 +203,7 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
ACE_Config_Scheduler,
CORBA::NO_MEMORY());
- scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ scheduler = this->sched_impl_->_this ();
if (ACE_Scheduler_Factory::server(scheduler.in()) == -1)
ACE_ERROR((LM_ERROR,"Unable to install scheduler\n"));
@@ -238,23 +226,19 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
ACE_Config_Scheduler,
CORBA::NO_MEMORY());
- scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ scheduler = this->sched_impl_->_this ();
// Register the servant with the Naming Context....
naming_context->rebind (schedule_name, scheduler.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
CORBA::Object_var tmp =
naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -281,7 +265,6 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
CORBA::String_var my_ior_string = orb->object_to_string(ec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int len = strlen(my_ior_string.in()) ;
if (stream.send_n(my_ior_string.in(), len) != len)
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index b4febf2f835..5c50d85167c 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -63,7 +63,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN(CORBA::Object::_nil());
ACE_THROW_RETURN(PortableGroup::ObjectNotCreated(), CORBA::Object::_nil());
}
@@ -83,7 +82,7 @@ void EventChannelFactory_i::delete_object (
CORBA::Object_var obj;
if (objects.find(object_id, obj) == 0) {
objects.unbind(object_id);
- //obj->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
+ //obj->shutdown();
}
}
@@ -188,7 +187,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
ACE_TRY_NEW_ENV {
CORBA::Object_var result = orb->string_to_object(ior
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (objects.bind(id, result) ==0){
return result._retn();
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index e2189bb34db..5871bfaa159 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -59,7 +59,6 @@ int main(int argc, ACE_TCHAR* argv[])
ACE_TRY {
CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args(argc, argv) == -1)
return -1;
@@ -67,24 +66,19 @@ int main(int argc, ACE_TCHAR* argv[])
CORBA::Object_var obj =
orb->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow(obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ PortableServer::POAManager_var mgr = poa->the_POAManager();
- mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate();
EventChannelFactory_i servant("factory.cfg", orb.in());
FT::GenericFactory_var event_channel_factory =
- servant._this(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servant._this();
// register to the Event Service
@@ -92,12 +86,10 @@ int main(int argc, ACE_TCHAR* argv[])
CORBA::Object_var namng_contex_object =
orb->resolve_initial_references("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow(namng_contex_object.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// register to naming service
CosNaming::Name name(1);
@@ -108,7 +100,6 @@ int main(int argc, ACE_TCHAR* argv[])
naming_context->bind(name, event_channel_factory.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Register to naming service with %s", id.c_str()));
if (kind.length())
@@ -120,7 +111,6 @@ int main(int argc, ACE_TCHAR* argv[])
// get the IOR of factory
CORBA::String_var str = orb->object_to_string(event_channel_factory.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ACE_OS::strcmp(output.c_str(), "") != 0)
{
@@ -137,9 +127,8 @@ int main(int argc, ACE_TCHAR* argv[])
}
}
- ACE_TRY_CHECK;
- orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->run();
}
ACE_CATCHANY
@@ -149,7 +138,6 @@ int main(int argc, ACE_TCHAR* argv[])
ACE_ENDTRY;
- ACE_CHECK_RETURN(1);
return 0;
}
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index e431da580ae..326d5b0157e 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -38,10 +38,8 @@ int parse_args(int argc, ACE_TCHAR** argv)
{
CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
break;
case 'n':
@@ -59,12 +57,10 @@ int parse_args(int argc, ACE_TCHAR** argv)
CosNaming::NamingContext_var naming_context =
resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ftec = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(ftec.in()))
ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
@@ -83,7 +79,6 @@ int main(int argc, ACE_TCHAR** argv)
{
orb = CORBA::ORB_init (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args(argc, argv)==-1)
return 1;
@@ -91,28 +86,23 @@ int main(int argc, ACE_TCHAR** argv)
PortableServer::POA_var
root_poa = resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// create POAManager
PortableServer::POAManager_var
- mgr = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr = root_poa->the_POAManager();
- mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate();
TAO_FTRTEC::FTEC_Gateway gateway_servant(orb.in(), ftec.in());
RtecEventChannelAdmin::EventChannel_var gateway =
gateway_servant.activate(root_poa.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ior_file_name.length())
{
CORBA::String_var str = orb->object_to_string(gateway.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *output_file=
ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()),
@@ -126,7 +116,7 @@ int main(int argc, ACE_TCHAR** argv)
ACE_OS::fclose (output_file);
}
- orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->run();
}
ACE_CATCHANY {
return 1;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 5a08f15d6d9..9d5cdd91e0a 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -92,21 +92,17 @@ int TAO::FT_FaultConsumer::init (
// Activate this consumer in the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var obj =
this->poa_->id_to_reference (this->object_id_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Narrow it to CosNotifyComm::StructuredPushConsumer.
this->consumer_ref_ = CosNotifyComm::StructuredPushConsumer::_narrow (
obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Subscribe to the FaultNotifier.
CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil ();
this->consumer_id_ = fault_notifier_->connect_structured_fault_consumer (
this->consumer_ref_.in(), filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (TAO_debug_level > 1)
{
@@ -125,7 +121,7 @@ int TAO::FT_FaultConsumer::init (
* - Disconnect from FT::FaultNotifier.
* - Deactivate from the POA.
*/
-int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_FaultConsumer::fini (void)
{
if (TAO_debug_level > 1)
@@ -153,7 +149,6 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
this->fault_notifier_->disconnect_consumer (
this->consumer_id_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 1)
{
@@ -167,7 +162,6 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate ourself from the POA.
this->poa_->deactivate_object (
this->object_id_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -179,7 +173,6 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN(1);
if (TAO_debug_level > 1)
{
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 4ba96cdee31..f92a5641fa8 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -79,7 +79,7 @@ namespace TAO
* - Disconnect from FT::FaultNotifier.
* - Deactivate from the POA.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* Accessor for a duplicate of this consumer's object reference.
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index bfc77eb5a46..3cd7243c0ac 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -157,15 +157,12 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
// Get the RootPOA.
CORBA::Object_var poa_obj = this->orb_->resolve_initial_references (
TAO_OBJID_ROOTPOA ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->poa_ = PortableServer::POA::_narrow (
poa_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// initialize the FactoryRegistry
this->factory_registry_.init (this->orb_.in (), this->poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableGroup::FactoryRegistry_var factory_registry = this->factory_registry_.reference ();
@@ -175,19 +172,15 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
this->poa_.in (),
factory_registry.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Activate ourself in the POA.
PortableServer::ObjectId_var oid = this->poa_->activate_object (
this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var this_obj = this->poa_->id_to_reference (
oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->replication_manager_ref_ = FT::ReplicationManager::_narrow (
this_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// If we were given an initial IOR string for a Fault Notifier on the
// command line, convert it to an IOR, then register the fault
@@ -196,14 +189,11 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var notifier_obj = this->orb_->string_to_object (
this->fault_notifier_ior_string_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
FT::FaultNotifier_var notifier = FT::FaultNotifier::_narrow (
notifier_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (! CORBA::is_nil (notifier.in ()))
{
this->register_fault_notifier_i (notifier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
@@ -217,21 +207,17 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
// Activate the RootPOA.
PortableServer::POAManager_var poa_mgr =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- poa_mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
+ poa_mgr->activate ();
// Register our IOR in the IORTable with the key-string
// "ReplicationManager".
CORBA::Object_var ior_table_obj =
this->orb_->resolve_initial_references (
TAO_OBJID_IORTABLE ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var ior_table =
IORTable::Table::_narrow (ior_table_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (ior_table.in ()))
{
ACE_ERROR_RETURN ( (LM_ERROR,
@@ -242,10 +228,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::String_var rm_ior_str = this->orb_->object_to_string (
this->replication_manager_ref_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ior_table->bind ("ReplicationManager", rm_ior_str.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
// Publish our IOR, either to a file or the Naming Service.
@@ -263,12 +247,10 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (
TAO_OBJID_NAMESERVICE ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->naming_context_ =
CosNaming::NamingContext::_narrow (
naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->naming_context_.in ()))
{
@@ -284,7 +266,6 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
this->this_name_,
this->replication_manager_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
if (TAO_debug_level > 1)
@@ -310,37 +291,29 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
PortableGroup::Value value;
value <<= TAO_PG_MEMBERSHIP_STYLE;
this->properties_support_.set_default_property (PortableGroup::PG_MEMBERSHIP_STYLE, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
value <<= TAO_PG_INITIAL_NUMBER_MEMBERS;
this->properties_support_.set_default_property (PortableGroup::PG_INITIAL_NUMBER_MEMBERS, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
value <<= TAO_PG_MINIMUM_NUMBER_MEMBERS;
this->properties_support_.set_default_property (PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
value <<= FT::SEMI_ACTIVE;
this->properties_support_.set_default_property (FT::FT_REPLICATION_STYLE, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
value <<= FT::CONS_APP_CTRL;
this->properties_support_.set_default_property ( FT::FT_CONSISTENCY_STYLE, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
value <<= FT::PULL;
this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_STYLE, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
value <<= FT::MEMB;
this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_GRANULARITY, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
#if 0
FaultMonitoringIntervalAndTimeoutValue times;
value <<= times;
this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_INTERVAL_AND_TIMEOUT, value ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
#endif
#if 0
@@ -361,12 +334,11 @@ int TAO::FT_ReplicationManager::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
//public
-int TAO::FT_ReplicationManager::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_ReplicationManager::fini (void)
{
int result = 0;
- result = this->fault_consumer_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->fault_consumer_.fini ();
if (this->ior_output_file_ != 0)
{
@@ -376,7 +348,6 @@ int TAO::FT_ReplicationManager::fini (ACE_ENV_SINGLE_ARG_DECL)
if (this->ns_name_ != 0)
{
this->naming_context_->unbind (this->this_name_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->ns_name_ = 0;
}
@@ -424,8 +395,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
{
//@@ should we check to see if a notifier is already registered, rather than
// simply "unregistering"?
- result = this->fault_consumer_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = this->fault_consumer_.fini ();
// Note if the fini failed, we ignore it. It may not have been registered in the first place.
@@ -451,7 +421,6 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
this->fault_notifier_.in (),
analyzer
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -636,7 +605,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically (
if (this->group_factory_.find_group (object_group, group))
{
group->set_properties_dynamically (overrides ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -696,7 +664,6 @@ TAO::FT_ReplicationManager::set_primary_member (
TAO_FT_IOGR_Property prop (tag_component);
int sts = group->set_primary_member (&prop, the_location ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
if (sts)
{
result = group->reference ();
@@ -734,7 +701,6 @@ TAO::FT_ReplicationManager::create_member (
if (this->group_factory_.find_group (object_group, group))
{
group->create_member (the_location, type_id, the_criteria ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
result = group->reference ();
}
else
@@ -774,7 +740,6 @@ TAO::FT_ReplicationManager::add_member (
the_location,
member
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
result = group->reference ();
@@ -809,10 +774,8 @@ TAO::FT_ReplicationManager::remove_member (
if (this->group_factory_.find_group (object_group, group))
{
group->remove_member (the_location ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (result._retn ());
- group->minimum_populate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (result._retn ());
+ group->minimum_populate ();
//@@ how about the case where the member was removed successfully,
// but for one reason or another we were unable to bring the group
// back up to minimum_number_of_replicas?
@@ -842,7 +805,6 @@ TAO::FT_ReplicationManager::locations_of_members (
{
result = group->locations_of_members (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else
{
@@ -880,7 +842,6 @@ TAO::FT_ReplicationManager::get_object_group_id (
if (this->group_factory_.find_group (object_group, group))
{
group->get_object_group_id ();
- ACE_CHECK_RETURN (result);
result = group->get_object_group_id ();
}
else
@@ -973,7 +934,6 @@ TAO::FT_ReplicationManager::get_member_ref (
if (this->group_factory_.find_group (object_group, group))
{
result = group->get_member_reference (the_location ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil());
}
else
{
@@ -1015,7 +975,6 @@ TAO::FT_ReplicationManager::create_object (
= this->properties_support_.find_typeid_properties (
type_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
TAO::PG_Object_Group * group
= this->group_factory_.create_group (
@@ -1023,10 +982,8 @@ TAO::FT_ReplicationManager::create_object (
the_criteria,
typeid_properties
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
- group->initial_populate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ group->initial_populate ();
//@@ on error we should remove the group from the Group_Factory
// doing this "right" will require a var-type pointer to the object group
// that knows about the factory, too.
@@ -1040,7 +997,6 @@ TAO::FT_ReplicationManager::create_object (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableGroup::GenericFactory::FactoryCreationId_var factory_id = factory_id_ptr;
PortableGroup::ObjectGroupId group_id = group->get_object_group_id ();
factory_id <<= group_id;
@@ -1064,7 +1020,6 @@ TAO::FT_ReplicationManager::delete_object (
this->group_factory_.delete_group (
group_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index a38ed1ec911..4b333eabc6a 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -117,7 +117,7 @@ namespace TAO
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* Idle-time activity.
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 4606008727c..8a906ecd3c2 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -400,7 +400,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
CORBA::Boolean got_tagged_component =
temp_ft_prop.get_tagged_component (
iogr, ft_group_tagged_component ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (got_tagged_component)
{
// Create a new TAO_FT_IOGR_Property with the tagged
@@ -410,13 +409,11 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
// Check to see if a primary is set.
CORBA::Boolean primary_is_set = ft_prop.is_primary_set (
iogr ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (primary_is_set)
{
// Get the primary object.
CORBA::Object_var primary_obj = ft_prop.get_primary (
iogr ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (primary_obj.in()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -430,7 +427,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
CORBA::Object_var failed_obj =
this->replication_manager_->get_member_ref (
iogr, location ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (failed_obj.in()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -443,7 +439,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
// Are the two object refs (primary and failed) equivalent?
CORBA::Boolean equiv = primary_obj->_is_equivalent (
failed_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (equiv)
{
object_is_primary = 1;
@@ -499,7 +494,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
this->replication_manager_->get_object_group_ref_from_id (
fault_event_desc.object_group_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This should not happen, but let us be safe.
if (CORBA::is_nil (the_object_group.in()))
@@ -517,7 +511,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
properties = this->replication_manager_->get_properties (
the_object_group.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -794,7 +787,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::remove_failed_member (
iogr,
fault_event_desc.location.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
new_iogr = temp_iogr._retn ();
}
ACE_CATCHANY
@@ -827,7 +819,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
this->replication_manager_->locations_of_members (
iogr
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Choose the first location as our new primary location.
if (locations->length() >= 1)
@@ -836,7 +827,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
iogr,
(*locations)[0]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -881,7 +871,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
this->replication_manager_->locations_of_members (
iogr
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong num_members = locations->length();
// If it is less than the MinimumNumberMembers property, add
@@ -896,7 +885,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
PortableGroup::FactoryRegistry_var factory_registry =
this->replication_manager_->get_factory_registry (
fake_criteria ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// @@ DLW SAYS: we need to find out the role played by this object
@@ -906,7 +894,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
PortableGroup::FactoryInfos_var factories_by_type =
factory_registry->list_factories_by_role (
fault_event_desc.type_id.in(), type_id ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Build a set of locations of factories for this type that we
@@ -946,7 +933,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
fault_event_desc.type_id.in(),
fake_criteria
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Stop adding members when we reach the value of the
// MinimumNumberMembers property.
@@ -990,19 +976,16 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::location_failure (
PortableGroup::FactoryRegistry_var factory_registry =
this->replication_manager_->get_factory_registry (
fake_criteria ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Unregister all factories at the failed location.
factory_registry->unregister_factory_by_location (
fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Determine all the object groups that had members at that
// location.
PortableGroup::ObjectGroups_var object_groups_at_location =
this->replication_manager_->groups_at_location (
fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Handle each one of them as a single replica failure.
for (CORBA::ULong i=0;
@@ -1013,13 +996,11 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::location_failure (
fault_event_desc.object_group_id =
this->replication_manager_->get_object_group_id (
object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get type id of this object group.
fault_event_desc.type_id =
this->replication_manager_->type_id (
object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Handle it as a single replica failure.
result = this->single_replica_failure (fault_event_desc);
@@ -1059,7 +1040,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
PortableGroup::FactoryRegistry_var factory_registry =
this->replication_manager_->get_factory_registry (
fake_criteria ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Unregister the factory at the failed location associated with
// the role.
@@ -1068,14 +1048,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
fault_event_desc.type_id.in(),
fault_event_desc.location.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get all the object groups that had members at that
// location.
PortableGroup::ObjectGroups_var object_groups_at_location =
this->replication_manager_->groups_at_location (
fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// For each one, if it was of the same type as the failed type,
// handle it as a single replica failure.
@@ -1087,13 +1065,11 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
fault_event_desc.object_group_id =
this->replication_manager_->get_object_group_id (
object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get type id of this object group.
PortableGroup::TypeId_var type_id =
this->replication_manager_->type_id (
object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the type id is the same as the failed type id...
if (ACE_OS::strcmp (type_id.in(), fault_event_desc.type_id.in()) == 0)
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 0efefef03cd..e6e7f35f24b 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -84,7 +84,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
shutdown_i ();
}
ACE_DECLARE_NEW_ENV;
- fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+ fini ();
this->threadManager_.close ();
}
@@ -216,7 +216,6 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -228,7 +227,6 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
@@ -238,27 +236,22 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
// Register with the POA.
this->objectId_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// find my IOR
CORBA::Object_var this_obj =
this->poa_->id_to_reference (objectId_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->ior_ = this->orb_->object_to_string (this_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->identity_ = "FaultDetectorFactory";
@@ -269,19 +262,15 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
ACE_TRY_NEW_ENV
{
CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (replication_manager_.in ()))
{
// capture the default notifier
- this->notifier_ = this->replication_manager_->get_fault_notifier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->notifier_ = this->replication_manager_->get_fault_notifier ();
// register with ReplicationManager::RegistrationFactory
PortableGroup::Criteria criteria(0);
this->factory_registry_ = this->replication_manager_->get_factory_registry (criteria ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (! CORBA::is_nil(factory_registry_.in ()))
{
@@ -301,7 +290,6 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
FT::FAULT_DETECTOR_ROLE_NAME,
info
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"FaultDetector Registration complete.\n"
@@ -346,7 +334,6 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(naming_obj.in ())){
ACE_ERROR_RETURN ((LM_ERROR,
@@ -356,20 +343,18 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
this->naming_context_ =
::CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->this_name_.length (1);
this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
this->naming_context_->rebind (this->this_name_, this_obj.in() //CORBA::Object::_duplicate(this_obj)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return result;
}
-int TAO::FT_FaultDetectorFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_FaultDetectorFactory_i::fini (void)
{
if (this->ior_output_file_ != 0)
{
@@ -389,7 +374,6 @@ int TAO::FT_FaultDetectorFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
FT::FAULT_DETECTOR_ROLE_NAME,
this->location_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->registered_ = 0;
}
return 0;
@@ -496,7 +480,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::change_properties);
}
-void TAO::FT_FaultDetectorFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO::FT_FaultDetectorFactory_i::shutdown (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -704,7 +688,7 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::delete_object);
}
-CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive)
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index a28eebffe56..590a603bac1 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -123,7 +123,7 @@ namespace TAO
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* Idle-time activity.
@@ -163,7 +163,7 @@ namespace TAO
, PortableGroup::InvalidProperty
));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -197,7 +197,7 @@ namespace TAO
//////////////////////////////////////////
// CORBA interface PullMonitorable methods
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/////////////////////////
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index 60d749ef0dd..0d86fea6734 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -89,9 +89,8 @@ void TAO::Fault_Detector_i::run()
{
ACE_TRY_NEW_ENV
{
- if (this->monitorable_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER))
+ if (this->monitorable_->is_alive())
{
- ACE_TRY_CHECK;
// use this rather than ACE_OS::sleep
// to allow the nap to be interruped see request_quit
this->sleep_.wait (&sleep_time_, 0);
@@ -167,7 +166,6 @@ void TAO::Fault_Detector_i::notify()
}
this->notifier_->push_structured_fault(vEvent.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 5)
{
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index e120b9a2cc7..c04ce2cf8ef 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -84,8 +84,7 @@ TAO::FT_FaultNotifier_i::~FT_FaultNotifier_i ()
{
ACE_TRY_NEW_ENV
{
- fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fini ();
}
ACE_CATCHALL
{
@@ -196,16 +195,15 @@ const char * TAO::FT_FaultNotifier_i::identity () const
return this->identity_.c_str();
}
-PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (void)
{
return this->poa_.in();
}
-void TAO::FT_FaultNotifier_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
+void TAO::FT_FaultNotifier_i::_remove_ref (void)
{
- notify_channel_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ notify_channel_->destroy();
ACE_ERROR ((LM_ERROR,
"FaultNotifier (%P|%t) _remove_ref setting gone\n"
@@ -213,7 +211,7 @@ void TAO::FT_FaultNotifier_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
this->gone_ = 1;
}
-int TAO::FT_FaultNotifier_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_FaultNotifier_i::fini (void)
{
if (this->ior_output_file_ != 0)
{
@@ -232,7 +230,6 @@ int TAO::FT_FaultNotifier_i::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
this->replication_manager_->register_fault_notifier(::FT::FaultNotifier::_nil ());
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"FaultNotifier unregistered from ReplicationManager.\n"
));
@@ -261,7 +258,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -273,7 +269,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
@@ -283,27 +278,22 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
// find my IOR
CORBA::Object_var this_obj =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
this->ior_ = this->orb_->object_to_string (this_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
////////////////////////////////////////////////
@@ -311,7 +301,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
CosNotifyChannelAdmin::EventChannelFactory_var notify_factory =
TAO_Notify_EventChannelFactory_i::create (poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
CosNotification::QoSProperties initial_qos;
CosNotification::AdminProperties initial_admin;
this->notify_channel_ =
@@ -319,16 +308,13 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
initial_admin,
channel_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
- this->filter_factory_ = this->notify_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->filter_factory_ = this->notify_channel_->default_filter_factory ();
///////////////////////////
// Producer registration
- this->supplier_admin_ = this->notify_channel_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->supplier_admin_ = this->notify_channel_->default_supplier_admin ();
::CosNotifyChannelAdmin::ProxyID proxyId = 0;
@@ -339,12 +325,10 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
::CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxyId
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
structured_proxy_push_consumer_
= ::CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(consumer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -358,7 +342,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
this->structured_proxy_push_consumer_->connect_structured_push_supplier (stubPushSupplier.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
////////////////////
// Sequence producer
@@ -367,12 +350,10 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
::CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxyId
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->sequence_proxy_push_consumer_
= ::CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(consumer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -386,13 +367,11 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (stubSeqPushSupplier.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
///////////////////////////
// Consumer registration
// find the channel administrator for consumers
- this->consumer_admin_ = this->notify_channel_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->consumer_admin_ = this->notify_channel_->default_consumer_admin ();
if (CORBA::is_nil (this->consumer_admin_.in ()))
{
ACE_ERROR ((LM_ERROR,
@@ -409,9 +388,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
ACE_TRY_NEW_ENV
{
CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (replication_manager_.in ()))
{
// @@: should we check to see if there's already one registered?
@@ -472,7 +449,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(naming_obj.in ())){
ACE_ERROR_RETURN ((LM_ERROR,
@@ -482,7 +458,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->naming_context_.in ()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -494,7 +469,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
this->naming_context_->rebind (this->this_name_, this_obj.in() //CORBA::Object::_duplicate(this_obj)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
@@ -750,7 +724,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
METHOD_RETURN(TAO::FT_FaultNotifier_i::disconnect_consumer);
}
-CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1;
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index 1f5e672eaed..fa0ed80c588 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -73,7 +73,7 @@ namespace TAO
* Prepare to exit
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* Identify this fault notifier.
@@ -132,15 +132,15 @@ namespace TAO
//////////////////////////////////////////
// CORBA interface PullMonitorable methods
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/////////////////////////////////////////
// Override CORBA servant virtual methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _remove_ref (void);
/////////////////////////
// Implementation methods
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index d6947d62727..0349058c60e 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -17,7 +17,6 @@ main (int argc, char *argv[])
ACE_TRY
{
int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status != 0)
{
@@ -25,11 +24,9 @@ main (int argc, char *argv[])
}
else
{
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
- status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ status = server.fini ();
if (status == -1)
{
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index cf0d1c13b3c..e80a6be95c0 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -35,7 +35,6 @@ IFR_Service::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = this->my_ifr_server_.init_with_orb (argc,
argv,
@@ -54,26 +53,23 @@ IFR_Service::init (int argc,
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-IFR_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+IFR_Service::run (void)
{
this->orb_->run (0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-IFR_Service::fini (ACE_ENV_SINGLE_ARG_DECL)
+IFR_Service::fini (void)
{
ACE_TRY
{
this->my_ifr_server_.fini ();
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -82,7 +78,6 @@ IFR_Service::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index ac7970f348b..1ce904f9248 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -46,10 +46,10 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Shut down the IFR Service.
- int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int fini (void);
/// Run the IFR service.
- int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int run (void);
protected:
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 8327a82601f..55bba536d6f 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -76,7 +76,6 @@ BE_ifr_orb_init (int &ac, char *av[])
av,
0
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 043d02b66dc..3b917f4af3b 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -99,7 +99,7 @@ BE_abort (void)
}
void
-BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
+BE_create_holding_scope (void)
{
CORBA::ModuleDef_ptr scope = CORBA::ModuleDef::_nil ();
@@ -107,7 +107,6 @@ BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Contained_var result =
be_global->repository ()->lookup_id (be_global->holding_scope_name ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Will live until the repository goes away for good.
if (CORBA::is_nil (result.in ()))
@@ -119,25 +118,22 @@ BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
"1.0"
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
}
else
{
scope = CORBA::ModuleDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
be_global->holding_scope (scope);
}
int
-BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_DECL)
+BE_ifr_repo_init (void)
{
CORBA::Object_var object =
be_global->orb ()->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (object.in ()))
{
@@ -152,7 +148,6 @@ BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Repository_var repo =
CORBA::Repository::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (repo.in ()))
{
@@ -176,16 +171,14 @@ BE_produce (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- int status = BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int status = BE_ifr_repo_init ();
if (status != 0)
{
return;
}
- BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ BE_create_holding_scope ();
// Get the root node.
AST_Decl *d = idl_global->root ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 31f082877d2..bade3a94ef5 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -123,7 +123,6 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
this->predefined_type_to_pkind (node)
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -155,7 +154,6 @@ ifr_adding_visitor::visit_module (AST_Module *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -171,7 +169,6 @@ ifr_adding_visitor::visit_module (AST_Module *node)
node->version ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -187,8 +184,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
else
{
CORBA::DefinitionKind kind =
- prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->def_kind ();
if (kind == CORBA::dk_Module)
{
@@ -203,7 +199,6 @@ ifr_adding_visitor::visit_module (AST_Module *node)
new_def =
CORBA::ComponentIR::Container::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -271,14 +266,12 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
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
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -314,38 +307,32 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
if (node->ifr_fwd_added () == 0)
{
CORBA::DefinitionKind kind =
- prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->def_kind ();
if (kind == CORBA::dk_Interface)
{
CORBA::InterfaceDef_var iface =
CORBA::InterfaceDef::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var contents =
iface->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length = contents->length ();
for (CORBA::ULong i = 0; i < length; ++i)
{
- contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ contents[i]->destroy ();
}
}
else
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
int status = this->create_interface_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -365,7 +352,6 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
result =
be_global->repository ()->lookup_id (parents[i]->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If one of our interface's parents is not in the repository,
// that means that it has not yet been seen (even as a
@@ -385,7 +371,6 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
bases[i] =
CORBA::InterfaceDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (bases[i]))
{
@@ -403,7 +388,6 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
CORBA::InterfaceDef_var extant_def =
CORBA::InterfaceDef::_narrow (prev_def. in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->base_interfaces (bases
ACE_ENV_ARG_PARAMETER);
@@ -472,7 +456,6 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -505,7 +488,6 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (i->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -545,7 +527,6 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
);
}
- ACE_TRY_CHECK;
}
else
{
@@ -589,7 +570,6 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
{
this->element_type (node->boxed_type ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Container_ptr current_scope =
CORBA::Container::_nil ();
@@ -604,7 +584,6 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -646,14 +625,12 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
{
int status = this->create_value_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -689,39 +666,33 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
if (node->ifr_fwd_added () == 0)
{
CORBA::DefinitionKind kind =
- prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->def_kind ();
if (kind == CORBA::dk_Value)
{
CORBA::ValueDef_var value =
CORBA::ValueDef::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var contents =
value->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length = contents->length ();
for (CORBA::ULong i = 0; i < length; ++i)
{
- contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ contents[i]->destroy ();
}
}
else
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
int status =
this->create_value_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -732,7 +703,6 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
CORBA::ExtValueDef_var extant_def =
CORBA::ExtValueDef::_narrow (prev_def. in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Concrete base value.
@@ -740,11 +710,9 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
this->fill_base_value (base_vt.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->base_value (base_vt.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Abstract base values.
@@ -752,11 +720,9 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
this->fill_abstract_base_values (abstract_base_values,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->abstract_base_values (abstract_base_values
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Supported interfaces.
@@ -764,11 +730,9 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
this->fill_supported_interfaces (supported,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->supported_interfaces (supported
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Intializers.
@@ -776,25 +740,20 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
this->fill_initializers (initializers,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->ext_initializers (initializers
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Truncatable, abstract, custom.
extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
node->ifr_added (1);
@@ -860,7 +819,6 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -893,7 +851,6 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (v->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -931,7 +888,6 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
initializers
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -976,14 +932,12 @@ ifr_adding_visitor::visit_component (AST_Component *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
{
int status = this->create_component_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -1019,8 +973,7 @@ ifr_adding_visitor::visit_component (AST_Component *node)
if (node->ifr_fwd_added () == 0)
{
CORBA::DefinitionKind kind =
- prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->def_kind ();
if (kind == CORBA::dk_Component)
{
@@ -1029,31 +982,26 @@ ifr_adding_visitor::visit_component (AST_Component *node)
prev_def.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var contents =
value->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length = contents->length ();
for (CORBA::ULong i = 0; i < length; ++i)
{
- contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ contents[i]->destroy ();
}
}
else
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
int status =
this->create_component_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -1066,52 +1014,42 @@ ifr_adding_visitor::visit_component (AST_Component *node)
prev_def.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::InterfaceDefSeq supported_interfaces;
this->fill_supported_interfaces (supported_interfaces,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->supported_interfaces (supported_interfaces
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ComponentIR::ComponentDef_var base_component;
this->fill_base_component (base_component.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->base_component (base_component.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_provides (node,
extant_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_uses (node,
extant_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_emits (node,
extant_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_publishes (node,
extant_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_consumes (node,
extant_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
node->ifr_added (1);
@@ -1177,7 +1115,6 @@ ifr_adding_visitor::visit_component (AST_Component *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -1211,7 +1148,6 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (c->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -1225,7 +1161,6 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
current_scope
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
// If our full definition is found in this IDL file, we go
// ahead and create the full entry now.
@@ -1242,12 +1177,10 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
this->fill_supported_interfaces (supported_interfaces,
c
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->fill_base_component (base_component.out (),
c
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->ir_current_ =
@@ -1259,7 +1192,6 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
supported_interfaces
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
// Might as well go ahead and complete the repository
// entry now, if we can - we're halfway there already.
@@ -1270,32 +1202,26 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
this->visit_all_provides (c,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_uses (c,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_emits (c,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_publishes (c,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->visit_all_consumes (c,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
else
@@ -1341,14 +1267,12 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
{
int status = this->create_event_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -1384,8 +1308,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
if (node->ifr_fwd_added () == 0)
{
CORBA::DefinitionKind kind =
- prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->def_kind ();
if (kind == CORBA::dk_Value)
{
@@ -1394,31 +1317,26 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
prev_def.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var contents =
event->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length = contents->length ();
for (CORBA::ULong i = 0; i < length; ++i)
{
- contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ contents[i]->destroy ();
}
}
else
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
int status =
this->create_event_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -1429,7 +1347,6 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
CORBA::ComponentIR::EventDef_var extant_def =
CORBA::ComponentIR::EventDef::_narrow (prev_def. in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Concrete base value.
@@ -1437,11 +1354,9 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
this->fill_base_value (base_vt.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->base_value (base_vt.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Abstract base values.
@@ -1449,11 +1364,9 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
this->fill_abstract_base_values (abstract_base_values,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->abstract_base_values (abstract_base_values
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Supported interfaces.
@@ -1461,11 +1374,9 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
this->fill_supported_interfaces (supported,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->supported_interfaces (supported
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Intializers.
@@ -1473,25 +1384,20 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
this->fill_initializers (initializers,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->ext_initializers (initializers
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Truncatable, abstract, custom.
extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
node->ifr_added (1);
@@ -1557,7 +1463,6 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -1590,7 +1495,6 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (v->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -1616,7 +1520,6 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
current_scope
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::Boolean abstract =
static_cast<CORBA::Boolean> (v->is_abstract ());
@@ -1635,7 +1538,6 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
initializers
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -1680,14 +1582,12 @@ ifr_adding_visitor::visit_home (AST_Home *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
{
int status = this->create_home_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -1723,8 +1623,7 @@ ifr_adding_visitor::visit_home (AST_Home *node)
if (node->ifr_fwd_added () == 0)
{
CORBA::DefinitionKind kind =
- prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->def_kind ();
if (kind == CORBA::dk_Component)
{
@@ -1733,31 +1632,26 @@ ifr_adding_visitor::visit_home (AST_Home *node)
prev_def.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var contents =
value->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length = contents->length ();
for (CORBA::ULong i = 0; i < length; ++i)
{
- contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ contents[i]->destroy ();
}
}
else
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
int status =
this->create_home_def (node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return status;
}
@@ -1777,7 +1671,6 @@ ifr_adding_visitor::visit_home (AST_Home *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -1813,7 +1706,6 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -1839,8 +1731,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
// second time and we want to just update ir_current_.
if (node->ifr_added () == 0 && this->in_reopened_ == 0)
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
return this->visit_structure (node);
}
@@ -1848,7 +1739,6 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -1895,7 +1785,6 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -1932,7 +1821,6 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
members
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -1958,8 +1846,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
// second time and we want to just update ir_current_.
if (node->ifr_added () == 0 && this->in_reopened_ == 0)
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
return this->visit_enum (node);
}
@@ -1969,7 +1856,6 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
this->ir_current_ =
CORBA::EnumDef::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -2043,7 +1929,6 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
// Updates ir_current_.
this->get_referenced_type (type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::AttributeMode mode =
node->readonly () ? CORBA::ATTR_READONLY : CORBA::ATTR_NORMAL;
@@ -2052,13 +1937,11 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
this->fill_get_exceptions (get_exceptions,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ExceptionDefSeq set_exceptions;
this->fill_set_exceptions (set_exceptions,
node
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Container_ptr current_scope =
CORBA::Container::_nil ();
@@ -2066,15 +1949,13 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
if (be_global->ifr_scopes ().top (current_scope) == 0)
{
CORBA::DefinitionKind kind =
- current_scope->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ current_scope->def_kind ();
if (kind == CORBA::dk_Value || kind == CORBA::dk_Event)
{
CORBA::ExtValueDef_var value =
CORBA::ExtValueDef::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ExtAttributeDef_var new_def =
value->create_ext_attribute (
@@ -2087,7 +1968,6 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
set_exceptions
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -2096,7 +1976,6 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
CORBA::InterfaceAttrExtension_var iface =
CORBA::InterfaceAttrExtension::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ExtAttributeDef_var new_def =
iface->create_ext_attribute (
@@ -2109,7 +1988,6 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
set_exceptions
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
}
else
@@ -2149,7 +2027,6 @@ ifr_adding_visitor::visit_union (AST_Union *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -2177,8 +2054,7 @@ ifr_adding_visitor::visit_union (AST_Union *node)
// second time and we want to just update ir_current_.
if (node->ifr_added () == 0 && this->in_reopened_ == 0)
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
return this->visit_union (node);
}
@@ -2186,7 +2062,6 @@ ifr_adding_visitor::visit_union (AST_Union *node)
this->ir_current_ =
CORBA::UnionDef::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -2217,7 +2092,6 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Nothing prevents this constant's repo id from already being
// in the repository as another type, if it came from another
@@ -2235,8 +2109,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
// second time and we want to just update ir_current_.
if (node->ifr_added () == 0 && this->in_reopened_ == 0)
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
}
else
{
@@ -2256,11 +2129,9 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
CORBA::Contained_var contained =
be_global->repository ()->lookup_id (td->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->ir_current_ = CORBA::IDLType::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -2268,7 +2139,6 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
this->ir_current_ =
be_global->repository ()->get_primitive (pkind
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
CORBA::Any any;
@@ -2289,7 +2159,6 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
any
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -2322,7 +2191,6 @@ ifr_adding_visitor::visit_array (AST_Array *node)
{
this->element_type (node->base_type ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AST_Expression **dims = node->dims ();
@@ -2334,7 +2202,6 @@ ifr_adding_visitor::visit_array (AST_Array *node)
this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -2357,7 +2224,6 @@ ifr_adding_visitor::visit_sequence (AST_Sequence *node)
{
this->element_type (node->base_type ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->ir_current_ =
be_global->repository ()->create_sequence (
@@ -2365,7 +2231,6 @@ ifr_adding_visitor::visit_sequence (AST_Sequence *node)
this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -2404,7 +2269,6 @@ ifr_adding_visitor::visit_string (AST_String *node)
ACE_ENV_ARG_PARAMETER);
}
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -2431,7 +2295,6 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
{
this->element_type (node->base_type ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Container_ptr current_scope =
CORBA::Container::_nil ();
@@ -2446,7 +2309,6 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -2529,7 +2391,6 @@ ifr_adding_visitor::visit_native (AST_Native *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -2545,7 +2406,6 @@ ifr_adding_visitor::visit_native (AST_Native *node)
node->version ()
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
else
{
@@ -2571,8 +2431,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
// second time and we want to just update ir_current_.
if (node->ifr_added () == 0 && this->in_reopened_ == 0)
{
- prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_native (node);
@@ -2581,7 +2440,6 @@ ifr_adding_visitor::visit_native (AST_Native *node)
this->ir_current_ =
CORBA::NativeDef::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -2791,7 +2649,6 @@ ifr_adding_visitor::element_type (AST_Type *base_type
CORBA::Contained_var contained =
be_global->repository ()->lookup_id (base_type->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (contained.in ()))
{
@@ -2804,7 +2661,6 @@ ifr_adding_visitor::element_type (AST_Type *base_type
this->ir_current_ = CORBA::IDLType::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -2828,7 +2684,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
result =
be_global->repository ()->lookup_id (parents[i]->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// If we got to visit_interface() from a forward declared interface,
// this node may not yet be in the repository.
@@ -2852,14 +2707,12 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
bases[i] =
CORBA::AbstractInterfaceDef::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
abs_bases[i] =
CORBA::AbstractInterfaceDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
if (CORBA::is_nil (abs_bases[i]))
@@ -2885,7 +2738,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
result =
be_global->repository ()->lookup_id (parents[i]->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// If we got to visit_interface() from a forward declared interface,
// this node may not yet be in the repository.
@@ -2908,13 +2760,11 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
bases[i] = CORBA::InterfaceDef::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
bases[i] = CORBA::InterfaceDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
if (CORBA::is_nil (bases[i]))
@@ -2972,7 +2822,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
);
}
- ACE_CHECK_RETURN (-1);
node->ifr_added (1);
@@ -2980,7 +2829,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
CORBA::Container_var new_scope =
CORBA::Container::_narrow (new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
{
@@ -3059,25 +2907,21 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
this->fill_base_value (base_value.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ValueDefSeq abstract_base_values;
this->fill_abstract_base_values (abstract_base_values,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::InterfaceDefSeq supported_interfaces;
this->fill_supported_interfaces (supported_interfaces,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ExtInitializerSeq initializers;
this->fill_initializers (initializers,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ExtValueDef_var new_def =
current_scope->create_ext_value (
@@ -3093,7 +2937,6 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
initializers
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
node->ifr_added (1);
@@ -3101,7 +2944,6 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
CORBA::Container_var new_scope =
CORBA::Container::_narrow (new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
{
@@ -3180,18 +3022,15 @@ ifr_adding_visitor::create_component_def (AST_Component *node
this->fill_base_component (base_component.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::InterfaceDefSeq supported_interfaces;
this->fill_supported_interfaces (supported_interfaces,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ComponentIR::Container_var ccm_scope =
CORBA::ComponentIR::Container::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ComponentIR::ComponentDef_var new_def =
ccm_scope->create_component (node->repoID (),
@@ -3200,7 +3039,6 @@ ifr_adding_visitor::create_component_def (AST_Component *node
base_component.in (),
supported_interfaces
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
node->ifr_added (1);
@@ -3232,27 +3070,22 @@ ifr_adding_visitor::create_component_def (AST_Component *node
this->visit_all_provides (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->visit_all_uses (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->visit_all_emits (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->visit_all_publishes (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->visit_all_consumes (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// This spot in the AST doesn't necessarily have to be the
// interface definition - it could be any reference to it.
@@ -3306,30 +3139,25 @@ ifr_adding_visitor::create_home_def (AST_Home *node
this->fill_base_home (base_home.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ComponentIR::ComponentDef_var managed_component;
this->fill_managed_component (managed_component.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::InterfaceDefSeq supported_interfaces;
this->fill_supported_interfaces (supported_interfaces,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ValueDef_var primary_key;
this->fill_primary_key (primary_key.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ComponentIR::Container_var ccm_scope =
CORBA::ComponentIR::Container::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ComponentIR::HomeDef_var new_def =
ccm_scope->create_home (node->repoID (),
@@ -3340,7 +3168,6 @@ ifr_adding_visitor::create_home_def (AST_Home *node
supported_interfaces,
primary_key.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
node->ifr_added (1);
@@ -3348,7 +3175,6 @@ ifr_adding_visitor::create_home_def (AST_Home *node
CORBA::Container_var new_scope =
CORBA::Container::_narrow (new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
{
@@ -3380,12 +3206,10 @@ ifr_adding_visitor::create_home_def (AST_Home *node
this->visit_all_factories (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->visit_all_finders (node,
new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// This spot in the AST doesn't necessarily have to be the
// interface definition - it could be any reference to it.
@@ -3439,30 +3263,25 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
this->fill_base_value (base_value.out (),
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ValueDefSeq abstract_base_values;
this->fill_abstract_base_values (abstract_base_values,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::InterfaceDefSeq supported_interfaces;
this->fill_supported_interfaces (supported_interfaces,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ExtInitializerSeq initializers;
this->fill_initializers (initializers,
node
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ComponentIR::Container_var ccm_scope =
CORBA::ComponentIR::Container::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::ExtValueDef_var new_def =
ccm_scope->create_event (
@@ -3478,7 +3297,6 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
initializers
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
node->ifr_added (1);
@@ -3486,7 +3304,6 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
CORBA::Container_var new_scope =
CORBA::Container::_narrow (new_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
{
@@ -3587,12 +3404,10 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
CORBA::Contained_var holder =
be_global->repository ()->lookup_id (bt->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->ir_current_ =
CORBA::IDLType::_narrow (holder.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
CORBA::Visibility vis = CORBA::PUBLIC_MEMBER;
@@ -3627,12 +3442,10 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
-1
);
}
- ACE_TRY_CHECK;
CORBA::ValueDef_var vt =
CORBA::ValueDef::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ValueMemberDef_var vm =
vt->create_value_member (node->repoID (),
@@ -3641,7 +3454,6 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
this->ir_current_.in (),
vis
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -3687,12 +3499,10 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
}
}
@@ -3716,7 +3526,6 @@ ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result,
base_value->repoID ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
if (!CORBA::is_nil (holder.in ()))
{
@@ -3746,7 +3555,6 @@ ifr_adding_visitor::fill_base_component (
base_component->repoID ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
if (!CORBA::is_nil (holder.in ()))
{
@@ -3774,7 +3582,6 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
base_home->repoID ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
if (!CORBA::is_nil (holder.in ()))
{
@@ -3811,7 +3618,6 @@ ifr_adding_visitor::fill_managed_component (
CORBA::Contained_var holder =
be_global->repository ()->lookup_id (managed_component->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (holder.in ()))
{
@@ -3846,7 +3652,6 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
CORBA::Contained_var holder =
be_global->repository ()->lookup_id (primary_key->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (holder.in ()))
{
@@ -3896,7 +3701,6 @@ ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
result[first_abs ? i : i - 1] =
CORBA::ValueDef::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -3978,7 +3782,6 @@ ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result,
result[i] =
CORBA::InterfaceDef::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -4154,12 +3957,10 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
holder = be_global->repository ()->lookup_id (d->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
result[index] =
CORBA::ExceptionDef::_narrow (holder.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4189,7 +3990,6 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
result[index].type_def =
CORBA::IDLType::_duplicate (this->ir_current_.in ());
- ACE_CHECK;
result[index].mode = CORBA::PARAM_IN;
}
@@ -4215,11 +4015,9 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
i.next (tmp);
contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
interface_type = CORBA::InterfaceDef::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_CString str (node->repoID ());
local_name = tmp->id->get_string ();
@@ -4229,7 +4027,6 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
tmp->impl->version (),
interface_type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4253,11 +4050,9 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
i.next (tmp);
contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
interface_type = CORBA::InterfaceDef::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_CString str (node->repoID ());
local_name = tmp->id->get_string ();
@@ -4268,7 +4063,6 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
interface_type.in (),
static_cast<CORBA::Boolean> (tmp->is_multiple)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4292,12 +4086,10 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
i.next (tmp);
contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
event_type =
CORBA::ComponentIR::EventDef::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_CString str (node->repoID ());
local_name = tmp->id->get_string ();
@@ -4307,7 +4099,6 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
tmp->impl->version (),
event_type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4331,12 +4122,10 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
i.next (tmp);
contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
event_type =
CORBA::ComponentIR::EventDef::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_CString str (node->repoID ());
local_name = tmp->id->get_string ();
@@ -4346,7 +4135,6 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
tmp->impl->version (),
event_type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4370,12 +4158,10 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
i.next (tmp);
contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
event_type =
CORBA::ComponentIR::EventDef::_narrow (contained.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_CString str (node->repoID ());
local_name = tmp->id->get_string ();
@@ -4385,7 +4171,6 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
tmp->impl->version (),
event_type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4407,13 +4192,11 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node,
this->fill_params (params,
*tmp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ExceptionDefSeq exceptions;
this->fill_exceptions (exceptions,
*tmp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
new_def = h->create_factory ((*tmp)->repoID (),
(*tmp)->local_name ()->get_string (),
@@ -4421,7 +4204,6 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node,
params,
exceptions
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -4443,13 +4225,11 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node,
this->fill_params (params,
*tmp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ExceptionDefSeq exceptions;
this->fill_exceptions (exceptions,
*tmp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
new_def = h->create_finder ((*tmp)->repoID (),
(*tmp)->local_name ()->get_string (),
@@ -4457,7 +4237,6 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node,
params,
exceptions
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index d22c22c825b..ed37fb00f4f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -90,7 +90,6 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
{
// Updates ir_current_.
this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->members_[i].name =
@@ -129,7 +128,6 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -148,7 +146,6 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (visitor.ir_current ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Since the enclosing ExceptionDef hasn't been created
// yet, we don't have a scope, so this nested StructDef
@@ -167,8 +164,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_structure (node);
@@ -177,7 +173,6 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -203,7 +198,6 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (prev_def.in ()))
{
@@ -222,8 +216,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will create a new ExceptionDef entry.
return this->visit_exception (node);
@@ -269,7 +262,6 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
this->members_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
size_t size = this->move_queue_.size ();
@@ -280,25 +272,21 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
CORBA::Container_var new_container =
CORBA::Container::_narrow (new_def.in ()
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ traveller->name ();
CORBA::String_var version =
- traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ traveller->version ();
traveller->move (new_container.in (),
name.in (),
version.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -328,7 +316,6 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -359,12 +346,10 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
members
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->move_queue_.enqueue_tail (tmp);
@@ -378,8 +363,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_enum (node);
@@ -388,7 +372,6 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -415,7 +398,6 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -434,7 +416,6 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (visitor.ir_current ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Since the enclosing ExceptionDef hasn't been created
// yet, we don't have a scope, so this nested UnionDef
@@ -453,8 +434,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_union (node);
@@ -463,7 +443,6 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 63ff0eaefbf..230e824a20d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -41,7 +41,6 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (prev_def.in ()))
{
@@ -98,12 +97,10 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
prev_def =
be_global->repository ()->lookup_id (ex->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- exceptions[i] =
+ exceptions[i] =
CORBA::ExceptionDef::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Build the context list.
@@ -142,7 +139,6 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
// Updates ir_current_.
this->get_referenced_type (return_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Is the operation oneway?
CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway
@@ -164,7 +160,6 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
CORBA::InterfaceDef_var iface =
CORBA::InterfaceDef::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::OperationDef_var new_def =
iface->create_operation (node->repoID (),
@@ -176,14 +171,12 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
exceptions,
contexts
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
CORBA::ValueDef_var vtype =
CORBA::ValueDef::_narrow (current_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::OperationDef_var new_def =
vtype->create_operation (node->repoID (),
@@ -195,7 +188,6 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
exceptions,
contexts
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
else
@@ -239,7 +231,6 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
// Updates ir_current_.
this->get_referenced_type (arg_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->params_[this->index_].type_def =
CORBA::IDLType::_duplicate (this->ir_current_.in ());
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 6e3f4a4bbe5..5ef5ddac8e8 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -93,7 +93,6 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (visitor.ir_current ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->move_queue_.enqueue_tail (tmp);
}
@@ -117,7 +116,6 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
// Updates ir_current_.
this->get_referenced_type (ft
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->members_[i].name =
@@ -155,7 +153,6 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -189,7 +186,6 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
dummyMembers
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
// Then recurse into the real structure members (which corrupts ir_current_)
if (this->visit_scope (node) == -1)
@@ -208,7 +204,6 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
this->ir_current_= CORBA::StructDef::_duplicate (struct_def.in ());
struct_def->members( this->members_ );
- ACE_TRY_CHECK;
size_t size = this->move_queue_.size ();
@@ -219,25 +214,21 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
CORBA::Container_var new_container =
CORBA::Container::_narrow (this->ir_current_.in ()
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ traveller->name ();
CORBA::String_var version =
- traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ traveller->version ();
traveller->move (new_container.in (),
name.in (),
version.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -251,8 +242,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_structure (node);
@@ -261,7 +251,6 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -288,7 +277,6 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -319,12 +307,10 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
members
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Since the enclosing StructDef hasn't been created
// yet, we don't have a scope, so this nested EnumDef
@@ -342,8 +328,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_enum (node);
@@ -352,7 +337,6 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -379,7 +363,6 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -398,7 +381,6 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (visitor.ir_current ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Since the enclosing StructDef hasn't been created
// yet, we don't have a scope, so this nested UnionDef
@@ -417,8 +399,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_union (node);
@@ -427,7 +408,6 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 57e82d66ddb..4e12912c084 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -105,7 +105,6 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (visitor.ir_current ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->move_queue_.enqueue_tail (tmp);
}
@@ -129,7 +128,6 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
// Updates ir_current_.
this->get_referenced_type (ft
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Get the case label(s).
@@ -224,7 +222,6 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -243,7 +240,6 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (visitor.ir_current ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Since the enclosing UnionDef hasn't been created
// yet, we don't have a scope, so this nested StructDef
@@ -262,8 +258,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_structure (node);
@@ -272,7 +267,6 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -299,7 +293,6 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If not, create a new entry.
if (CORBA::is_nil (prev_def.in ()))
@@ -328,12 +321,10 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
members
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
CORBA::Contained_ptr tmp =
CORBA::Contained::_narrow (this->ir_current_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Since the enclosing UnionDef hasn't been created
// yet, we don't have a scope, so this nested EnumDef
@@ -351,8 +342,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_enum (node);
@@ -361,7 +351,6 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -387,7 +376,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
CORBA::Contained_var prev_def =
be_global->repository ()->lookup_id (node->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (prev_def.in ()))
{
@@ -402,7 +390,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
CORBA::Contained_var disc_def =
be_global->repository ()->lookup_id (disc_type->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (disc_def.in ()))
{
@@ -419,10 +406,8 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
CORBA::IDLType_var idl_def =
CORBA::IDLType::_narrow (disc_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->disc_tc_ = idl_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disc_tc_ = idl_def->type ();
}
if (this->visit_scope (node) == -1)
@@ -488,7 +473,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
);
}
- ACE_TRY_CHECK;
size_t size = this->move_queue_.size ();
@@ -499,24 +483,20 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
CORBA::Container_var new_container =
CORBA::Container::_narrow (this->ir_current_.in ()
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::String_var name = traveller->name ();
CORBA::String_var version =
- traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ traveller->version ();
traveller->move (new_container.in (),
name.in (),
version.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -530,8 +510,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ prev_def->destroy ();
// This call will take the other branch.
return this->visit_union (node);
@@ -540,7 +519,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
this->ir_current_ =
CORBA::IDLType::_narrow (prev_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 467dd213950..82f0e05f653 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -58,15 +58,13 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
CORBA::Contained_var top_level =
be_global->repository ()->lookup_id (d->repoID ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (top_level.in ()))
{
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ top_level->destroy ();
}
si.next ();
@@ -96,7 +94,6 @@ ifr_removing_visitor::visit_root (AST_Root *node)
CORBA::Container_var new_scope =
CORBA::Container::_narrow (be_global->repository ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 9f222a54739..9ee39ab3220 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -41,7 +41,6 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
// Creates it's own internal orb, which we must run later
err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (err != 0)
return -1;
@@ -65,8 +64,7 @@ ImR_Activator_Loader::fini (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int ret = this->service_.fini ();
this->runner_->wait ();
this->runner_.reset (0);
@@ -95,8 +93,7 @@ ImR_Activator_Loader::run (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ return this->service_.run ();
}
ACE_CATCHALL
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index eac94f086bb..227f94010de 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -72,7 +72,6 @@ Activator_NT_Service::svc (void)
ACE_TRY
{
int status = server.init (opts ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == -1)
{
@@ -82,11 +81,9 @@ Activator_NT_Service::svc (void)
else
{
report_status (SERVICE_RUNNING);
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
- status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ status = server.fini ();
report_status (SERVICE_STOPPED);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index e68bdbcf4f9..5f3ed1d6bd5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -43,17 +43,14 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
exception_message = "While PortableServer::POA::create_servant_retention_policy";
policies[0] =
parent->create_servant_retention_policy (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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ parent->the_POAManager ();
exception_message = "While create_POA";
PortableServer::POA_var child =
@@ -61,23 +58,19 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
poa_manager.in (),
policies
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
exception_message = "While child->the_activator";
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_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
index 2cebbc590bd..455c225afb1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
@@ -68,7 +68,6 @@ AsyncStartupWaiter_i::send_response (ImplementationRepository::AMH_AsyncStartupW
ACE_TRY
{
rh.wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -124,7 +123,6 @@ AsyncStartupWaiter_i::unblock_all (const char* name) {
ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& rh = tmp[i];
rh->wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 7337af511e9..655383ff743 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -41,18 +41,15 @@ ImR_Forwarder::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var tmp =
orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->poa_current_var_ =
PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_DEBUG ((LM_DEBUG, "ImR_Forwarder::init() Exception ignored.\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->poa_current_var_.in ()));
}
@@ -86,7 +83,6 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
// just tack on the current ObjectKey to get a valid ior for
// the desired server.
CORBA::String_var pior = locator_.activate_server_by_name (server_name.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_CString ior = pior.in ();
@@ -116,7 +112,6 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
forward_obj =
this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (ImplementationRepository::CannotActivate, ex)
{
@@ -138,7 +133,6 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
CORBA::COMPLETED_NO));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
if (!CORBA::is_nil (forward_obj.in ()))
ACE_THROW_RETURN (PortableServer::ForwardRequest (forward_obj.in ()), 0);
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 3057a8d6622..e44399dc3dd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -38,7 +38,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
CORBA::String_var located =
this->imr_locator_.activate_server_by_object (key.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_CString tmp = located.in ();
tmp += object_key;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 34da1320caf..e25aa35ad96 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -29,7 +29,6 @@ ImR_Activator_Shutdown::operator() (int /*which_signal*/)
ACE_TRY
{
this->act_.shutdown (true ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -50,7 +49,6 @@ run_standalone (Activator_Options& opts)
ACE_TRY
{
int status = server.init (opts ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == -1)
{
@@ -59,12 +57,10 @@ run_standalone (Activator_Options& opts)
else
{
// Run the server if it is initialized correctly.
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
// End the server after its work is done.
- status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ status = server.fini ();
if (status == -1)
return 1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 10054ccacff..83508e9afe3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -32,11 +32,9 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
{
PortableServer::LifespanPolicy_var life =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
PortableServer::IdAssignmentPolicy_var assign =
root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
CORBA::PolicyList pols;
pols.length (2);
@@ -46,12 +44,9 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
PortableServer::POA_var poa =
root_poa->create_POA(poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(PortableServer::POA::_nil ());
- life->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
- assign->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+ life->destroy ();
+ assign->destroy ();
return poa._retn ();
}
@@ -71,19 +66,16 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
// First, resolve the ImR, without this we can go no further
CORBA::Object_var obj =
orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
this->orb_->orb_core ()->reactor ());
locator_ = ImplementationRepository::Locator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (locator_.in ()))
{
this->registration_token_ =
locator_->register_activator (name_.c_str (), activator ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (debug_ > 0)
ACE_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n"));
@@ -117,10 +109,8 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
ACE_TRY
{
CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (! CORBA::is_nil (obj.in ()));
this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (! CORBA::is_nil(this->root_poa_.in ()));
// The activator must use a persistent POA so that it can be started before the
@@ -128,22 +118,17 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
// wants to reconnect to running activators to auto_start some servers.
this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
"ImR_Activator" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in ()));
// Activate ourself
PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_Activator");
this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ImplementationRepository::Activator_var activator =
ImplementationRepository::Activator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (activator.in ()));
CORBA::String_var ior = this->orb_->object_to_string (activator.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->debug_ > 0)
ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ()));
@@ -163,10 +148,8 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
this->register_with_imr (activator.in ()); // no throw
PortableServer::POAManager_var poaman =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
+ poaman->activate ();
if (this->debug_ > 1)
{
@@ -194,7 +177,6 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -210,16 +192,14 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
CORBA::ORB_var orb =
CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
int ret = this->init_with_orb(orb.in (), opts ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
return ret;
}
int
-ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::fini (void)
{
ACE_TRY_EX (try_block_1)
{
@@ -254,11 +234,10 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW_EX (try_block_1);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_TRY_EX (try_block_2)
{
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->orb_->destroy ();
ACE_TRY_CHECK_EX (try_block_2);
if (debug_ > 0)
@@ -270,20 +249,18 @@ ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW_EX (try_block_2);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-ImR_Activator_i::run (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::run (void)
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
void
-ImR_Activator_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
shutdown (false ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 7b62dc525cf..2b57f15a802 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -70,17 +70,17 @@ public:
const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate));
- void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+ void shutdown(void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Initialize the Server state - parsing arguments and waiting.
int init (Activator_Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Cleans up any state created by init*.
- int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int fini (void);
/// Runs the orb.
- int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int run (void);
/// Shutdown the orb.
void shutdown (bool wait_for_completion ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 12be58dd8cd..80fd3a450d9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -27,7 +27,6 @@ ImR_Locator_Shutdown::operator () (int /*which_signal*/)
ACE_TRY
{
this->imr_.shutdown (true ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -48,7 +47,6 @@ run_standalone (Options& opts)
ACE_TRY
{
int status = server.init (opts ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == -1)
{
return 1;
@@ -56,12 +54,10 @@ run_standalone (Options& opts)
else
{
// Run the server if it is initialized correctly.
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
// End the server after its work is done.
- status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ status = server.fini ();
if (status == -1)
return 1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 333e8c59ccc..5f255e982e9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -34,11 +34,9 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
PortableServer::LifespanPolicy_var life =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
PortableServer::IdAssignmentPolicy_var assign =
root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
CORBA::PolicyList pols;
pols.length (2);
@@ -48,12 +46,9 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
PortableServer::POA_var poa =
root_poa->create_POA (poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
- life->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
- assign->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+ life->destroy ();
+ assign->destroy ();
return poa._retn ();
}
@@ -93,9 +88,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (! CORBA::is_nil (this->root_poa_.in ()));
this->forwarder_.init (orb ACE_ENV_ARG_PARAMETER);
@@ -104,48 +97,35 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
// Register the Adapter_Activator reference to be the RootPOA's
// Adapter Activator.
root_poa_->the_activator (&this->adapter_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Use a persistent POA so that any IOR
this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
"ImplRepo_Service" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (! CORBA::is_nil (this->imr_poa_.in ()));
waiter_svt_.debug (debug_ > 1);
PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_AsyncStartupWaiter");
this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (startup_timeout_ > ACE_Time_Value::zero)
{
obj = set_timeout_policy (obj.in (), startup_timeout_);
}
waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
id = PortableServer::string_to_ObjectId ("ImplRepo_Service");
this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Register the ImR for use with INS
obj = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (! CORBA::is_nil (ior_table.in ()));
ior_table->bind ("ImplRepoService", ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ior_table->bind ("ImR", ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ior_table->set_locator (this->ins_locator_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Set up multicast support (if enabled)
if (opts.multicast ())
@@ -168,14 +148,10 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
// Activate the two poa managers
PortableServer::POAManager_var poaman =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- poaman = this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->root_poa_->the_POAManager ();
+ poaman->activate ();
+ poaman = this->imr_poa_->the_POAManager ();
+ poaman->activate ();
// We write the ior file last so that the tests can know we are ready.
if (opts.ior_filename ().length () > 0)
@@ -203,14 +179,12 @@ ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL)
char** argv = av.argv ();
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
int err = this->init_with_orb (orb.in (), opts ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return err;
}
int
-ImR_Locator_i::run (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::run (void)
{
if (debug_ > 0)
{
@@ -235,11 +209,9 @@ ImR_Locator_i::run (ACE_ENV_SINGLE_ARG_DECL)
debug (),
read_only_ ? "True" : "False"));
}
- this->auto_start_servers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->auto_start_servers ();
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
@@ -272,8 +244,7 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_E
{
ACE_TRY
{
- acts[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ acts[i]->shutdown ();
acts[i] = ImplementationRepository::Activator::_nil ();
}
ACE_CATCHANY
@@ -285,7 +256,6 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_E
}
}
ACE_ENDTRY;
- ACE_CHECK;
}
if (debug_ > 0 && shutdown_errs > 0)
{
@@ -304,7 +274,7 @@ ImR_Locator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
}
int
-ImR_Locator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::fini (void)
{
ACE_TRY
{
@@ -314,10 +284,8 @@ ImR_Locator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
teardown_multicast ();
this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
if (debug_ > 0)
ACE_DEBUG ((LM_DEBUG, "ImR: Shut down successfully.\n"));
@@ -328,7 +296,6 @@ ImR_Locator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -411,11 +378,9 @@ ImR_Locator_i::register_activator (const char* aname,
// Before we can register the activator, we need to ensure that any existing
// registration is purged.
this->unregister_activator_i (aname);
- ACE_CHECK_RETURN (0);
CORBA::String_var ior =
this->orb_->object_to_string (activator ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Long token = ACE_OS::gettimeofday ().msec ();
@@ -447,7 +412,6 @@ ImR_Locator_i::unregister_activator (const char* aname,
}
this->unregister_activator_i (aname);
- ACE_CHECK;
if (this->debug_ > 0)
ACE_DEBUG ((LM_DEBUG, "ImR: Activator %s unregistered.\n", aname));
@@ -593,7 +557,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ImplementationRepository::StartupInfo_var si =
start_server (info, manual_start, info.waiting_clients
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -609,7 +572,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ImplementationRepository::StartupInfo* psi =
start_server (info, manual_start, shared_info->waiting_clients
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (psi != 0)
{
@@ -695,7 +657,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
info.dir.c_str (),
info.env_vars
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if (info.partial_ior.length () == 0)
@@ -707,7 +668,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ImplementationRepository::StartupInfo_var si =
waiter_->wait_for_startup (info.name.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
--waiting_clients;
info.starting = false;
@@ -776,13 +736,10 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
CORBA::PolicyList policies (1);
policies.length (1);
policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[0]->destroy ();
if (CORBA::is_nil (ret.in ()))
{
@@ -915,13 +872,11 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%s>...\n", name));
PortableServer::POA_var poa = findPOA (name);
- ACE_CHECK;
if (! CORBA::is_nil (poa.in ()))
{
bool etherealize = true;
bool wait = false;
poa->destroy (etherealize, wait ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->debug_ > 0)
ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name));
@@ -942,7 +897,6 @@ ImR_Locator_i::findPOA (const char* name)
{
bool activate_it = false;
return root_poa_->find_POA (name, activate_it ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{// Ignore
@@ -982,9 +936,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
CORBA::Object_var obj = set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
ImplementationRepository::ServerObject_var server =
ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
}
ACE_CATCH (CORBA::TIMEOUT, ex)
{
@@ -1034,7 +986,6 @@ ImR_Locator_i::server_is_running (const char* name,
ACE_DEBUG ((LM_DEBUG, "ImR: Server %s is running at %s.\n", name, partial_ior));
CORBA::String_var ior = orb_->object_to_string (server ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_ > 1)
ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name, ior.in ()));
@@ -1077,7 +1028,7 @@ ImR_Locator_i::server_is_running (const char* name,
{
waiter_svt_.unblock_one (name, partial_ior, ior.in (), true);
}
- else if (this->debug_ > 1)
+ else if (this->debug_ > 1)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("ImR - Ignoring server_is_running due to no ")
@@ -1125,7 +1076,7 @@ ImR_Locator_i::find (const char* server,
Server_Info_Ptr info = this->repository_.get_server (server);
if (! info.null ())
{
- imr_info = info->createImRServerInfo (ACE_ENV_SINGLE_ARG_PARAMETER);
+ imr_info = info->createImRServerInfo ();
if (this->debug_ > 1)
ACE_DEBUG ((LM_DEBUG, "ImR: Found server %s.\n", server));
@@ -1176,7 +1127,7 @@ ImR_Locator_i::list (CORBA::ULong how_many,
Server_Info_Ptr info = entry->int_id_;
- ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo ();
server_list[i] = *imr_info;
}
@@ -1197,19 +1148,15 @@ ImR_Locator_i::list (CORBA::ULong how_many,
{
PortableServer::ObjectId_var id =
this->imr_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
server_iterator = ImplementationRepository::
ServerInformationIterator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
@@ -1235,7 +1182,6 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
CORBA::Object_var obj =
this->orb_->string_to_object (info.ior.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
{
@@ -1250,7 +1196,6 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
info.activator =
ImplementationRepository::Activator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (info.activator.in ()))
{
@@ -1269,7 +1214,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
}
void
-ImR_Locator_i::auto_start_servers (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::auto_start_servers (void)
{
if (this->repository_.servers ().current_size () == 0)
return;
@@ -1291,7 +1236,6 @@ ImR_Locator_i::auto_start_servers (ACE_ENV_SINGLE_ARG_DECL)
&& info->cmdline.length () > 0)
{
this->activate_server_i (*info, true ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -1306,7 +1250,6 @@ ImR_Locator_i::auto_start_servers (ACE_ENV_SINGLE_ARG_DECL)
// Ignore exceptions
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
@@ -1327,7 +1270,6 @@ ImR_Locator_i::connect_server (Server_Info& info)
ACE_TRY_NEW_ENV
{
CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
{
@@ -1339,7 +1281,6 @@ ImR_Locator_i::connect_server (Server_Info& info)
info.server =
ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (info.server.in ()))
{
@@ -1471,8 +1412,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
ImplementationRepository::ServerObject_var server = info.server;
// This will timeout if it takes too long
- server->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->ping ();
if (debug_ > 1)
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 895105f29f8..2a19b6deb69 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -48,10 +48,10 @@ public:
int init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL);
/// Cleans up any state created by init*.
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/// Run using the orb reference created during init()
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
/// Shutdown the orb.
void shutdown (bool wait_for_completion ACE_ENV_ARG_DECL);
@@ -149,7 +149,7 @@ private:
Activator_Info_Ptr get_activator (const ACE_CString& name);
void connect_activator (Activator_Info& info);
- void auto_start_servers(ACE_ENV_SINGLE_ARG_DECL);
+ void auto_start_servers(void);
CORBA::Object_ptr set_timeout_policy(CORBA::Object_ptr obj, const ACE_Time_Value& to);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index 1ed369991c2..d2446c1ff0d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -81,11 +81,9 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
void
-ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Iterator::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ObjectId_var oid = poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa_->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index d592146fbb7..86fbd81c2e6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -43,7 +43,7 @@ public:
)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index be8dd5e0e1f..b0fe04b178d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -36,7 +36,6 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
return -1;
err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (err != 0)
return -1;
@@ -60,8 +59,7 @@ ImR_Locator_Loader::fini (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int ret = this->service_.fini ();
this->runner_->wait ();
this->runner_.reset (0);
@@ -90,8 +88,7 @@ ImR_Locator_Loader::run(void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ return this->service_.run ();
}
ACE_CATCHALL
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index e13a4f8080f..297bbe009b7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -72,7 +72,6 @@ Locator_NT_Service::svc (void)
ACE_TRY
{
int status = server.init (opts ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == -1)
{
@@ -82,11 +81,9 @@ Locator_NT_Service::svc (void)
else
{
report_status (SERVICE_RUNNING);
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
- status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ status = server.fini ();
report_status (SERVICE_STOPPED);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 91f8d7fa1be..ed15f71c699 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -31,7 +31,7 @@ Server_Info::Server_Info
}
ImplementationRepository::ServerInformation*
-Server_Info::createImRServerInfo (ACE_ENV_SINGLE_ARG_DECL)
+Server_Info::createImRServerInfo (void)
{
ImplementationRepository::ServerInformation* info;
ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index e6c3a910f3b..4e3bcd06d66 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -41,7 +41,7 @@ struct Server_Info
);
/// Convert to the corba type
- ImplementationRepository::ServerInformation* createImRServerInfo(ACE_ENV_SINGLE_ARG_DECL);
+ ImplementationRepository::ServerInformation* createImRServerInfo(void);
void reset();
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 9febb1ae406..ea31bdfa0ab 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -48,7 +48,6 @@ TAO_IMR_i::init (int argc, char **argv)
{
// Retrieve the ORB.
this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -57,7 +56,6 @@ TAO_IMR_i::init (int argc, char **argv)
// Get the ImplRepo object
CORBA::Object_var obj =
orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
{
@@ -69,7 +67,6 @@ TAO_IMR_i::init (int argc, char **argv)
this->imr_ =
ImplementationRepository::Administration::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (imr_.in ()))
{
@@ -702,7 +699,6 @@ TAO_IMR_Op_Activate::run (void)
ACE_TRY
{
this->imr_->activate_server (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 ()));
@@ -748,7 +744,6 @@ TAO_IMR_Op_Autostart::run (void)
server_list,
server_iter
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(CORBA::is_nil (server_iter.in ()));
@@ -799,8 +794,7 @@ TAO_IMR_Op_IOR::run (void)
CORBA::String_var imr_str =
this->imr_->_stubobj ()->
- profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ profile_in_use ()->to_string ();
// Search for "corbaloc:" alone, without the protocol. This code
// should be protocol neutral.
@@ -878,7 +872,6 @@ TAO_IMR_Op_List::run (void)
server_list.out(),
server_iter.out()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (server_list->length() == 0)
{
@@ -896,7 +889,6 @@ TAO_IMR_Op_List::run (void)
ImplementationRepository::ServerInformation_var si;
this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->verbose_server_information_ = 1;
@@ -927,7 +919,6 @@ TAO_IMR_Op_Remove::run (void)
ACE_TRY
{
this->imr_->remove_server (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 ()));
@@ -962,7 +953,6 @@ TAO_IMR_Op_Shutdown::run (void)
ACE_TRY
{
this->imr_->shutdown_server (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 ()));
@@ -997,7 +987,6 @@ TAO_IMR_Op_ShutdownRepo::run (void)
{
bool servers = false; // not implemented yet, if ever
this->imr_->shutdown (activators_, servers ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n"));
}
@@ -1029,7 +1018,6 @@ TAO_IMR_Op_Register::run (void)
{
this->imr_->find(this->server_name_.c_str (),
server_information.out() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (server_name_ == server_information->server.in())
{
@@ -1079,7 +1067,6 @@ TAO_IMR_Op_Register::run (void)
}
this->imr_->add_or_update_server (this->server_name_.c_str (), *options ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Successfully registered <%s>.\n", this->server_name_.c_str ()));
}
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index 3e2270c5442..bbb2430d7ee 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -28,7 +28,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
}
LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (ACE_ENV_SINGLE_ARG_DECL)
+Criteria_Evaluator::getInitialization (void)
{
LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0;
@@ -46,7 +46,7 @@ Criteria_Evaluator::getInitialization (ACE_ENV_SINGLE_ARG_DECL)
}
char *
-Criteria_Evaluator::getFilter (ACE_ENV_SINGLE_ARG_DECL)
+Criteria_Evaluator::getFilter (void)
{
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 d170b8fdca1..346685a6993 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (void);
- char * getFilter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ char * getFilter (void);
- LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (void)
{
return 0;
}
- char * getPreferences (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ char * getPreferences (void)
{
return 0;
}
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index f088231c4f2..9e7b2a0c4b1 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -22,8 +22,8 @@
#include "Factory_Trader.h"
#include "orbsvcs/CosTradingC.h"
-ACE_RCSID (LifeCycle_Service,
- Factory_Trader,
+ACE_RCSID (LifeCycle_Service,
+ Factory_Trader,
"$Id$")
// This const char * is used for adding a new type to the service repository
@@ -50,8 +50,7 @@ Factory_Trader::Factory_Trader (int debug_level)
// Set the service type repository
support_Attributes_ptr_->type_repos
- (this->repository_._this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_TRY_CHECK;
+ (this->repository_._this ());
// Add the "Factory" type to the repository
this->add_type ();
@@ -106,7 +105,6 @@ Factory_Trader::add_type ()
propStructSeq,
superTypeSeq
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -152,7 +150,6 @@ Factory_Trader::_cxx_export (const char * name,
propertySeq
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -196,7 +193,6 @@ Factory_Trader::query (const char* constraint)
CosTrading::OfferIterator_out(offerIterator_ptr), // more results
CosTrading::PolicyNameSeq_out(policyNameSeq_ptr) // Policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize
CORBA::Object_ptr object_ptr = 0;
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 0a3c9a68cf8..e45842d842d 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -36,7 +36,6 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
generic_Factory_Name.length (2);
generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service");
this->namingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -58,7 +57,6 @@ Life_Cycle_Service_Server::init (int argc,
retval = this->orb_manager_.init (command.get_argc(),
command.get_ASCII_argv()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,13 +65,11 @@ Life_Cycle_Service_Server::init (int argc,
-1);
// Activate the POA manager
- retval = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ retval = this->orb_manager_.activate_poa_manager ();
if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1);
- ACE_CHECK_RETURN (-1);
this->parse_args (command.get_argc(), command.get_TCHAR_argv());
@@ -85,7 +81,6 @@ Life_Cycle_Service_Server::init (int argc,
CORBA::String_var str =
this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->debug_level_ >= 2)
ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
@@ -100,7 +95,6 @@ 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" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (namingObj_var.in ()))
ACE_ERROR ((LM_ERROR,
@@ -110,7 +104,6 @@ Life_Cycle_Service_Server::init (int argc,
namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (namingContext_var_.in ()))
ACE_ERROR ((LM_ERROR,
@@ -124,13 +117,11 @@ 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(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this();
namingContext_var_->bind (life_Cycle_Service_Name,
tmp
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->debug_level_ >= 2)
ACE_DEBUG ((LM_DEBUG,
@@ -147,14 +138,13 @@ Life_Cycle_Service_Server::init (int argc,
int
-Life_Cycle_Service_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Life_Cycle_Service_Server::run (void)
{
if (this->debug_level_ >= 1)
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT("\nLifeCycle Service: Life_Cycle_Service_Server is running\n")));
- orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ orb_manager_.orb()->run ();
return 0;
}
@@ -206,13 +196,12 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
int check = life_Cycle_Service_Server.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check)
return 1;
else
{
- life_Cycle_Service_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ life_Cycle_Service_Server.run ();
ACE_TRY_CHECK
}
}
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 35355e5368e..0bf9a550b4a 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -42,7 +42,7 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the Server state - parsing arguments and ...
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the orb.
u_int parse_args (int argc,
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index a1e011451b8..be7c57ef82f 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -19,8 +19,8 @@
#include "LifeCycle_Service_i.h"
-ACE_RCSID (LifeCycle_Service,
- LifeCycle_Service_i,
+ACE_RCSID (LifeCycle_Service,
+ LifeCycle_Service_i,
"$Id$")
// Constructor
@@ -67,8 +67,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ char* filter = criteria_Evaluator.getFilter ();
if (this->debug_level_ >= 2)
ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query(%s) will be called.\n",filter));
@@ -101,7 +100,6 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
genericFactory_var =
CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr
ACE_ENV_ARG_PARAMETER);
- // ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -110,7 +108,6 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
if (CORBA::is_nil (genericFactory_var.in()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -124,7 +121,6 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
the_criteria
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (this->debug_level_ >= 2)
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index b95c5ca9c6b..f522c570e45 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -100,8 +100,7 @@ TAO_LB_run_load_manager (void * orb_arg)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
@@ -111,7 +110,6 @@ TAO_LB_run_load_manager (void * orb_arg)
return reinterpret_cast<void *> (-1);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (reinterpret_cast<void *> (-1));
return 0;
}
@@ -129,24 +127,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// "built-in" strategies are the following:
// 0 = RoundRobin
@@ -159,7 +152,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
argv,
default_strategy
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_LB_LoadManager * lm = 0;
ACE_NEW_THROW_EX (lm,
@@ -169,7 +161,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
PortableServer::ServantBase_var safe_lm = lm;
@@ -178,7 +169,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableGroup::Properties props (1);
props.length (1);
@@ -210,30 +200,24 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
lm->set_default_properties (props
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_var load_manager =
- lm->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ lm->_this ();
CORBA::String_var str =
orb->object_to_string (load_manager.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// to support corbaloc
// Get a reference to the IOR table.
CORBA::Object_var tobj = orb->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var table = IORTable::Table::_narrow (tobj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// bind your stringified IOR in the IOR table
table->bind ("LoadManager", str.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE * lm_ior = ACE_OS::fopen (lm_ior_file, "w");
ACE_OS::fprintf (lm_ior, "%s", str.in ());
@@ -282,16 +266,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// handler thread shuts down the ORB before it is run, the
// below call to ORB::run() will throw a CORBA::BAD_INV_ORDER
// exception.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Wait for the signal handler thread to finish
// before the process exits.
signal_handler.wait ();
#endif /* linux && ACE_HAS_THREADS */
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
// ACE_CATCH (PortableGroup::InvalidProperty, ex)
// {
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index b0bb0a36701..b309f43b49d 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -123,8 +123,7 @@ TAO_LB_run_load_monitor (void * orb_arg)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
@@ -134,7 +133,6 @@ TAO_LB_run_load_monitor (void * orb_arg)
return reinterpret_cast<void *> (-1);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (reinterpret_cast<void *> (-1));
return 0;
}
@@ -151,7 +149,6 @@ get_load_monitor (CORBA::ORB_ptr orb,
CORBA::Object_var obj =
orb->string_to_object (::custom_monitor_ior
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
return CosLoadBalancing::LoadMonitor::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -161,11 +158,9 @@ get_load_monitor (CORBA::ORB_ptr orb,
// The POA is only needed for the built-in load monitors since
// they must be activated.
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
+ poa_manager->activate ();
if (ACE_OS::strcasecmp (::mtype, "CPU") == 0)
{
@@ -174,12 +169,11 @@ get_load_monitor (CORBA::ORB_ptr orb,
TAO_LB_CPU_Load_Average_Monitor (::location_id,
::location_kind),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
// Transfer ownership to the POA.
PortableServer::ServantBase_var s = monitor;
- return monitor->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return monitor->_this ();
}
else if (ACE_OS::strcasecmp (::mtype, "Disk") == 0
|| ACE_OS::strcasecmp (::mtype, "Memory") == 0
@@ -217,13 +211,11 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
if (ACE_OS::strcasecmp (::mstyle, "PULL") == 0)
{
PortableGroup::Location_var location =
- monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ monitor->the_location ();
manager->register_load_monitor (location.in (),
monitor
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else if (ACE_OS::strcasecmp (::mstyle, "PUSH") == 0)
{
@@ -266,44 +258,36 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check the non-ORB arguments.
::parse_args (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadMonitor_var load_monitor =
::get_load_monitor (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableGroup::Location_var location =
- load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ load_monitor->the_location ();
// The "LoadManager" reference should have already been
// registered with the ORB by its ORBInitializer.
obj = orb->resolve_initial_references ("LoadManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_var load_manager =
CosLoadBalancing::LoadManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This "push" handler will only be used if the load monitor
// style is "PUSH".
@@ -321,7 +305,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
reactor,
timer_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_ptr tmp;;
@@ -364,7 +347,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
load_manager->remove_load_monitor (location.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
#else
// Activate/register the signal handler that (attempts) to
@@ -384,8 +366,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// handler thread shuts down the ORB before it is run, the
// below call to ORB::run() will throw a CORBA::BAD_INV_ORDER
// exception.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Wait for the signal handler thread to finish
// before the process exits.
@@ -401,8 +382,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// Just keep going. We're shutting down anyway.
}
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
index 3153f62e98a..64a76141ddd 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
@@ -30,7 +30,6 @@ TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum)
{
this->load_manager_->remove_load_monitor (this->location_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -45,7 +44,6 @@ TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum)
-1);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return this->TAO_LB_Signal_Handler::perform_cleanup (signum);
}
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
index de2f9ef1f51..ef5085cccb6 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
@@ -27,8 +27,7 @@ TAO_LB_Push_Handler::handle_timeout (
ACE_TRY
{
CosLoadBalancing::LoadList_var loads =
- this->monitor_->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->monitor_->loads ();
// ACE_DEBUG ((LM_DEBUG,
// "PUSHING LOAD:\n"
@@ -40,7 +39,6 @@ TAO_LB_Push_Handler::handle_timeout (
this->manager_->push_loads (this->location_,
loads.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index e6c646c9833..4b139aef6a1 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -123,12 +123,10 @@ TAO_LB_Signal_Handler::perform_cleanup (int signum)
// clean up all resources they are responsible for.
this->poa_->destroy (1, 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now shutdown the ORB.
this->orb_->shutdown (1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -141,7 +139,6 @@ TAO_LB_Signal_Handler::perform_cleanup (int signum)
-1);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
index 55900325fcc..61cbc5424ca 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
@@ -35,7 +35,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
which_signal));
ACE_DECLARE_NEW_CORBA_ENV;
- (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ (void) this->svc_.shutdown ();
}
// Driver function for the Basic_Logging_Service
@@ -54,14 +54,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
int rc;
rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to initialize the Telecom Log Service.\n"),
1);
- rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rc = service.run ();
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to start the Telecom Log Service.\n"),
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 54f2829e160..4da473033d9 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -33,24 +33,19 @@ Basic_Logging_Service::init_ORB (int& argc, char *argv []
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
int
@@ -107,7 +102,6 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
// initialize the ORB.
this->init_ORB (argc, argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->parse_args (argc, argv) == -1)
return -1;
@@ -117,26 +111,21 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->basic_log_factory_.activate (this->orb_.in (),
this->poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (obj.in ()));
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (true)
{
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in ());
- ACE_CHECK_RETURN (-1);
adapter->bind("BasicLogService", ior.in ());
- ACE_CHECK_RETURN (-1);
}
if (this->ior_file_name_ != 0)
@@ -169,8 +158,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
if (this->bind_to_naming_service_)
{
// Resolve the naming service.
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_naming_service ();
CosNaming::Name name (1);
name.length (1);
@@ -179,19 +167,17 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->naming_->rebind (name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
void
-Basic_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Basic_Logging_Service::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -200,11 +186,10 @@ Basic_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
-Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Basic_Logging_Service::run (void)
{
if (this->nthreads_ > 0)
{
@@ -215,8 +200,7 @@ Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
return 0;
}
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
@@ -227,8 +211,7 @@ Basic_Logging_Service::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -240,7 +223,7 @@ Basic_Logging_Service::svc (void)
}
void
-Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic_Logging_Service::shutdown (void)
{
if (this->bind_to_naming_service_)
{
@@ -250,7 +233,6 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->naming_->unbind (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index 91af3e22296..e6a6849918c 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -43,11 +43,11 @@ class Basic_Logging_Service
// Initializes the Telecom Log Service.
// Returns 0 on success, -1 on error.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the Telecom Log Service.
// Returns 0 on success, -1 on error.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
// Shutdown the Telecom Log Service.
// Returns 0 on success, -1 on error.
@@ -59,7 +59,7 @@ protected:
int parse_args (int argc, char *argv []);
// Parses the command line arguments.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Resolve the naming service.
int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index bcbd1a3f592..3a624fa0835 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -35,7 +35,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
which_signal));
ACE_DECLARE_NEW_CORBA_ENV;
- (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ (void) this->svc_.shutdown ();
}
// Driver function for the Event_Logging_Service
@@ -56,14 +56,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
int rc;
rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to initialize the Telecom Log Service.\n"),
1);
- rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rc = service.run ();
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to start the Telecom Log Service.\n"),
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 6020302f152..63fcdcd4460 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -34,24 +34,19 @@ Event_Logging_Service::init_ORB (int& argc, char *argv []
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
int
@@ -108,7 +103,6 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
// initialize the ORB.
this->init_ORB (argc, argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->parse_args (argc, argv) == -1)
return -1;
@@ -122,26 +116,21 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->event_log_factory_->activate (this->orb_.in (),
this->poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (obj.in ()));
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (true)
{
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in ());
- ACE_CHECK_RETURN (-1);
adapter->bind("EventLogService", ior.in ());
- ACE_CHECK_RETURN (-1);
}
if (this->ior_file_name_ != 0)
@@ -173,8 +162,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
if (this->bind_to_naming_service_)
{
// Resolve the naming service.
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_naming_service ();
// Register the Event Log Factory.
CosNaming::Name name (1);
@@ -184,19 +172,17 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->naming_->rebind (name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
void
-Event_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Event_Logging_Service::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -205,11 +191,10 @@ Event_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
-Event_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Event_Logging_Service::run (void)
{
if (this->nthreads_ > 0)
{
@@ -220,8 +205,7 @@ Event_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
return 0;
}
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
@@ -232,8 +216,7 @@ Event_Logging_Service::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -245,7 +228,7 @@ Event_Logging_Service::svc (void)
}
void
-Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Event_Logging_Service::shutdown (void)
{
if (this->bind_to_naming_service_)
{
@@ -255,7 +238,6 @@ Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->naming_->unbind (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index 36be03ed34d..d12d7e1c79c 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -44,11 +44,11 @@ class Event_Logging_Service
// Initializes the Telecom Log Service.
// Returns 0 on success, -1 on error.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the Telecom Log Service.
// Returns 0 on success, -1 on error.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
// Shutdown the Telecom Log Service.
// Returns 0 on success, -1 on error.
@@ -60,7 +60,7 @@ protected:
int parse_args (int argc, char *argv []);
// Parses the command line arguments.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Resolve the naming service.
int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index 14b848c2d27..35cf0317a9b 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -35,7 +35,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
which_signal));
ACE_DECLARE_NEW_CORBA_ENV;
- (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ (void) this->svc_.shutdown ();
}
// Driver function for the Notify_Logging_Service.
@@ -54,14 +54,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
int rc;
rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to initialize the Telecom Log Service.\n"),
1);
- rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rc = service.run ();
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to start the Telecom Log Service.\n"),
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 00f6f2e038d..4d8edd64f6a 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -35,7 +35,6 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME);
@@ -48,7 +47,6 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,14 +56,11 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
this->poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
return 0;
}
@@ -131,7 +126,6 @@ Notify_Logging_Service::init (int argc, char *argv[]
return -1;
this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Activate the factory
this->notify_factory_ =
@@ -147,25 +141,20 @@ Notify_Logging_Service::init (int argc, char *argv[]
this->poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (true)
{
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in ());
- ACE_CHECK_RETURN (-1);
adapter->bind("NotifyLogService", ior.in ());
- ACE_CHECK_RETURN (-1);
}
if (this->ior_file_name_ != 0)
@@ -198,8 +187,7 @@ Notify_Logging_Service::init (int argc, char *argv[]
if (this->bind_to_naming_service_)
{
// Resolve the naming service.
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_naming_service ();
CosNaming::Name name (1);
name.length (1);
@@ -208,19 +196,17 @@ Notify_Logging_Service::init (int argc, char *argv[]
this->naming_->rebind (name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
void
-Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -229,11 +215,10 @@ Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
-Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::run (void)
{
if (this->nthreads_ > 0)
{
@@ -244,8 +229,7 @@ Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
return 0;
}
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
@@ -256,8 +240,7 @@ Notify_Logging_Service::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -269,7 +252,7 @@ Notify_Logging_Service::svc (void)
}
void
-Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::shutdown (void)
{
if (this->bind_to_naming_service_)
{
@@ -279,7 +262,6 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->naming_->unbind (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index ed1202bcd9b..23a16d3cd7f 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -48,11 +48,11 @@ class Notify_Logging_Service
// Initializes the Telecom Log Service.
// Returns 0 on success, -1 on error.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the Telecom Log Service.
// Returns 0 on success, -1 on error.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
// Shutdown the Telecom Service.
// Returns 0 on success, -1 on error.
@@ -64,7 +64,7 @@ protected:
int parse_args (int argc, char *argv[]);
// Parses the command line arguments.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Resolve the naming service.
int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
index 5b3ba58a51d..9769150c6f6 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
@@ -36,7 +36,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
which_signal));
ACE_DECLARE_NEW_CORBA_ENV;
- (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ (void) this->svc_.shutdown ();
}
// Driver function for the RTEvent_Logging_Service
@@ -57,14 +57,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
int rc;
rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to initialize the Telecom Log Service.\n"),
1);
- rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rc = service.run ();
if (rc == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Failed to start the Telecom Log Service.\n"),
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index fa49a6952ed..ef34fdd3359 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -32,24 +32,19 @@ RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
@@ -107,7 +102,6 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
// initialize the ORB.
this->init_ORB (argc, argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->parse_args (argc, argv) == -1)
return -1;
@@ -128,26 +122,21 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
}
RTEventLogAdmin::EventLogFactory_var obj =
- this->rtevent_log_factory_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->rtevent_log_factory_->activate ();
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (true)
{
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in ());
- ACE_CHECK_RETURN (-1);
adapter->bind("RTEventLogService", ior.in ());
- ACE_CHECK_RETURN (-1);
}
if (this->ior_file_name_ != 0)
@@ -179,8 +168,7 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
if (this->bind_to_naming_service_)
{
// Resolve the naming service.
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_naming_service ();
CosNaming::Name name (1);
name.length (1);
@@ -189,19 +177,17 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
this->naming_->rebind (name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
void
-RTEvent_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+RTEvent_Logging_Service::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -210,11 +196,10 @@ RTEvent_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
-RTEvent_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+RTEvent_Logging_Service::run (void)
{
if (this->nthreads_ > 0)
{
@@ -225,8 +210,7 @@ RTEvent_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
return 0;
}
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
@@ -237,8 +221,7 @@ RTEvent_Logging_Service::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -250,7 +233,7 @@ RTEvent_Logging_Service::svc (void)
}
void
-RTEvent_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+RTEvent_Logging_Service::shutdown (void)
{
if (this->bind_to_naming_service_)
{
@@ -260,7 +243,6 @@ RTEvent_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->naming_->unbind (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index 535fea9fbe0..01450ceb8c6 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -34,18 +34,18 @@ public:
// = Initialization and termination methods.
RTEvent_Logging_Service (void);
// Constructor.
-
+
virtual ~RTEvent_Logging_Service (void);
// Destructor.
int init (int argc, char* argv[]);
// Initializes the Telecom Log Service.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the Telecom Log Service.
// Returns 0 on success, -1 on error.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
// Shutdown the Telecom Log Service.
// Returns 0 on success, -1 on error.
@@ -57,7 +57,7 @@ protected:
int parse_args (int argc, char* argv[]);
// parse the command line args
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Resolve the naming service.
int svc ();
@@ -88,7 +88,7 @@ private:
bool bind_to_naming_service_;
// If true, bind to naming service
-
+
int nthreads_;
// Number of worker threads.
};
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 506d38edb32..b6b7dc75e91 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -22,7 +22,7 @@ AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service)
AutoFinalizer::~AutoFinalizer ()
{
- service_.report_status (SERVICE_STOPPED);
+ service_.report_status (SERVICE_STOPPED);
ACE_DEBUG ((LM_DEBUG, "Reported service stoped\n"));
}
@@ -52,13 +52,13 @@ TAO_NT_Naming_Service::handle_control (DWORD control_code)
if (control_code == SERVICE_CONTROL_SHUTDOWN
|| control_code == SERVICE_CONTROL_STOP)
{
- // Just in case any of the following method calls
+ // Just in case any of the following method calls
// throws in a way we do not expect.
// This instance's destructor will notify the OS.
AutoFinalizer afinalizer (*this);
report_status (SERVICE_STOP_PENDING);
-
+
// This must be all that needs to be done since this method is executing
// in a separate thread from the one running the reactor.
// When the reactor is stopped it calls ORB::destroy(), which in turn
@@ -68,7 +68,6 @@ TAO_NT_Naming_Service::handle_control (DWORD control_code)
ACE_TRY
{
TAO_ORB_Core_instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -179,8 +178,7 @@ TAO_NT_Naming_Service::svc (void)
ACE_DEBUG ((LM_INFO, "Notifying Windows of service startup\n"));
report_status (SERVICE_RUNNING);
- naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ naming_service.run ();
}
ACE_CATCHANY
{
@@ -190,7 +188,6 @@ TAO_NT_Naming_Service::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (1);
ACE_DEBUG ((LM_INFO, "Exiting gracefully\n"));
return 0;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 65631eb726e..9d450fb754d 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -52,8 +52,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ naming_service.run ();
}
ACE_CATCHANY
{
@@ -61,7 +60,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
return 1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (1);
naming_service.fini ();
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 22e055649e3..e7a804a592b 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -39,7 +39,6 @@ TAO_Naming_Service::init (int argc,
// Initialize the ORB
this->orb_ =
CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse the args for '-t' option. If '-t' option is passed, do
// the needful and then remove the option from the list of
@@ -61,7 +60,6 @@ TAO_Naming_Service::init (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -105,28 +103,25 @@ TAO_Naming_Service::parse_args (int &argc,
// Run the ORB event loop.
int
-TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::run (void)
{
if (time_ == 0)
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
}
else
{
ACE_Time_Value tv (time_);
this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
void
-TAO_Naming_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::shutdown (void)
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -139,8 +134,7 @@ TAO_Naming_Service::fini (void)
ACE_TRY
{
// destroy implies shutdown
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index 2ad9cb1f7dd..de82fd02b4c 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -44,10 +44,10 @@ public:
virtual int fini (void);
// The opposite of init().
- int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int run (void);
// Run the TAO_Naming_Service.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void shutdown (void);
// Shut down the TAO_Naming_Service; you must still call fini().
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 57cee4c14ed..01fdda3a5ca 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -136,8 +136,7 @@ TAO_NT_Notify_Service::svc (void)
return -1;
report_status (SERVICE_RUNNING);
- notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ notify_service.run ();
}
ACE_CATCHANY
{
@@ -146,7 +145,6 @@ TAO_NT_Notify_Service::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (1);
return 0;
}
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 684fb1174fd..f6c1bf84ba9 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -59,15 +59,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
TAO_Notify_Properties::instance (&properties);
int result = notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == -1)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT("Failed to initialize the Notification Service.\n")),
1);
- notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ notify_service.run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index ed5898ccb63..89daeba2950 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -46,12 +46,10 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
command_line.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,14 +59,11 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
this->poa_ =
PortableServer::POA::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
return 0;
}
@@ -84,7 +79,6 @@ TAO_Notify_Service_Driver::init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
command_line.get_ASCII_argv(),
"dispatcher"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -123,12 +117,10 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
}
this->notify_service_->init_service2 (this->orb_.in (), this->dispatching_orb_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
@@ -156,8 +148,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
if (this->use_name_svc_)
{
// Resolve the naming service.
- int ns_ret = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int ns_ret = this->resolve_naming_service ();
if (ns_ret != 0)
return -1;
@@ -169,7 +160,6 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
// Activate the factory
this->notify_factory_ =
notify_service_->create (this->poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
@@ -178,11 +168,9 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (adapter.in ()))
{
ACE_ERROR ((LM_ERROR, "Nil IORTable. corbaloc support not enabled.\n"));
@@ -192,10 +180,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
CORBA::String_var ior =
this->orb_->object_to_string (this->notify_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
adapter->bind (this->notify_factory_name_.c_str (), ior.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
@@ -208,13 +194,11 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
CosNaming::Name_var name =
this->naming_->to_name (this->notify_factory_name_.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->naming_->rebind (name.in (),
this->notify_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"Registered with the naming service as: %s\n",
@@ -233,16 +217,13 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
initial_admin,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
name = this->naming_->to_name (this->notify_channel_name_.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->naming_->rebind (name.in (),
ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"Registered an Event Channel with the naming service as: %s\n",
@@ -256,7 +237,6 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
CORBA::String_var str =
this->orb_->object_to_string (this->notify_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->ior_output_file_)
{
@@ -275,12 +255,11 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
}
int
-TAO_Notify_Service_Driver::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service_Driver::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -290,13 +269,12 @@ TAO_Notify_Service_Driver::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_ =
CosNaming::NamingContextExt::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-TAO_Notify_Service_Driver::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service_Driver::run (void)
{
if (TAO_debug_level > 0 )
ACE_DEBUG ((LM_DEBUG, "%s: Running the Notification Service\n",
@@ -308,14 +286,13 @@ TAO_Notify_Service_Driver::run (ACE_ENV_SINGLE_ARG_DECL)
return 0;
}
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_->run ();
return 0;
}
void
-TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service_Driver::shutdown (void)
{
// Deactivate.
if (this->use_name_svc_ && !CORBA::is_nil (this->naming_.in ()))
@@ -324,11 +301,9 @@ TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
CosNaming::Name_var name =
this->naming_->to_name (this->notify_factory_name_.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->naming_->unbind (name.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// shutdown the ORB.
@@ -478,7 +453,7 @@ Worker::svc (void)
// just disabling it altogether. It doesn't provide much value, and
// makes service startup needlessly more verbose. See bugzilla 2477
// for details.
-
+
ACE_hthread_t current;
ACE_Thread::self (current);
@@ -495,8 +470,7 @@ Worker::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index ddf7203b146..615d432c567 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -75,11 +75,11 @@ class TAO_Notify_Service_Driver
// Initializes the Service.
// Returns 0 on success, -1 on error.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// run the Service.
// Returns 0 on success, -1 on error.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void shutdown (void);
// Shutdown the Service.
// Returns 0 on success, -1 on error.
@@ -96,7 +96,7 @@ protected:
TAO_Notify_Service* notify_service_;
- int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ int resolve_naming_service (void);
// Resolve the naming service.
int parse_args (int& argc, ACE_TCHAR *argv []);
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index fe23670c74e..1ea00ad9f20 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -35,11 +35,9 @@ TAO_PSDL_Code_Gen::set_codec (void)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("CodecFactory"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IOP::CodecFactory_var codec_factory =
IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Set up a structure that contains information necessary to
// create a GIOP 1.1 CDR encapsulation Codec.
@@ -51,7 +49,6 @@ TAO_PSDL_Code_Gen::set_codec (void)
// Obtain the CDR encapsulation Codec.
this->codec_ =
codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->codec_.in () == 0)
{
@@ -76,7 +73,6 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
// Encode the stringified object reference to a CORBA::OctetSeq *
CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Insert the new entry to the hash map which contains all the
// name-octet_seq entries. And, write the hash_map to a file.
@@ -119,7 +115,6 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
// Decode the octet_seq.
const char *obj_ref = this->decode (octet_seq
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CORBA::string_dup (obj_ref);
}
@@ -144,7 +139,6 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
CORBA::OctetSeq *encoded_data = 0;
encoded_data = this->codec_->encode (data ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::OctetSeq_var safe_encoded_data = encoded_data;
@@ -162,7 +156,6 @@ TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data
CORBA::Any_var decoded_data =
this->codec_->decode (data
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
decoded_data.in() >>= extracted_value;
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
index 597d23a7005..08d6005e47a 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
@@ -1631,7 +1631,6 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
*ps_si << "CORBA::Boolean is_a = obj->_is_a (\"IDL:"
<< this->interface_name_ << ":1.0\" ACE_ENV_ARG_PARAMETER);";
ps_si->nl ();
- *ps_si << "ACE_CHECK_RETURN (" << this->interface_name_ << "::_nil ());"; ps_si->nl ();
*ps_si << "if (is_a == 0)";
ps_si->incr_indent (0);
@@ -2151,7 +2150,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->decr_indent (0);
ps_si->decr_indent (0);
ps_si->nl ();
- *ps_si << "ACE_TRY_CHECK;";
+;
ps_si->nl ();
ps_si->nl ();
@@ -2333,7 +2332,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->decr_indent (0);
ps_si->nl ();
- *ps_si << "ACE_TRY_CHECK;"; ps_si->nl ();
+; ps_si->nl ();
*ps_si << "return 1;";
ps_si->decr_indent (0);
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 49f72b07b7e..553ad04e041 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -374,7 +374,7 @@ TAO_PSDL_Struct_Visitor::gen_code_for_si (void)
ps_si->decr_indent (0); ps_si->nl ();
*ps_si << ");"; ps_si->nl ();
- *ps_si << "ACE_TRY_CHECK;"; ps_si->nl ();
+; ps_si->nl ();
*ps_si << "if (result == 0)"; ps_si->nl ();
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 83e325bcde7..5ee5019fab1 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -57,16 +57,12 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
// Initialize ORB manager.
this->orb_manager_.init (command_line.get_argc(), command_line.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
orb = this->orb_manager_.orb ();
- ACE_TRY_CHECK;
poa_manager = this->orb_manager_.poa_manager ();
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Check the non-ORB arguments. this needs to come before we
// initialize the scheduler implementation so that we know which
@@ -79,26 +75,16 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
// Construct a scheduler implementation of the specified type.
switch (this->scheduler_type_)
{
-
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
case RECONFIG:
ACE_NEW_THROW_EX (scheduler_impl_,
RECONFIG_SCHED_TYPE,
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
break;
-#endif /* __GNUC__ */
-
case CONFIG:
ACE_NEW_THROW_EX (scheduler_impl_,
CONFIG_SCHED_TYPE,
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
break;
default:
@@ -110,7 +96,6 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
// Locate the naming service.
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -118,15 +103,12 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
-1);
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::Scheduler_var scheduler =
- this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->scheduler_impl_->_this ();
CORBA::String_var scheduler_ior_string =
orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"),
ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())));
@@ -136,7 +118,6 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
schedule_name.length (1);
schedule_name[0].id = CORBA::string_dup (this->service_name_.rep());
naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->ior_file_name_.rep() != 0)
{
@@ -176,10 +157,10 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
// Runs the TAO_Scheduling_Service.
int
-TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Scheduling_Service::run (void)
{
// Run the ORB manager.
- return this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->orb_manager_.run ();
}
@@ -207,11 +188,6 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
break;
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
case 's':
if (ACE_OS::strcasecmp (ACE_TEXT("CONFIG"), get_opt.optarg) == 0)
{
@@ -236,16 +212,9 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
}
break;
-#endif /* __GNUC__ */
-
case '?':
default:
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
ACE_DEBUG ((LM_DEBUG,
"Usage: %s "
"[-n service_name] "
@@ -255,18 +224,6 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
"\n",
argv[0]));
-#else /* __GNUC__ <= 2.8 */
-
- ACE_DEBUG ((LM_DEBUG,
- "Usage: %s "
- "[-n service_name] "
- "[-p pid_file_name] "
- "[-o ior_file_name] "
- "\n",
- argv[0]));
-
-#endif /* __GNUC__ */
-
return -1;
}
}
@@ -289,8 +246,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
ACE_DEBUG ((LM_DEBUG,
"%s; running scheduling service\n", __FILE__));
- scheduling_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduling_service.run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index 3ffa5426945..37b436330ef 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -1,26 +1,20 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-// orbsvcs/Scheduling_Service/Scheduling_Service
-//
-// = FILENAME
-// Scheduling_Service.h
-//
-// = DESCRIPTION
-// This class implements the functionality of a Scheduling Service in
-// a stand-alone process.
-//
-// = AUTHORS
-// Chris Gill (cdgill@cs.wustl.edu) Based on the original
-// Scheduling Service program by David Levine
-// (levine@cs.wustl.edu) and Carlos O'Ryan (coryan@cs.wustl.edu),
-// and on the Naming Service program implementation by Marina
-// Spivak (marina@cs.wustl.edu) and Nagarajan Surendran
-// (naga@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ * @file Scheduling_Service.h
+ *
+ * $Id$
+ *
+ * This class implements the functionality of a Scheduling Service in
+ * a stand-alone process.
+ *
+ *
+ * @author Chris Gill (cdgill@cs.wustl.edu) Based on the original
+ * Scheduling Service program by David Levine (levine@cs.wustl.edu) and
+ * Carlos O'Ryan (coryan@cs.wustl.edu)
+ * @author and on the Naming Service program implementation by Marina Spivak (marina@cs.wustl.edu) and Nagarajan Surendran (naga@cs.wustl.edu)
+ */
+//=============================================================================
+
#ifndef TAO_SCHEDULING_SERVICE_H
#define TAO_SCHEDULING_SERVICE_H
@@ -33,69 +27,64 @@
#include "orbsvcs/Sched/Config_Scheduler.h"
#include "ace/SString.h"
+/**
+ * @class TAO_Scheduling_Service
+ *
+ * @brief Defines a class that encapsulates the implementation of the
+ * TAO Scheduling Service.
+ *
+ * This class makes use of the TAO_Reconfig_Scheduler and
+ * ACE_Config_Scheduler classes to implement the Scheduling Service.
+ */
class TAO_Scheduling_Service
{
- // = TITLE
- // Defines a class that encapsulates the implementation of the
- // TAO Scheduling Service.
- //
- // = DESCRIPTION
- // This class makes use of the <TAO_Reconfig_Scheduler> and
- // <ACE_Config_Scheduler> classes to implement the Scheduling Service.
public:
+ /// Default Constructor.
TAO_Scheduling_Service (void);
- // Default Constructor.
+ /// Constructor taking the command-line arguments.
TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[]);
- // Constructor taking the command-line arguments.
+ /// Initialize the Scheduling Service with the arguments.
int init (int argc, ACE_TCHAR* argv[]);
- // Initialize the Scheduling Service with the arguments.
- int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- // Run the TAO_Scheduling_Service.
+ /// Run the TAO_Scheduling_Service.
+ int run (void);
+ /// Destructor.
~TAO_Scheduling_Service (void);
- // Destructor.
private:
typedef ACE_Config_Scheduler CONFIG_SCHED_TYPE;
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy,
TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE;
-#endif /* __GNUC__ */
-
enum Scheduler_Type {CONFIG, RECONFIG};
+ /// parses the arguments.
int parse_args (int argc, ACE_TCHAR* argv[]);
- // parses the arguments.
+ /// The ORB manager. This must be the first thing in the
TAO_ORB_Manager orb_manager_;
- // The ORB manager. This must be the first thing in the
+ /// Scheduler instance.
POA_RtecScheduler::Scheduler *scheduler_impl_;
- // Scheduler instance.
+ /// Name of the IOR output file.
ACE_CString ior_file_name_;
- // Name of the IOR output file.
+ /// Name of the process id output file.
ACE_CString pid_file_name_;
- // Name of the process id output file.
+ /// Name used to register the service.
ACE_CString service_name_;
- // Name used to register the service.
+ /// Type of scheduler with which to instantiate the service.
Scheduler_Type scheduler_type_;
- // Type of scheduler with which to instantiate the service.
+ /// A reference to the ORB, to shut it down properly.
CORBA::ORB_var orb_;
- // A reference to the ORB, to shut it down properly.
};
#endif /* TAO_SCHEDULING_SERVICE_H */
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index b711c0e363b..ea24fac6cf9 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -47,7 +47,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
"" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
@@ -56,7 +55,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_Time_Value tv (5, 0);
orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Reconfig flag = %d\n",
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index ab42e2787f7..d3c59beb716 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -73,7 +73,6 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
CORBA::Object_var objref =
this->orb_->string_to_object (str
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Return if the server reference is nil.
if (CORBA::is_nil (objref.in ()))
@@ -87,7 +86,6 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
CosTime::TimeService_ptr server =
CosTime::TimeService::_narrow (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->insert_server (server);
}
@@ -197,12 +195,10 @@ Clerk_i::get_first_IOR (void)
this->naming_client_->resolve (server_context_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var server_context =
CosNaming::NamingContext::_narrow (temp_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_context.in ()))
ACE_DEBUG ((LM_DEBUG,
@@ -221,12 +217,10 @@ Clerk_i::get_first_IOR (void)
temp_object =
server_context->resolve (server_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTime::TimeService_var obj =
CosTime::TimeService::_narrow (temp_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -274,7 +268,6 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
while (iter->next_one (binding.out ()
ACE_ENV_ARG_PARAMETER))
{
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT("Getting IOR of the server: %s\n\n"),
@@ -287,20 +280,16 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
CORBA::Object_var temp_object =
server_context->resolve (server_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTime::TimeService_ptr server =
CosTime::TimeService::_narrow (temp_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->insert_server (server);
}
- ACE_TRY_CHECK;
}
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -347,7 +336,6 @@ Clerk_i::create_clerk (void)
CORBA::String_var objref_clerk =
this->orb_->object_to_string (this->time_service_clerk_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Print the clerk IOR on the console.
ACE_DEBUG ((LM_DEBUG,
@@ -421,7 +409,6 @@ Clerk_i::register_clerk (void)
this->naming_client_->rebind (clerk_name,
this->time_service_clerk_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -458,7 +445,6 @@ Clerk_i::init (int argc,
command.get_ASCII_argv()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->orb_manager_.init_child_poa (command.get_argc(),
command.get_ASCII_argv(),
@@ -468,7 +454,6 @@ Clerk_i::init (int argc,
ACE_TEXT("%p\n"),
ACE_TEXT("init_child_poa")),
-1);
- ACE_TRY_CHECK;
// Get the ORB.
this->orb_ = this->orb_manager_.orb ();
@@ -523,13 +508,12 @@ Clerk_i::init (int argc,
}
int
-Clerk_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Clerk_i::run (void)
{
ACE_TRY
{
// Run the main event loop for the ORB.
- int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int r = this->orb_manager_.run ();
if (r == -1)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 9f3f9283837..8f3ec2d5980 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -55,7 +55,7 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the Clerk state - parsing arguments and waiting.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the orb.
private:
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index b1c846e398f..53f4ca1e6ac 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -95,7 +95,6 @@ Server_i::create_server (void)
this->orb_manager_.activate_under_child_poa ("server",
this->time_service_server_impl_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::ObjectId_var id =
PortableServer::string_to_ObjectId ("server");
@@ -103,11 +102,9 @@ Server_i::create_server (void)
CORBA::Object_var server_ref =
this->orb_manager_.child_poa ()->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// All this !! just to register a servant with the child poa.
// Instead of using _this ().
@@ -117,7 +114,6 @@ Server_i::create_server (void)
CORBA::String_var objref_server =
this->orb_->object_to_string (server_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Print the server IOR on the console.
ACE_DEBUG ((LM_DEBUG,
@@ -190,7 +186,6 @@ Server_i::register_server (void)
this->naming_client_->rebind (server_name,
this->time_service_server_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT("Binding ServerContext -> %s\n"),
@@ -229,7 +224,6 @@ Server_i::init (int argc,
command.get_ASCII_argv(),
"time_server"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -238,8 +232,7 @@ Server_i::init (int argc,
-1);
// Activate the POA Manager.
- this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_manager_.activate_poa_manager ();
int result = this->parse_args (command.get_argc(), command.get_TCHAR_argv());
@@ -273,10 +266,9 @@ Server_i::init (int argc,
// Run the event loop for ORB.
int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
{
- int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int retval = this->orb_manager_.run ();
if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 7889d95e37b..390586bebc2 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -45,7 +45,7 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the Server state.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the orb.
int init_naming_service ();
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 97d8d30a3db..2b4f14da4a8 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -19,13 +19,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
ACE_TRY
{
int r = clerk.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (r == -1)
return 1;
else
{
- clerk.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ clerk.run ();
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index a265a39ed35..360517aaa19 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -19,14 +19,12 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
ACE_TRY
{
int r = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (r == -1)
return 1;
else
{
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index 21bbeee0fa2..f52fca4f0c5 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -14,12 +14,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
int check =
trader.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check != -1)
{
- trader.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ trader.run ();
}
else
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index d77402f07e2..77e5a442561 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -62,13 +62,12 @@ Trading_Service::init (int argc,
}
int
-Trading_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Trading_Service::run (void)
{
Trading_Shutdown trading_shutdown (*this);
int return_value =
- this->trading_loader_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->trading_loader_.run ();
return return_value;
}
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 951b67e6ecf..32ca5177e48 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -67,7 +67,7 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the Trading Service with arguments.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// 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 78b17a2bac9..8925acbf13b 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -39,12 +39,10 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
PortableServer::IdUniquenessPolicy_var idpolicy =
poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::IdAssignmentPolicy_var assignpolicy =
poa->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create a PolicyList
CORBA::PolicyList policy_list;
@@ -55,8 +53,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ());
PortableServer::POAManager_ptr manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa->the_POAManager ();
// @@ Pradeep : TODO - find a way to destroy the policy_list if we return here.
// Create the child POA.
@@ -65,13 +62,10 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ idpolicy->destroy ();
- assignpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ assignpolicy->destroy ();
//this->poa_ = PortableServer::POA::_duplicate (poa);
// uncomment this if we want to use the parent poa for some reason.
@@ -99,8 +93,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ PortableServer::POA_ptr defPOA = this->_default_POA ();
TAO_CEC_EventChannel_Attributes attr (defPOA, defPOA);
@@ -108,23 +101,19 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
ACE_NEW_THROW_EX (impl,
TAO_CEC_EventChannel (attr, 0, 0),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
auto_ptr <TAO_CEC_EventChannel> ec (impl);
- impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl->activate ();
this->poa_->activate_object_with_id (oid.in (),
ec.get ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ec.release ();
CORBA::Object_var obj =
this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (store_in_naming_service &&
!CORBA::is_nil (this->naming_.in ()))
@@ -136,7 +125,6 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
this->naming_->rebind (name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -182,7 +170,6 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
ec_return._retn ());
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (ec_return._retn ());
return ec_return._retn ();
}
@@ -210,15 +197,12 @@ TAO_CosEventChannelFactory_i::destroy
CORBA::Object_var obj =
this->poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosEventChannelAdmin::EventChannel_var fact_ec =
CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- fact_ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fact_ec->destroy ();
// Remove from the naming service.
if (unbind_from_naming_service &&
@@ -230,7 +214,6 @@ TAO_CosEventChannelFactory_i::destroy
this->naming_->unbind (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
@@ -250,7 +233,6 @@ TAO_CosEventChannelFactory_i::destroy
ACE_THROW (CosEventChannelFactory::NoSuchChannel ());
}
ACE_ENDTRY;
- ACE_CHECK;
}
CosEventChannelAdmin::EventChannel_ptr
@@ -276,7 +258,6 @@ TAO_CosEventChannelFactory_i::find
CORBA::Object_var obj =
this->poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
}
@@ -286,7 +267,6 @@ TAO_CosEventChannelFactory_i::find
ec_return._retn ());
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (ec_return._retn ());
return ec_return._retn ();
}
@@ -310,7 +290,6 @@ TAO_CosEventChannelFactory_i::find_channel_id
PortableServer::ObjectId_var oid =
this->poa_->reference_to_id (channel
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
str_return = PortableServer::ObjectId_to_string (oid.in ());
}
@@ -320,7 +299,6 @@ TAO_CosEventChannelFactory_i::find_channel_id
str_return._retn ());
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (str_return._retn ());
return str_return._retn ();
}
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 72c9ebc763b..5b34fa18129 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -24,17 +24,17 @@ public:
void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Initializes the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Try to get hold of a running naming service.
- void resolve_factory (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_factory (void);
// Try to resolve the factory from the Naming service.
CosEventChannelFactory::ChannelFactory_ptr
- create_factory (ACE_ENV_SINGLE_ARG_DECL);
+ create_factory (void);
// Create a local Factory and also set the <factory_>.
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void run_test (void);
// Runs a couple of tests to check if the factory behaves correctly.
protected:
@@ -94,16 +94,14 @@ FactoryClient::init_ORB (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -111,13 +109,12 @@ FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->use_naming_service = 1;
}
void
-FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::resolve_factory (void)
{
ACE_ASSERT (this->use_naming_service == 1);
@@ -128,16 +125,14 @@ FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->factory_ =
CosEventChannelFactory::ChannelFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::create_factory (void)
{
ACE_THROW_RETURN (CORBA::UNKNOWN (),
CosEventChannelFactory::ChannelFactory::_nil ());
@@ -159,7 +154,6 @@ FactoryClient::create_channel (const char *channel_id,
ec = factory->create (channel_id,
this->use_naming_service
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec.in ()));
@@ -195,7 +189,6 @@ FactoryClient::destroy_channel (const char *channel_id
this->factory_->destroy (channel_id,
use_naming_service
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -211,13 +204,11 @@ FactoryClient::find_channel (const char* channel_id
CosEventChannelAdmin::EventChannel_var channel =
this->factory_->find (channel_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var str =
orb_->object_to_string (channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Find returned - %s \n",
@@ -225,7 +216,6 @@ FactoryClient::find_channel (const char* channel_id
this->find_channel_id (channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::UserException, ue)
{
@@ -247,7 +237,6 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
CORBA::String_var str =
orb_->object_to_string (channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"trying to find the Channel %s \n",
@@ -256,7 +245,6 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
char *channel_id =
this->factory_->find_channel_id (channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"find returned %s\n", channel_id));
@@ -267,7 +255,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
*/
void
-FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::run_test (void)
{
ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
@@ -278,85 +266,68 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
cosec[0] = this->create_channel (channel_id[0],
this->factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// create the second cosec
cosec[1] = this->create_channel (channel_id[1],
this->factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// create the third cosec
cosec[2] = this->create_channel (channel_id[2],
this->factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// see it we can destroy this one..
this->destroy_channel (channel_id[2]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// see if we can find it?
this->find_channel_id (cosec[2].in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// see if we can create it again?
cosec[2] = this->create_channel (channel_id[2],
this->factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// try and find a channel that does not exist.
this->find_channel ("areyouthere?"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// see if it can detect duplicates.
this->create_channel (channel_id[2],
this->factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// see if it can give us the id?
this->find_channel_id (cosec[0].in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->find_channel_id (cosec[1].in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->find_channel_id (cosec[2].in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// check if we can get the channels from the id.
this->find_channel (channel_id[0]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->find_channel (channel_id[1]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->find_channel (channel_id[2]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
//destroy them all.
this->destroy_channel (channel_id[0]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->destroy_channel (channel_id[1]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->destroy_channel (channel_id[2]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// end of testing.
ACE_DEBUG ((LM_DEBUG,
@@ -375,14 +346,13 @@ main (int argc, char *argv [])
ft.init_ORB (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (naming)
{
- ft.resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ft.resolve_naming_service ();
ACE_TRY_CHECK_EX (naming);
- ft.resolve_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ft.resolve_factory ();
ACE_TRY_CHECK_EX (naming);
}
ACE_CATCHANY
@@ -392,13 +362,11 @@ main (int argc, char *argv [])
ACE_DEBUG ((LM_DEBUG,
"Creating a local Factory\n"));
// TBD:
- ft.create_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ft.create_factory ();
}
ACE_ENDTRY;
- ft.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ft.run_test ();
}
ACE_CATCH (CORBA::UserException, ue)
{
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index 845ee110d77..fb749869600 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -59,7 +59,6 @@ FactoryDriver::start (int argc, char *argv [])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->parse_args (argc, argv) == -1)
return -1;
@@ -72,7 +71,6 @@ FactoryDriver::start (int argc, char *argv [])
CORBA::Object_var poa_object =
orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,16 +80,13 @@ FactoryDriver::start (int argc, char *argv [])
root_poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+ root_poa_->the_POAManager ();
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate ();
- ACE_TRY_CHECK;
// Initialization of the naming service.
if (naming_client_.init (orb_.in ()) != 0)
@@ -113,17 +108,14 @@ FactoryDriver::start (int argc, char *argv [])
1);
// activate the factory in the root poa.
- factory_ = factory_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ factory_ = factory_servant_->_this ();
// Give the ownership to the POA.
- factory_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+ factory_servant_->_remove_ref ();
- ACE_TRY_CHECK;
CORBA::String_var
str = orb_->object_to_string (factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"CosEvent_Service: The Cos Event Channel Factory IOR is <%s>\n",
@@ -135,7 +127,6 @@ FactoryDriver::start (int argc, char *argv [])
naming_client_->rebind (name,
factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Registered with the naming service as %s\n", factoryName_));
@@ -155,7 +146,6 @@ FactoryDriver::start (int argc, char *argv [])
return 1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (1);
return 0;
}
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 68f393240e7..cea16cb5a36 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
@@ -25,24 +25,19 @@ RtEC_Based_CosEC::init_ORB (int& argc, char *argv []
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
int
@@ -108,13 +103,11 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
// initalize the ORB.
this->init_ORB (argc, argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->parse_args (argc, argv) == -1)
ACE_THROW (CORBA::BAD_PARAM ());
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->resolve_naming_service ();
this->init (this->poa_.in (),
this->poa_.in (),
@@ -122,10 +115,8 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
this->eventSourceIds_,
this->source_type_pairs_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->activate ();
// Register ourselves with the naming service.
ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
@@ -133,11 +124,9 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
CORBA::Object_var obj =
this->poa_->servant_to_reference (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::String_var str =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"The CosEC IOR is <%s>\n", str.in ()));
@@ -149,7 +138,6 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
this->naming_->rebind (name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Registered with the naming service as: %s\n",
@@ -157,29 +145,27 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
}
POA_RtecEventChannelAdmin::EventChannel_ptr
-RtEC_Based_CosEC::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::create_rtec (void)
{
// see if the user wants a local RtEC..
if (this->remote_rtec_ == 0)
- return CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return CosEC_ServantBase::create_rtec ();
else
return 0;
}
void
-RtEC_Based_CosEC::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::activate_rtec (void)
{
// see if the user wants to use a local RtEC..
if (this->remote_rtec_ == 0)
{
- CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosEC_ServantBase::activate_rtec ();
}
else
{
// Try to locate a remote rtec.
- this->locate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->locate_rtec ();
// Use the return value to check success.
if (CORBA::is_nil (this->rtec_.in ()))
@@ -189,18 +175,17 @@ RtEC_Based_CosEC::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
}
void
-RtEC_Based_CosEC::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::deactivate_rtec (void)
{
// Check if the local rtec is to be deactivated.
if (this->remote_rtec_ == 0)
{
- CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosEC_ServantBase::deactivate_rtec ();
}
}
void
-RtEC_Based_CosEC::locate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::locate_rtec (void)
{
CosNaming::Name ref_name (1);
ref_name.length (1);
@@ -210,21 +195,18 @@ RtEC_Based_CosEC::locate_rtec (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_->resolve (ref_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->rtec_ =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RtEC_Based_CosEC::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -233,7 +215,6 @@ RtEC_Based_CosEC::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -243,8 +224,7 @@ RtEC_Based_CosEC::run (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -256,11 +236,10 @@ RtEC_Based_CosEC::run (void)
}
void
-RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::shutdown (void)
{
// Deactivate.
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
// Unbind from the naming service.
CosNaming::Name name (1);
@@ -287,7 +266,6 @@ main (int argc, char *argv[])
service.startup (argc,
argv
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 72f1bd8224f..7c56f01d24d 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
@@ -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 (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void shutdown (void);
// Shutdown the COS Event Service.
// Returns 0 on success, -1 on error.
protected:
// = Methods from CosEC_ServantBase
virtual POA_RtecEventChannelAdmin::EventChannel_ptr
- create_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ create_rtec (void);
// Create a local rtec.
- virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void activate_rtec (void);
// Activates the rtec.
- virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void deactivate_rtec (void);
// Deactivates the rtec.
void init_ORB (int& argc, char *argv []
ACE_ENV_ARG_DECL);
// initialize the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Resolve the naming service.
- void locate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ void locate_rtec (void);
// 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 8aa8fcdb042..8f682906fc3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -26,15 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
}
CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
CosEventChannelAdmin::ProxyPushSupplier::_nil ();
RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier =
- this->rtec_consumeradmin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxysupplier_nil);
+ this->rtec_consumeradmin_->obtain_push_supplier ();
TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier;
@@ -47,19 +46,17 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
auto_proxysupplier (proxypushsupplier);
CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj =
- auto_proxysupplier.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxysupplier_nil);
+ auto_proxysupplier.get ()->_this ();
// give the ownership to the POA.
- auto_proxysupplier.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxysupplier_nil);
+ auto_proxysupplier.get ()->_remove_ref ();
auto_proxysupplier.release ();
return proxy_obj;
}
CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void)
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 e6142c993ef..e9895d9c3ab 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -47,12 +47,12 @@ public:
RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier(ACE_ENV_SINGLE_ARG_DECL)
+ obtain_push_supplier(void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Returns a new ProxyPushSupplier_ptr.
virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
- obtain_pull_supplier(ACE_ENV_SINGLE_ARG_DECL)
+ obtain_pull_supplier(void)
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 543fb669bf8..dfa5ddf64a0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -45,12 +45,10 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
this->poa_ = PortableServer::POA::_duplicate (poa);
auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
- auto_rtec_servant_ (this->create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ auto_rtec_servant_ (this->create_rtec ());
auto_ptr<TAO_CosEC_EventChannel_i>
- auto_cosec_servant_ (this->create_cosec (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ auto_cosec_servant_ (this->create_cosec ());
// if all the servants were allocated then set the class pointers.
this->rtec_servant_ = auto_rtec_servant_.release ();
@@ -58,18 +56,16 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
}
int
-CosEC_ServantBase::activate (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate (void)
{
ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
// Activate the Rtec
- this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->activate_rtec ();
// Activate the CosEC
- int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int retval = this->activate_cosec ();
if (retval != 0)
return -1;
@@ -79,15 +75,12 @@ CosEC_ServantBase::activate (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var oid =
this->thispoa_->activate_object (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->_remove_ref ();
CORBA::Object_var obj =
this->thispoa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0; // success.
}
@@ -100,12 +93,10 @@ CosEC_ServantBase::activate (const char* servant_id
ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
// Activate the Rtec
- this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->activate_rtec ();
// Activate the CosEC
- int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int retval = this->activate_cosec ();
if (retval != 0)
return -1;
@@ -117,42 +108,36 @@ CosEC_ServantBase::activate (const char* servant_id
this->thispoa_->activate_object_with_id (oid.in (),
this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->_remove_ref ();
CORBA::Object_var obj =
this->thispoa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0; // success.
}
void
-CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate_rtec (void)
{
// Activate the Rtec
PortableServer::ObjectId_var oid =
this->poa_->activate_object (this->rtec_servant_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->rtec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->rtec_servant_->_remove_ref ();
CORBA::Object_var obj =
this->poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->rtec_ =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
}
int
-CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate_cosec (void)
{
// Initialize the CosEC servant.
RtecBase::handle_t supp_handle = 0;
@@ -179,21 +164,17 @@ CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
this->rtec_.in ()
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_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- this->cosec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->cosec_servant_->_remove_ref ();
CORBA::Object_var obj =
this->poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->cosec_ =
CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -201,84 +182,75 @@ CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
}
void
-CosEC_ServantBase::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate (void)
{
// Deactivate all those we control...
- this->deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate_rtec ();
- this->deactivate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate_cosec ();
// Finally we go away..
PortableServer::ObjectId_var oid =
this->thispoa_->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// deactivate from the poa.
this->thispoa_->deactivate_object (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate_rtec (void)
{
// Deactivate the rtec.
PortableServer::ObjectId_var oid =
this->poa_->servant_to_id (this->rtec_servant_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// deactivate from the poa.
this->poa_->deactivate_object (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-CosEC_ServantBase::deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate_cosec (void)
{
// Deactivate the cosec.
PortableServer::ObjectId_var oid =
this->poa_->servant_to_id (this->cosec_servant_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// deactivate from the poa.
this->poa_->deactivate_object (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->cosec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->cosec_->for_consumers ();
}
CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->cosec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->cosec_->for_suppliers ();
}
void
-CosEC_ServantBase::destroy (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Deactivate all the contained servants and ourselves.
// The poa will "destroy" the ref counted servants.
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
}
POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::create_rtec (void)
{
// Create the RtEC servant.
TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
@@ -287,20 +259,18 @@ CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (_rtec_servant,
TAO_EC_Event_Channel (attr),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return _rtec_servant;
}
TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::create_cosec (void)
{
// Create the CosEC servant.
TAO_CosEC_EventChannel_i* _cosec_servant;
ACE_NEW_THROW_EX (_cosec_servant,
TAO_CosEC_EventChannel_i (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return _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 2738ff890fe..f24503e8d5d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -57,48 +57,48 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
// activate the contained servants.
// The POA <thispoa> is used to activate this.
- int activate (ACE_ENV_SINGLE_ARG_DECL);
+ int activate (void);
// Activates the CosEC with <thispoa_> and friends with the <poa_>
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 <this> servant.
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
// Deactivates the CosEC and friends with the POA.
// = POA_CosEventChannelAdmin::EventChannel methods.
- virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Destroys this Event Channel object.
protected:
// = RtEC creation, activation and deactivation methods.
virtual POA_RtecEventChannelAdmin::EventChannel_ptr
- create_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ create_rtec (void);
// Create a local rtec.
- virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void activate_rtec (void);
// Activates the rtec.
- virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void deactivate_rtec (void);
// Deactivates the rtec.
// = CosEC creation, activation and deactivation methods.
TAO_CosEC_EventChannel_i*
- create_cosec (ACE_ENV_SINGLE_ARG_DECL);
+ create_cosec (void);
// Create a local cosec.
- int activate_cosec (ACE_ENV_SINGLE_ARG_DECL);
+ int activate_cosec (void);
// Activates the cosec.
- void deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate_cosec (void);
// 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 e5dd9fb0348..fa31fe01016 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -38,36 +38,30 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
- rtec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ rtec->for_consumers ();
if (auto_consumer_.get ()->init (consumerqos,
rtec_consumeradmin) == -1)
return -1;
this->consumeradmin_ =
- auto_consumer_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ auto_consumer_.get ()->_this ();
// give the ownership to the POA.
- auto_consumer_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ auto_consumer_.get ()->_remove_ref ();
RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin =
- rtec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ rtec->for_suppliers ();
if (auto_supplier_.get ()->init (supplierqos,
rtec_supplieradmin) == -1)
return -1;
this->supplieradmin_ =
- auto_supplier_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ auto_supplier_.get ()->_this ();
// give the ownership to the POA.
- auto_supplier_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ auto_supplier_.get ()->_remove_ref ();
this->consumer_admin_ = auto_consumer_.release ();
this->supplier_admin_ = auto_supplier_.release ();
@@ -76,7 +70,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
}
CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CosEC_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_EventChannel_i::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// @@ Pradeep: you must make a copy here, because the caller is
@@ -86,7 +80,7 @@ TAO_CosEC_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CosEC_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_EventChannel_i::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// @@ Pradeep: you must make a copy here, because the caller is
@@ -96,29 +90,26 @@ TAO_CosEC_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_CosEC_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_EventChannel_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Deactivate the CosEventChannel
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id = poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplieradmin_ = CosEventChannelAdmin::SupplierAdmin::_nil ();
this->consumeradmin_ = CosEventChannelAdmin::ConsumerAdmin::_nil ();
}
void
-TAO_CosEC_EventChannel_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_EventChannel_i::shutdown (void)
{
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
}
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 74f25ca3ec2..c21f321099f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -55,21 +55,21 @@ public:
// Activates the ConsumerAdmin and SupplierAdmin servants. Returns
// -1 on error, 0 on success.
- virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The for_consumers method will return the same ConsumerAdmin_ptr
// everytime its called.
- virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The for_suppliers method will return the same SupplierAdmin_ptr
// everytime its called.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Destroys this Event Channel object.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
// destroys this Event Channel object and <delete>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 5870b6c33c7..eecc6a49195 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -31,7 +31,7 @@ public:
~TAO_CosEC_PushSupplierWrapper (void);
// Destructor.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Disconnects the push supplier.
@@ -63,25 +63,21 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
}
void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_->disconnect_push_supplier ();
// Deactivate the supplier proxy
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ If we keep a list remember to remove this object from the
// list.
@@ -138,29 +134,24 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
this->proxypushconsumer_->push (events
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->proxypushconsumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxypushconsumer_->disconnect_push_consumer ();
// Deactivate the ProxyPushConsumer
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -177,24 +168,20 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
ACE_NEW_THROW_EX (wrapper,
TAO_CosEC_PushSupplierWrapper (push_supplier),
CORBA::NO_MEMORY ());
- ACE_CHECK;
auto_ptr <TAO_CosEC_PushSupplierWrapper>
auto_wrapper (wrapper);
RtecEventComm::PushSupplier_ptr rtecpushsupplier
- = auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ = auto_wrapper.get ()->_this ();
// give the ownership to the POA.
- auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ auto_wrapper.get ()->_remove_ref ();
this->proxypushconsumer_->connect_push_supplier
(rtecpushsupplier,
this->qos_
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 b780b88d90a..ae38714b7bf 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -58,7 +58,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Suppliers call this method to pass data to connected consumers.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Disconnects the supplier from the event communication.
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 866c8a9e1a3..5a98c83414f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -35,7 +35,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// This method is called by the RTEvent Channel to supply data.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Disconnects the consumer from the event channel.
@@ -73,7 +73,6 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
{
this->consumer_->push (set[i].data.any_value
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -84,25 +83,21 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
}
void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Deactivate the supplier proxy.
- this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_->disconnect_push_consumer ();
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ If we keep a list remember to remove this object from the
// list.
@@ -124,25 +119,21 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
}
void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->pps_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->pps_->disconnect_push_supplier ();
// Deactivate the supplier proxy
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ If we keep a list remember to remove this object from the
// list.
@@ -165,23 +156,19 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
ACE_NEW_THROW_EX (wrapper,
TAO_CosEC_PushConsumerWrapper (push_consumer),
CORBA::NO_MEMORY ());
- ACE_CHECK;
auto_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper);
// @@ This code is not exception safe.
RtecEventComm::PushConsumer_ptr rtecpushconsumer =
- auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ auto_wrapper.get ()->_this ();
// give the ownership to the POA.
- auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ auto_wrapper.get ()->_remove_ref ();
this->pps_->connect_push_consumer (rtecpushconsumer,
this->qos_
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 199a596c0bf..c81cd6a4a04 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -46,7 +46,7 @@ public:
~TAO_CosEC_ProxyPushSupplier_i (void);
// Destructor.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Ends the event communication and disposes this object.
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 97af59df51a..09fd6da3817 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -26,15 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
}
CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
CosEventChannelAdmin::ProxyPushConsumer::_nil ();
RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer =
- this->rtec_supplieradmin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxyconsumer_nil);
+ this->rtec_supplieradmin_->obtain_push_consumer ();
TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer;
@@ -46,19 +45,17 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
auto_proxyconsumer (proxypushconsumer);
CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj =
- auto_proxyconsumer.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxyconsumer_nil);
+ auto_proxyconsumer.get ()->_this ();
// give the ownership to the POA.
- auto_proxyconsumer.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxyconsumer_nil);
+ auto_proxyconsumer.get ()->_remove_ref ();
auto_proxyconsumer.release ();
return proxy_obj;
}
CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void)
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 7642b282601..7a7c39daf94 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -49,12 +49,12 @@ public:
// error.
virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Returns a new ProxyPushConsumer_ptr.
virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
- obtain_pull_consumer(ACE_ENV_SINGLE_ARG_DECL)
+ obtain_pull_consumer(void)
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 bd0b2585f86..b9f7d2691f3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -13,13 +13,10 @@ main (int argc, char *argv [])
ACE_TRY
{
basic.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- basic.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ basic.run ();
- basic.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ basic.shutdown ();
}
ACE_CATCH (CORBA::UserException, ue)
{
@@ -34,7 +31,6 @@ main (int argc, char *argv [])
return 1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (1);
return 0;
}
@@ -54,10 +50,8 @@ Basic::init (int argc, char *argv[]
ACE_ENV_ARG_DECL)
{
this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->init_CosEC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->init_CosEC ();
}
void
@@ -68,12 +62,10 @@ Basic::init_ORB (int argc, char *argv []
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR ((LM_ERROR,
@@ -82,25 +74,21 @@ Basic::init_ORB (int argc, char *argv []
root_poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
void
-Basic::init_CosEC (ACE_ENV_SINGLE_ARG_DECL)
+Basic::init_CosEC (void)
{
CosEC_ServantBase *ec = 0;
ACE_NEW_THROW_EX (ec,
CosEC_ServantBase (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
PortableServer::ServantBase_var ec_var (ec);
@@ -108,10 +96,8 @@ Basic::init_CosEC (ACE_ENV_SINGLE_ARG_DECL)
this->root_poa_.in(),
0,0,0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- int retval = ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int retval = ec->activate ();
if (retval == -1)
ACE_THROW (CORBA::UNKNOWN ());
@@ -119,16 +105,14 @@ Basic::init_CosEC (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->root_poa_->servant_to_reference (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->cos_ec_ =
CosEventChannelAdmin::EventChannel::_narrow (obj._retn ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Basic::run (ACE_ENV_SINGLE_ARG_DECL)
+Basic::run (void)
{
// Create an Any type to pass to the Cos EC.
CORBA::Any any;
@@ -137,21 +121,16 @@ Basic::run (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_.open (this->cos_ec_.in (),
this->orb_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->consumer_.connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_.connect ();
this->supplier_.open (this->cos_ec_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->supplier_.connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_.connect ();
this->supplier_.send_event (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// this->orb_->run ();
// @@ commenting out the run-shutdown mechanism for now because it gives
@@ -163,14 +142,11 @@ Basic::run (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
{
- this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_.close ();
- this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_.close ();
- this->cos_ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->cos_ec_->destroy ();
}
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 df713f5766f..667cde63000 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -40,11 +40,11 @@ public:
// Starts up an ORB and the CosEC.
// Returns 0 on success, -1 on error.
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
// Connects a consumer and a supplier to the CosEC and sends 1 event
// across.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
// Closes down the CosEC.
private:
@@ -52,7 +52,7 @@ private:
// initializes the ORB.
// Returns 0 on success, -1 on error.
- void init_CosEC (ACE_ENV_SINGLE_ARG_DECL);
+ void init_CosEC (void);
// 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 03259f3a123..ef40ec37bf5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -12,48 +12,42 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
// = Connect as a consumer.
this->consumer_admin_ =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_consumers ();
}
void
-Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::close (void)
{
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect ();
this->consumer_admin_ =
CosEventChannelAdmin::ConsumerAdmin::_nil ();
}
void
-Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::connect (void)
{
if (CORBA::is_nil (this->consumer_admin_.in ()))
return;
CosEventComm::PushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
this->supplier_proxy_ =
- this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->obtain_push_supplier ();
this->supplier_proxy_->connect_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ())
|| CORBA::is_nil (this->consumer_admin_.in ()))
return;
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
this->supplier_proxy_ =
CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -74,7 +68,7 @@ Consumer::push (const CORBA::Any &
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -82,15 +76,12 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object.
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
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 c1ced5cbc08..1a9cda33bed 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -37,13 +37,13 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the consumer to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
// Connect the Consumer to the EventChannel.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier, but do not forget about it or close
// it.
@@ -55,7 +55,7 @@ public:
));
// push the event to the consumer.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
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 59cfc9cd251..b1d3bb54051 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -9,47 +9,41 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
{
// = Connect as a consumer.
this->supplier_admin_ =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_suppliers ();
}
void
-Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::close (void)
{
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect ();
this->supplier_admin_ =
CosEventChannelAdmin::SupplierAdmin::_nil ();
}
void
-Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::connect (void)
{
if (CORBA::is_nil (this->supplier_admin_.in ()))
return;
this->consumer_proxy_ =
- this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_admin_->obtain_push_consumer ();
- CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosEventComm::PushSupplier_var objref = this->_this ();
this->consumer_proxy_->connect_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ())
|| CORBA::is_nil (this->supplier_admin_.in ()))
return;
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
this->consumer_proxy_ =
CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -60,11 +54,10 @@ Supplier::send_event (const CORBA::Any & data
ACE_ENV_ARG_DECL)
{
this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -72,15 +65,12 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object.
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
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 413244fc4f4..76c4f16fc6d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -35,19 +35,19 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the EC, but do not forget about it or close it.
void send_event (const CORBA::Any &data
ACE_ENV_ARG_DECL);
// Send one event.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
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 9cdb697eff1..0af6ef66545 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -49,48 +49,42 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel
{
// = Connect as a consumer.
this->consumer_admin_ =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_consumers ();
}
void
-Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::close (void)
{
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect ();
this->consumer_admin_ =
CosEventChannelAdmin::ConsumerAdmin::_nil ();
}
void
-Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::connect (void)
{
if (CORBA::is_nil (this->consumer_admin_.in ()))
return;
CosEventComm::PushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
this->supplier_proxy_ =
- this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->obtain_push_supplier ();
this->supplier_proxy_->connect_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ())
|| CORBA::is_nil (this->consumer_admin_.in ()))
return;
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
this->supplier_proxy_ =
CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -121,15 +115,14 @@ Consumer::push (const CORBA::Any &
"(%P):%s\n",
"exiting the consumer."));
- this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->close ();
this->shutdown ();
}
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -137,17 +130,14 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object.
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -158,10 +148,8 @@ Consumer::init_Consumer (void)
{
this->open (this->cos_ec_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->connect ();
}
ACE_CATCHANY
{
@@ -170,7 +158,6 @@ Consumer::init_Consumer (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
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 ce523fed960..34b3ac56b02 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -44,13 +44,13 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the consumer to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
// Connect the Consumer to the EventChannel.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier, but do not forget about it or close
// it.
@@ -62,7 +62,7 @@ public:
));
// push the event to the consumer.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
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 4af0b93b9aa..2bf8bb0251c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -46,12 +46,10 @@ Multiple::init_ORB (int argc, char *argv [])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,14 +59,11 @@ Multiple::init_ORB (int argc, char *argv [])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
}
ACE_CATCHANY
{
@@ -77,7 +72,6 @@ Multiple::init_ORB (int argc, char *argv [])
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -103,7 +97,6 @@ Multiple::init_CosEC (void)
CORBA::Object_var EC_obj =
this->naming_client_->resolve (ec_ref_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The CORBA::Object_var object is downcast to
// CosEventChannelAdmin::EventChannel
@@ -111,7 +104,6 @@ Multiple::init_CosEC (void)
this->cos_ec_ =
CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -120,7 +112,6 @@ Multiple::init_CosEC (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -131,8 +122,7 @@ Multiple::runORB (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
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 7d9a03c9261..229e900ebc1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -48,47 +48,41 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
{
// = Connect as a consumer.
this->supplier_admin_ =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_suppliers ();
}
void
-Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::close (void)
{
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect ();
this->supplier_admin_ =
CosEventChannelAdmin::SupplierAdmin::_nil ();
}
void
-Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::connect (void)
{
if (CORBA::is_nil (this->supplier_admin_.in ()))
return;
this->consumer_proxy_ =
- this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_admin_->obtain_push_consumer ();
- CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosEventComm::PushSupplier_var objref = this->_this ();
this->consumer_proxy_->connect_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ())
|| CORBA::is_nil (this->supplier_admin_.in ()))
return;
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
this->consumer_proxy_ =
CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -99,11 +93,10 @@ Supplier::send_event (const CORBA::Any & data
ACE_ENV_ARG_DECL)
{
this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -111,17 +104,14 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object.
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -136,10 +126,8 @@ Supplier::run (void)
this->open (this->cos_ec_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->connect ();
ACE_DEBUG ((LM_DEBUG,
"(%P):sending %d events...\n",
@@ -151,14 +139,12 @@ Supplier::run (void)
{
this->send_event (any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG ((LM_DEBUG,
"(%P):Done!. exiting now..\n"));
- this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->close ();
}
ACE_CATCHANY
{
@@ -166,7 +152,6 @@ Supplier::run (void)
"Exception in CosEC_Multiple::run\n");
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
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 29b213cd31f..8877f23fb43 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -41,19 +41,19 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the EC, but do not forget about it or close it.
void send_event (const CORBA::Any &data
ACE_ENV_ARG_DECL);
// Send one event.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index bcf4fcfc551..3b1a89cd878 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -31,7 +31,6 @@ Consumer::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
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
// the Consumer object.
@@ -46,43 +45,33 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// 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] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosEventChannelAdmin::EventChannel_var event_channel =
CosEventChannelAdmin::EventChannel::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The canonical protocol to connect to the EC
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
CosEventChannelAdmin::ProxyPushSupplier_var supplier =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
CosEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
supplier->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Wait for events, using work_pending()/perform_work() may help
// or using another thread, this example is too simple for that.
@@ -119,7 +108,7 @@ Consumer::push (const CORBA::Any &
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 7156353e483..7866f29a31a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -43,7 +43,7 @@ public:
virtual void push (const CORBA::Any &event
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
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 07a78aea874..b0ea4951164 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -24,7 +24,6 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
{
@@ -35,30 +34,23 @@ main (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
TAO_CEC_EventChannel_Attributes attributes (poa.in (),
poa.in ());
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
CORBA::String_var ior =
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 3886f6d085a..51c8024d371 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -31,7 +31,6 @@ Supplier::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (argc <= 1)
{
@@ -42,43 +41,33 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// 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] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosEventChannelAdmin::EventChannel_var event_channel =
CosEventChannelAdmin::EventChannel::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The canonical protocol to connect to the EC
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
CosEventChannelAdmin::ProxyPushConsumer_var consumer =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
CosEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
consumer->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Push the events...
ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -89,28 +78,22 @@ Supplier::run (int argc, char* argv[])
for (int i = 0; i != 2000; ++i)
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::sleep (sleep_time);
}
// Disconnect from the EC
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
// Destroy the EC....
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivate this object...
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -122,7 +105,7 @@ Supplier::run (int argc, char* argv[])
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 4fdc39bfa08..ca9e1267edb 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index db6437a39bd..f503810130a 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -5,8 +5,8 @@
#include "Country_i.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID (CosEC_Examples,
- Consumer,
+ACE_RCSID (CosEC_Examples,
+ Consumer,
"$Id$")
int
@@ -19,43 +19,34 @@ main (int argc, char* argv[])
// ORB initialization...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_obj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (poa_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel using the Naming Service.
- CORBA::Object_var nam_obj =
+ CORBA::Object_var nam_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
CosNaming::NamingContext_var root_context =
CosNaming::NamingContext::_narrow(nam_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name channel_name (1);
channel_name.length (1);
channel_name[0].id = CORBA::string_dup ("CountryEventChannel");
- CORBA::Object_var ec_obj =
+ CORBA::Object_var ec_obj =
root_context->resolve(channel_name);
- ACE_TRY_CHECK;
// Downcast the object reference to a TypedEventChannel reference
CosTypedEventChannelAdmin::TypedEventChannel_var typed_event_channel =
CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialise the Country Impl
Country_i country (orb.in ());
@@ -63,19 +54,16 @@ main (int argc, char* argv[])
// Connect to the typed channel
CosTypedEventChannelAdmin::TypedConsumerAdmin_var typed_consumer_admin =
- typed_event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ typed_event_channel->for_consumers ();
CosEventChannelAdmin::ProxyPushSupplier_var proxy_push_supplier =
typed_consumer_admin->obtain_typed_push_supplier (_tc_Country->id()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
proxy_push_supplier->connect_push_consumer (typed_consumer.in () );
CORBA::String_var str =
orb->object_to_string (typed_consumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
const char* ior_file_name = "Consumer.ior";
FILE *output_file=
@@ -97,11 +85,9 @@ main (int argc, char* argv[])
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the ORB
orb->destroy ();
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index bbf4b03a030..0c5d3120256 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -9,12 +9,12 @@ Country_i::Country_i (CORBA::ORB_ptr orb) :
orb_ (CORBA::ORB::_duplicate (orb))
{
}
-
+
// Implementation skeleton destructor
Country_i::~Country_i (void)
{
}
-
+
void Country_i::update_population (const char * country,
CORBA::Long population
ACE_ENV_ARG_DECL_NOT_USED)
@@ -23,25 +23,24 @@ void Country_i::update_population (const char * country,
{
//Add your implementation here
ACE_DEBUG ((LM_DEBUG, "Country %s has population %d\n",
- country, population));
+ country, population));
}
-
+
CORBA::Object_ptr
-Country_i::get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Country_i::get_typed_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
//Add your implementation here
ACE_DEBUG ((LM_DEBUG, "Country_i::get_typed_consumer called...\n"));
- Country_var ret = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ Country_var ret = this->_this ();
ACE_DEBUG ((LM_DEBUG, "...returning CORBA::Object_ptr for Country_i\n"));
return Country::_duplicate(ret.in ());
}
-
+
void
Country_i::push (const CORBA::Any & /* data */
ACE_ENV_ARG_DECL_NOT_USED)
@@ -51,9 +50,9 @@ Country_i::push (const CORBA::Any & /* data */
{
//Add your implementation here
}
-
+
void
-Country_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Country_i::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -62,19 +61,15 @@ Country_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate the impl
PortableServer::POA_var t_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ this->_default_POA ();
+
PortableServer::ObjectId_var t_id =
t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Country_i::disconnect_push_consumer, ")
ACE_TEXT ("calling ORB shutdown...\n")));
orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index 3d658086c47..dc31a1c0429 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -15,18 +15,18 @@
class Country_i : public virtual POA_Country
{
public:
- //Constructor
+ //Constructor
Country_i (CORBA::ORB_ptr orb);
-
- //Destructor
+
+ //Destructor
virtual ~Country_i (void);
-
+
virtual void update_population (const char * country,
CORBA::Long population
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Object_ptr get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Object_ptr get_typed_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void push (const CORBA::Any & data
@@ -34,7 +34,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
CosEventComm::Disconnected));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index d384fad33cf..785f9a8f2e5 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -16,69 +16,56 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Obtain the event channel using the Naming Service.
- CORBA::Object_var nam_obj =
+ CORBA::Object_var nam_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
CosNaming::NamingContext_var root_context =
CosNaming::NamingContext::_narrow(nam_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name channel_name (1);
channel_name.length (1);
channel_name[0].id = CORBA::string_dup ("CountryEventChannel");
- CORBA::Object_var ec_obj =
+ CORBA::Object_var ec_obj =
root_context->resolve(channel_name);
- ACE_TRY_CHECK;
// Downcast the object reference to a TypedEventChannel reference
CosTypedEventChannelAdmin::TypedEventChannel_var typed_event_channel =
CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Connect to the typed channel
CosTypedEventChannelAdmin::TypedSupplierAdmin_var typed_supplier_admin =
- typed_event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ typed_event_channel->for_suppliers ();
CosTypedEventChannelAdmin::TypedProxyPushConsumer_var typed_proxy_push_consumer =
typed_supplier_admin->obtain_typed_push_consumer (_tc_Country->id()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
typed_proxy_push_consumer->connect_push_supplier (CosEventComm::PushSupplier::_nil()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Obtain the interface from the event channel
- CORBA::Object_var typed_consumer =
- typed_proxy_push_consumer->get_typed_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Object_var typed_consumer =
+ typed_proxy_push_consumer->get_typed_consumer();
// Narrow the interface
Country_var typed_supplier = Country::_narrow(typed_consumer.in () );
- ACE_TRY_CHECK;
// Invoke the events...
for (int i = 0; i != 100; ++i)
{
typed_supplier->update_population ("England", i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Disconnect from the EC
- typed_proxy_push_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ typed_proxy_push_consumer->disconnect_push_consumer ();
// Destroy the EC....
- typed_event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ typed_event_channel->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index ed3b767e2f4..ab3ca193d29 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -45,12 +45,10 @@ ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
interceptor = tmp_interceptor;
}
info->add_server_request_interceptor (interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 09f6561e04e..62da70797a9 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -60,17 +60,14 @@ associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state)
CORBA::Object_var pic_obj =
orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableInterceptor::Current_var pic =
PortableInterceptor::Current::_narrow (
pic_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
pic->set_slot (state_slot_id (), state ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -97,11 +94,9 @@ ReplicaController (CORBA::ORB_ptr orb)
{
CORBA::Object_var poa_object =
orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_poa_ = PortableServer::POA::_narrow (
poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -286,15 +281,13 @@ ReplicaController::send_reply (
// Prepare reply for logging.
CORBA::Any_var result =
- ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->result ();
TAO_OutputCDR cdr;
result->impl ()->marshal_value (cdr);
Dynamic::ParameterList_var pl =
- ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->arguments ();
CORBA::ULong len = pl->length ();
@@ -444,7 +437,6 @@ namespace
IOP::ServiceContext_var svc =
ri->get_request_service_context (IOP::FT_REQUEST
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
svc->context_data.length ());
@@ -491,7 +483,7 @@ namespace
char*
-ReplicaController::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReplicaController::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("ReplicaController");
@@ -516,7 +508,7 @@ ReplicaController::send_other (
}
void
-ReplicaController::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReplicaController::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index 6c7bcadb647..419e6694379 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -40,11 +40,11 @@ public:
public:
virtual char *
- name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void
- destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index d3c4a92cde6..c1445dec04a 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -63,7 +63,7 @@ RolyPoly_i::number (char *&str
}
void
-RolyPoly_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+RolyPoly_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
index 86098f033e9..6056af89eb4 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
@@ -32,7 +32,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E));
virtual void
- shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index af43025ffa2..26f0113ffc4 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -62,7 +62,6 @@ main (int argc, char *argv[])
argv,
"Client ORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (::parse_args (argc, argv) != 0) return -1;
@@ -101,18 +100,15 @@ main (int argc, char *argv[])
object_primary =
orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Get an object reference for the ORBs IORManipultion object!
CORBA::Object_ptr IORM =
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create the list
@@ -120,7 +116,7 @@ main (int argc, char *argv[])
iors.length(ior_strs.size ());
size_t cntr = 0;
iors [cntr] = CORBA::Object::_duplicate (object_primary.in ());
-
+
while (ior_iter.advance ())
{
++cntr;
@@ -129,14 +125,12 @@ main (int argc, char *argv[])
iors [cntr] =
orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n"));
// Create a merged set 1;
object = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -165,13 +159,11 @@ main (int argc, char *argv[])
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
retval = iorm->set_primary (&iogr_prop,
object_primary.in (),
object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
@@ -182,12 +174,10 @@ main (int argc, char *argv[])
"Unable to extract the only IOR string\n"),
-1);
object = orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
RolyPoly_var server =
RolyPoly::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -216,7 +206,6 @@ main (int argc, char *argv[])
continue;
}
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_INFO,
"client: received %d\n",
@@ -224,8 +213,7 @@ main (int argc, char *argv[])
ACE_OS::sleep (1);
}
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 65c0587a9b7..6ee21282f1b 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -57,15 +57,12 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,11 +71,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
RolyPoly_i* roly_poly_impl;
@@ -89,17 +84,14 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer (roly_poly_impl);
RolyPoly_var t =
- roly_poly_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ roly_poly_impl->_this ();
CORBA::PolicyList policies; // Empty policy list.
CORBA::String_var ior =
orb->object_to_string (t.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
FILE *output_file= ACE_OS::fopen (ior_file, "w");
if (output_file == 0)
@@ -117,14 +109,11 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "Server is ready\n"));
// Run the ORB event loop.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
}
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index a3d821fde70..514c2e69b97 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -21,7 +21,7 @@ public:
}
virtual ~test_i (void) {
}
- virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) {
+ virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_));
return n_;
}
@@ -41,7 +41,7 @@ POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poam
int main(int argc, char* argv[]) {
try {
-
+
ORB_var orb = ORB_init(argc, argv);
Object_var obj = orb->resolve_initial_references("RootPOA");
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index f6239df905c..256fc9ad668 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -40,14 +40,12 @@ ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var sr_interceptor =
this->interceptor_;
info->add_server_request_interceptor (sr_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
ACE_NEW_THROW_EX (reject_interceptor,
@@ -57,14 +55,12 @@ ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
reject_interceptor;
info->add_server_request_interceptor (safe_reject_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 431ebd7622f..efe8447563c 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -31,7 +31,7 @@ RPS_Monitor::~RPS_Monitor (void)
}
CosLoadBalancing::Location *
-RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::the_location (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Location * location;
@@ -42,13 +42,12 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return location;
}
CosLoadBalancing::LoadList *
-RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::loads (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
@@ -72,7 +71,6 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
CosLoadBalancing::LoadList_var load_list = tmp;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 8deb50cae85..a99b6790c45 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -15,14 +15,14 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void)
}
char *
-ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("ServerRequestInterceptor");
}
void
-ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 7768134b610..aaa221fb225 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -61,10 +61,10 @@ public:
* ServerRequestInterceptors.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index 59c96439de0..df699b43783 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -27,7 +27,7 @@ StockFactory::get_stock (const char *symbol)
}
void
-StockFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+StockFactory::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 47bf026ce81..0d721a9a0d3 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -17,7 +17,7 @@ public:
Test::Stock_ptr get_stock (const char *symbol)
throw (Test::Invalid_Stock_Symbol);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 47508dba78e..76981136d71 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -55,18 +55,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::StockFactory_var stockfactory =
Test::StockFactory::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (stockfactory.in ()))
{
@@ -92,11 +89,9 @@ main (int argc, char *argv[])
price));
}
- //stockfactory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- //ACE_TRY_CHECK;
+ //stockfactory->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 66d41596ce8..017c1bb85a6 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -80,12 +80,10 @@ join_object_group (CORBA::ORB_ptr orb,
CORBA::Object_var ns_object =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CosNaming::NamingContext_var nc =
CosNaming::NamingContext::_narrow (ns_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CosNaming::Name name (1);
name.length (1);
@@ -99,7 +97,6 @@ join_object_group (CORBA::ORB_ptr orb,
{
group = nc->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
{
@@ -125,7 +122,6 @@ join_object_group (CORBA::ORB_ptr orb,
criteria,
fcid.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (foo)
{
@@ -196,7 +192,6 @@ join_object_group (CORBA::ORB_ptr orb,
lm->set_default_properties (props
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
{
@@ -211,28 +206,23 @@ join_object_group (CORBA::ORB_ptr orb,
ACE_TRY_CHECK_EX (foo);
}
ACE_ENDTRY;
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
StockFactory * stockfactory_impl;
ACE_NEW_THROW_EX (stockfactory_impl,
StockFactory (orb, number),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableServer::ServantBase_var owner_transfer (stockfactory_impl);
Test::StockFactory_var stockfactory =
- stockfactory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ stockfactory_impl->_this ();
group = lm->add_member (group.in (),
location,
stockfactory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return group._retn ();
}
@@ -251,17 +241,14 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -271,61 +258,50 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var lm_object =
orb->resolve_initial_references ("LoadManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_var load_manager =
CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RPS_Monitor * monitor_servant;
ACE_NEW_THROW_EX (monitor_servant,
RPS_Monitor (initializer->interceptor ()),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
PortableServer::ServantBase_var safe_monitor_servant (monitor_servant);
CosLoadBalancing::LoadMonitor_var load_monitor =
- monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ monitor_servant->_this ();
PortableGroup::Location_var location =
- load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ load_monitor->the_location ();
CORBA::Object_var stockfactory =
::join_object_group (orb.in (),
load_manager.in (),
location.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
CosLoadBalancing::LoadAlert_var load_alert =
- alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ alert_servant._this ();
CORBA::String_var ior =
orb->object_to_string (stockfactory.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -340,23 +316,18 @@ main (int argc, char *argv[])
load_manager->register_load_monitor (location.in (),
load_monitor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
load_manager->register_load_alert (location.in (),
load_alert.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 6c4fd3a47b3..13c374d5418 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -28,11 +28,8 @@ void
TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
{
init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ resolve_naming_service ();
+ resolve_TLS_Basic_factory ();
}
void
@@ -44,16 +41,14 @@ TLS_Client::init_ORB (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TLS_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TLS_Client::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -61,11 +56,10 @@ TLS_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TLS_Client::resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_DECL)
+TLS_Client::resolve_TLS_Basic_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -74,16 +68,14 @@ TLS_Client::resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->basic_log_factory_ =
DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
+TLS_Client::run_tests (void)
{
ACE_ASSERT (!CORBA::is_nil (this->basic_log_factory_.in ()));
@@ -102,7 +94,6 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
max_size,
logid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Create returned logid = %d\n",logid));
@@ -119,16 +110,13 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG,
"Writing %d records...\n", LOG_EVENT_COUNT));
basic_log->write_records (any_seq ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling BasicLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- CORBA::ULongLong retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULongLong retval = basic_log->get_n_records ();
#else
- CORBA::Long retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_CHECK;
+ CORBA::Long retval = basic_log->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -136,11 +124,9 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG,
"Calling BasicLog::get_current_size...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ retval = basic_log->get_current_size ();
#else
- retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_CHECK;
+ retval = basic_log->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -167,16 +153,13 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
"Deleting records... \n"));
retval = basic_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling BasicLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ retval = basic_log->get_n_records ();
#else
- retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_CHECK;
+ retval = basic_log->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -184,15 +167,12 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ retval = basic_log->get_current_size ();
#else
- retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_CHECK;
+ retval = basic_log->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
- basic_log->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ basic_log->destroy ();
}
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index b06ffc65f92..c8a1449a7ac 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -34,17 +34,17 @@ class TLS_Client
void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Init the Client.
- void run_tests (ACE_ENV_SINGLE_ARG_DECL);
+ void run_tests (void);
// Run the tests..
protected:
void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Initializes the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Try to get hold of a running naming service.
- void resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_TLS_Basic_factory (void);
// Try to resolve the TLS factory from the Naming service.
// = Data Members
@@ -58,6 +58,6 @@ class TLS_Client
// The basic log factory from the Log Service.
-
+
};
#endif /* TLS_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index 3b5098b43ad..7940caf6185 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -15,11 +15,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
client.init (argc, argv
ACE_ENV_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
- client.run_tests (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
+ client.run_tests (); //Init the Client
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::UserException, ue)
{
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 1b102beac2f..daa132a06ca 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -33,7 +33,6 @@ Consumer::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
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
// the Consumer object.
@@ -41,21 +40,16 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -63,7 +57,6 @@ Consumer::run (int argc, char* argv[])
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -72,18 +65,16 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->event_log_factory_ =
DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->supplier_ =
this->event_log_factory_->obtain_push_supplier ();
CosEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->_this ();
this->supplier_->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
@@ -120,7 +111,7 @@ Consumer::push (const CORBA::Any &
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 946299dc55d..c3bb44535a1 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -46,7 +46,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index f65f4a420e9..e9dad2f3b4c 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -36,25 +36,19 @@ Supplier::run (int argc, char* argv[])
// ORB initialization boiler plate...
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -62,7 +56,6 @@ Supplier::run (int argc, char* argv[])
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
@@ -72,12 +65,10 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->event_log_factory_ =
DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->event_log_factory_.in ()));
@@ -100,20 +91,19 @@ Supplier::run (int argc, char* argv[])
threshold,
logid
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Create returned logid = %d\n",logid));
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_log->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ event_log->for_suppliers ();
this->consumer_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ supplier_admin->obtain_push_consumer ();
CosEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->_this ();
this->consumer_->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
@@ -128,16 +118,13 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG,
"Writing %d records...\n", LOG_EVENT_COUNT));
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling EventLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- CORBA::ULongLong retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::ULongLong retval = event_log->get_n_records ();
#else
- CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ CORBA::Long retval = event_log->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -145,11 +132,9 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG,
"Calling EventLog::get_current_size...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ();
#else
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -175,16 +160,13 @@ Supplier::run (int argc, char* argv[])
"Deleting records... \n"));
retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling EventLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = event_log->get_n_records ();
#else
- retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = event_log->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -192,35 +174,28 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ();
#else
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
// Disconnect from the EC
- this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumer_->disconnect_push_consumer ();
// Destroy the EC....
- //event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- event_log->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ //event_channel->destroy ();
+ event_log->destroy ();
// Deactivate this object...
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -233,7 +208,7 @@ Supplier::run (int argc, char* argv[])
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index c37b9a5c9df..bc989ce8643 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -7,7 +7,7 @@
* $Id$
*
* An example of using the Event_Logging_Service.
- *
+ *
*
*
* @author D A Hanvey (d.hanvey@qub.ac.uk)
@@ -42,7 +42,7 @@ public:
// = The CosEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 0d27c8860d3..7d99a17e566 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -41,7 +41,6 @@ Consumer::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
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
// the Consumer object.
@@ -49,21 +48,16 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -71,7 +65,6 @@ Consumer::run (int argc, char* argv[])
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
@@ -81,22 +74,18 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->notify_log_factory_ =
DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyComm::PushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
ACE_ASSERT (!CORBA::is_nil (objref.in ()));
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
this->notify_log_factory_->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -104,13 +93,11 @@ Consumer::run (int argc, char* argv[])
this->proxy_supplier_ =
CosNotifyChannelAdmin::ProxyPushSupplier::
_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
proxy_supplier_->connect_any_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
orb_->run ();
@@ -149,14 +136,13 @@ Consumer::push (const CORBA::Any &event
void
Consumer::disconnect_push_consumer
- (ACE_ENV_SINGLE_ARG_DECL)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
this->proxy_supplier_->
- disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disconnect_push_supplier();
}
void
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 86fbfd2be3c..f54c55164e9 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -45,14 +45,12 @@ Supplier::run (int argc, char* argv[])
// ORB initialization boiler plate...
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -60,7 +58,6 @@ Supplier::run (int argc, char* argv[])
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
@@ -70,12 +67,10 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->notify_log_factory_ =
DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->notify_log_factory_.in ()));
@@ -101,7 +96,6 @@ Supplier::run (int argc, char* argv[])
logid
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Create returned logid = %d\n",logid));
@@ -124,13 +118,11 @@ Supplier::run (int argc, char* argv[])
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
CosNotifyFilter::FilterFactory_var ffact =
- notify_log_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ notify_log_->default_filter_factory ();
// setup a filter at the consumer admin
CosNotifyFilter::Filter_var sa_filter =
ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
@@ -141,18 +133,15 @@ Supplier::run (int argc, char* argv[])
constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// startup the first supplier
ACE_NEW_THROW_EX (supplier_1,
- Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_PARAMETER),
+ Filter_StructuredPushSupplier (),
CORBA::NO_MEMORY ());
supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// operations:
CosNotification::StructuredEvent event;
@@ -198,18 +187,15 @@ Supplier::run (int argc, char* argv[])
event.remainder_of_body <<= (CORBA::Long)k;
supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG ((LM_DEBUG,
"Calling NotifyLog get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- CORBA::ULongLong retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::ULongLong retval = notify_log_->get_n_records ();
#else
- CORBA::Long retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ CORBA::Long retval = notify_log_->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -217,11 +203,9 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG,
"Calling NotifyLog::get_current_size...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = notify_log_->get_current_size ();
#else
- retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = notify_log_->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -247,16 +231,13 @@ Supplier::run (int argc, char* argv[])
"Deleting records... \n"));
retval = notify_log_->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling NotifyLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = notify_log_->get_n_records ();
#else
- retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = notify_log_->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -264,11 +245,9 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = notify_log_->get_current_size ();
#else
- retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = notify_log_->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -286,7 +265,7 @@ Supplier::run (int argc, char* argv[])
}
-Filter_StructuredPushSupplier::Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Filter_StructuredPushSupplier::Filter_StructuredPushSupplier (void)
{
}
@@ -298,33 +277,29 @@ void
Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
{
CosNotifyComm::StructuredPushSupplier_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
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 () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
proxy_consumer_->connect_structured_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushSupplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_structured_push_consumer();
}
void
@@ -347,12 +322,11 @@ Filter_StructuredPushSupplier::send_event
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
Filter_StructuredPushSupplier::disconnect_structured_push_supplier
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index bd4e26f2fda..3bc639cebce 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -77,7 +77,7 @@ class Filter_StructuredPushSupplier
//
public:
// = Initialization and Termination code
- Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ Filter_StructuredPushSupplier (void);
// Constructor.
void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
@@ -85,7 +85,7 @@ class Filter_StructuredPushSupplier
// Connect the Supplier to the EventChannel.
// Creates a new proxy supplier and connects to it.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier.
virtual void send_event (const CosNotification::StructuredEvent& event
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index a9ce5387a62..1e445a18411 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -34,7 +34,6 @@ Consumer::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
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
// the run() method.
@@ -49,34 +48,27 @@ Consumer::run (int argc, char* argv[])
*/
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// 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] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
*/
// Obtain the event channel
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -84,7 +76,6 @@ Consumer::run (int argc, char* argv[])
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -93,23 +84,19 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->event_log_factory_ =
RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The canonical protocol to connect to the EC
this->supplier_ =
- this->event_log_factory_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->event_log_factory_->obtain_push_supplier ();
RtecEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
// Simple subscription, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -127,7 +114,6 @@ Consumer::run (int argc, char* argv[])
this->supplier_->connect_push_consumer (consumer.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Wait for events, using work_pending()/perform_work() may help
// or using another thread, this example is too simple for that.
@@ -164,7 +150,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 5c908495901..324f4ec7ac4 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -46,7 +46,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 1a2de3ca9b9..06161288424 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -39,7 +39,6 @@ Supplier::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/*
@@ -57,33 +56,26 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// 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] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
*/
CORBA::Object_var naming_obj =
orb->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -91,7 +83,6 @@ Supplier::run (int argc, char* argv[])
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
@@ -101,12 +92,10 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->event_log_factory_ =
RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->event_log_factory_.in ()));
@@ -132,7 +121,6 @@ Supplier::run (int argc, char* argv[])
threshold,
logid
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
@@ -140,16 +128,13 @@ Supplier::run (int argc, char* argv[])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_log->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_log->for_suppliers ();
this->consumer_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
// Simple publication, but usually the helper classes in
@@ -163,7 +148,6 @@ Supplier::run (int argc, char* argv[])
this->consumer_->connect_push_supplier (supplier.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create some fake log events.
@@ -179,22 +163,18 @@ Supplier::run (int argc, char* argv[])
for (int i = 0; i != LOG_EVENT_COUNT; ++i)
{
this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::sleep (sleep_time);
}
ACE_DEBUG ((LM_DEBUG,
"Writing %d records...\n", LOG_EVENT_COUNT));
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling EventLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- CORBA::ULongLong retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::ULongLong retval = event_log->get_n_records ();
#else
- CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ CORBA::Long retval = event_log->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -202,11 +182,9 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG,
"Calling EventLog::get_current_size...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ();
#else
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -232,16 +210,13 @@ Supplier::run (int argc, char* argv[])
"Deleting records... \n"));
retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Calling EventLog::get_n_records...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = event_log->get_n_records ();
#else
- retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = event_log->get_n_records ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -249,34 +224,27 @@ Supplier::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
#ifndef ACE_LACKS_LONGLONG_T
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ();
#else
- retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
- ACE_TRY_CHECK;
+ retval = event_log->get_current_size ().lo();
#endif
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
// Disconnect from the EC
- this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumer_->disconnect_push_consumer ();
// Destroy the EC....
- //event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- event_log->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ //event_channel->destroy ();
+ event_log->destroy ();
// Deactivate this object...
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
@@ -290,7 +258,7 @@ Supplier::run (int argc, char* argv[])
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 170a98db896..9404dd76d52 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -7,7 +7,7 @@
* $Id$
*
* An example of using the RTEvent_Logging_Service.
- *
+ *
*
*
* @author D A Hanvey (d.hanvey@qub.ac.uk)
@@ -43,7 +43,7 @@ public:
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 3e6109e1ee1..2e901202219 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -182,7 +182,7 @@ private:
virtual void
- disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// We don't care.
@@ -224,7 +224,6 @@ main (int argc, char* argv[])
CORBA::Object_var obj (
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
@@ -255,13 +254,11 @@ main (int argc, char* argv[])
ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create the channel factory.
//
EventChannelFactory_var factory (ns->create (root_poa.in ()
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
if (is_nil (factory.in ()))
{
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index f34fd4bd09c..8538b217a11 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -249,7 +249,7 @@ push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED)
void Gate::
-disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// We don't care.
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index 312bb6b5a20..016da30f670 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -67,7 +67,7 @@ private:
virtual void
- disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 2751694dcd7..9ebf15df497 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -52,7 +52,6 @@ main (int argc, char* argv[])
CORBA::Object_var obj (
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
@@ -83,13 +82,11 @@ main (int argc, char* argv[])
ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create the channel factory.
//
EventChannelFactory_var factory (ns->create (root_poa.in ()
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
if (is_nil (factory.in ()))
{
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index a2aa9dbf434..eb8e92c2897 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -31,35 +31,26 @@ void
FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
{
init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ resolve_naming_service ();
- resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ resolve_Notify_factory ();
- create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ create_EC ();
- create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ create_supplieradmin ();
- create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ create_consumeradmin ();
- create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ create_consumers ();
- create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ create_suppliers ();
}
void
-FilterClient::run (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::run (void)
{
- send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ send_events ();
if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE)
{ // if we still need to wait for events, run the orb.
@@ -84,12 +75,10 @@ FilterClient::init_ORB (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object))
{
@@ -100,23 +89,19 @@ FilterClient::init_ORB (int argc,
this->root_poa_ =
PortableServer::POA::_narrow (poa_object
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
void
-FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -124,11 +109,10 @@ FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::resolve_Notify_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -137,16 +121,14 @@ FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->notify_factory_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -154,30 +136,26 @@ FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL)
initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_supplieradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid = 0;
supplier_admin_ =
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_->default_filter_factory ();
// setup a filter at the consumer admin
CosNotifyFilter::Filter_var sa_filter =
ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
@@ -188,31 +166,26 @@ FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient:: create_consumeradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid = 0;
consumer_admin_ =
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_->default_filter_factory ();
// setup a filter at the consumer admin
CosNotifyFilter::Filter_var ca_filter =
ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
@@ -228,14 +201,12 @@ FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_consumers (void)
{
// startup the first consumer.
ACE_NEW_THROW_EX (consumer_1,
@@ -243,7 +214,6 @@ FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
CORBA::NO_MEMORY ());
consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// startup the second consumer.
ACE_NEW_THROW_EX (consumer_2,
@@ -251,11 +221,10 @@ FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
CORBA::NO_MEMORY ());
consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_suppliers (void)
{
// startup the first supplier
ACE_NEW_THROW_EX (supplier_1,
@@ -263,7 +232,6 @@ FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
CORBA::NO_MEMORY ());
supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// startup the second supplier
ACE_NEW_THROW_EX (supplier_2,
@@ -271,11 +239,10 @@ FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
CORBA::NO_MEMORY ());
supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::send_events (void)
{
// operations:
CosNotification::StructuredEvent event;
@@ -321,10 +288,8 @@ FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL)
event.remainder_of_body <<= (CORBA::Long)i;
supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_2->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -344,12 +309,10 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr
{
// Activate the consumer with the default_POA_
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
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 ()));
@@ -357,21 +320,18 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr
this->proxy_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::
_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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Filter_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushConsumer::disconnect (void)
{
this->proxy_supplier_->
- disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disconnect_structured_push_supplier();
}
void
@@ -416,7 +376,7 @@ Filter_StructuredPushConsumer::push_structured_event
void
Filter_StructuredPushConsumer::disconnect_structured_push_consumer
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -440,33 +400,29 @@ void
Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
{
CosNotifyComm::StructuredPushSupplier_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
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 () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
proxy_consumer_->connect_structured_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushSupplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_structured_push_consumer();
}
void
@@ -492,12 +448,11 @@ Filter_StructuredPushSupplier::send_event
"%s is sending an event \n", my_name_.fast_rep ()));
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
Filter_StructuredPushSupplier::disconnect_structured_push_supplier
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index e7f9cd236a4..ecd6679122c 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -43,7 +43,7 @@ class FilterClient
void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Init the Client.
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
// Run the demo.
void done (void);
@@ -53,28 +53,28 @@ class FilterClient
void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Initializes the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Try to get hold of a running naming service.
- void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_Notify_factory (void);
// Try to resolve the Notify factory from the Naming service.
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create an EC.
- void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
+ void create_supplieradmin(void);
// Create the Supplier Admin.
- void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
+ void create_consumeradmin (void);
// Create the Consumer Admin.
- void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_consumers (void);
// Create and initialize the consumers.
- void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_suppliers (void);
// create and initialize the suppliers.
- void send_events (ACE_ENV_SINGLE_ARG_DECL);
+ void send_events (void);
// send the events.
// = Data Members
@@ -144,7 +144,7 @@ class Filter_StructuredPushConsumer
// Connect the Consumer to the EventChannel.
// Creates a new proxy supplier and connects to it.
- virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect (void);
// Disconnect from the supplier.
protected:
@@ -216,7 +216,7 @@ class Filter_StructuredPushSupplier
// Connect the Supplier to the EventChannel.
// Creates a new proxy supplier and connects to it.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier.
virtual void send_event (const CosNotification::StructuredEvent& event
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 845f7ab68f7..86f80717ef8 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -12,10 +12,8 @@ main (int argc, char *argv [])
{
client.init (argc, argv
ACE_ENV_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
- client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.run ();
}
ACE_CATCH (CORBA::UserException, ue)
{
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 17d2109cfb0..4ade161f36f 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -23,45 +23,41 @@ TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelA
this->admin_ = admin;
this->event_type_ = event_type;
- this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->connect ();
}
PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_Notify_Lanes_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::run (void)
{
// Nothing to do.
}
void
-TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::connect (void)
{
// Activate the consumer with the default_POA_
- CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT
, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
// narrow
this->proxy_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Call subscription_change to inform the supplier that this consumer is available.
CosNotification::EventTypeSeq added (1);
@@ -72,14 +68,12 @@ TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
added[0].type_name = CORBA::string_dup (this->event_type_.c_str ());
this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Lanes_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::disconnect (void)
{
- this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_supplier_->disconnect_structured_push_supplier();
}
void
@@ -106,8 +100,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
{
// Check the current threads priority.
RTCORBA::Priority thread_priority =
- this->orb_objects_.current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_objects_.current_->the_priority ();
const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
@@ -128,10 +121,10 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
ACE_DEBUG ((LM_DEBUG, "(%P, %t) Error: Event priority and thread priority are different. \n"));
// Disconnect from the EC
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect ();
// Deactivate this object.
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
// We received the event, shutdown the ORB.
this->orb_objects_.orb_->shutdown (1);
@@ -147,25 +140,22 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
}
void
-TAO_Notify_Lanes_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::deactivate (void)
{
- PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ PortableServer::POA_var poa (this->_default_POA ());
PortableServer::ObjectId_var id (poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
poa->deactivate_object (id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
}
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index 0f3c3d76dd9..779f093620b 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -38,7 +38,7 @@ public:
void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void run (void);
protected:
// = Data members
@@ -66,17 +66,17 @@ protected:
virtual ~TAO_Notify_Lanes_Consumer (void);
// = ServantBase operations
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual PortableServer::POA_ptr _default_POA (void);
/// Connect the Consumer to the EventChannel.
/// Creates a new proxy supplier and connects to it.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
/// Disconnect the supplier.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Deactivate.
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
// = NotifyPublish method
virtual void offer_change (
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 942d444d0cf..23bbaa14770 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -55,32 +55,27 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[])
}
void
-TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::initialize (void)
{
ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n"
, this->lane_priority_, this->event_type_.c_str ()));
PortableServer::POAManager_var poa_manager =
- this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->orb_objects_.root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
// Resolve the Notification Factory.
- CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
// Find the EventChannel created by the supplier.
- CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels ();
CosNotifyChannelAdmin::EventChannel_var ec;
if (channel_seq->length() > 0)
{
ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -93,12 +88,10 @@ TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
- PortableServer::POA_var rt_poa = this->create_rt_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var rt_poa = this->create_rt_poa ();
// Create a Consumer
this->consumer_ = new TAO_Notify_Lanes_Consumer (this->orb_objects_);
@@ -108,7 +101,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
}
PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
{
PortableServer::POA_var rt_poa;
@@ -118,14 +111,12 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Policy_var activation_policy =
this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
// Create a priority model policy.
priority_model_policy =
this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
, 0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
RTCORBA::ThreadpoolLanes lanes (1);
lanes.length (1);
@@ -151,13 +142,11 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
max_buffered_requests,
max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
// Create a thread-pool policy.
lanes_policy =
this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
CORBA::PolicyList poa_policy_list;
@@ -167,22 +156,20 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
poa_policy_list[2] = lanes_policy;
PortableServer::POAManager_var poa_manager =
- this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
+ this->orb_objects_.root_poa_->the_POAManager ();
rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
poa_manager.in (),
poa_policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
return rt_poa._retn ();
}
void
-TAO_Notify_Lanes_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::run (void)
{
- this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->consumer_->run ();
}
int
@@ -192,13 +179,10 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
{
// Initialize this threads priority.
this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
+ this->initialize (); //Init the Client
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -221,12 +205,10 @@ main (int argc, char *argv [])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_Notify_ORB_Objects orb_objects;
orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
index 31193b994f2..8160df2c847 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
@@ -39,10 +39,10 @@ public:
~TAO_Notify_Lanes_Consumer_Client ();
/// Init
- void initialize (ACE_ENV_SINGLE_ARG_DECL);
+ void initialize (void);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
/// Parse Args
int parse_args (int argc, char *argv[]);
@@ -52,7 +52,7 @@ public:
protected:
/// Create an RT POA with a single lane at the specified RT Priority.
- PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL);
+ PortableServer::POA_ptr create_rt_poa (void);
/// ORB Objects.
TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index b26b9dbb0ec..9790bf16f98 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -15,36 +15,28 @@ TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
CORBA::Object_var object = this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the RTORB.
object = this->orb_->resolve_initial_references ("RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the Current
object = this->orb_->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->current_ = RTCORBA::Current::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the Naming service
object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
@@ -52,7 +44,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
}
CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ORB_Objects::notify_factory (void)
{
CosNotifyChannelAdmin::EventChannelFactory_var ecf;
@@ -62,10 +54,8 @@ TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf._retn ());
ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf._retn ());
return ecf._retn ();
}
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index e846e43303b..97a10af69c3 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -38,7 +38,7 @@ public:
void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
/// Resolve Notification
- CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
///= Public Data
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 953328f78c5..2477f15457a 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -19,10 +19,8 @@ TAO_Notify_ORB_Run_Task::svc (void)
ACE_TRY_NEW_ENV
{
this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_objects_.orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_objects_.orb_->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 8b3a2a50862..22d6e8cf5bf 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -26,11 +26,11 @@ TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin
this->admin_ = admin;
this->expected_consumer_count_ = expected_consumer_count;
- this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->connect ();
}
void
-TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::run (void)
{
// The Priority at which we send the first event to the first consumer.
RTCORBA::Priority priority = 1;
@@ -51,12 +51,10 @@ TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
{
// Set this threads priority.
this->orb_objects_.current_->the_priority (priority ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Make sure the priority was set, get the priority of the current thread.
RTCORBA::Priority thread_priority =
- this->orb_objects_.current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->orb_objects_.current_->the_priority ();
// We will send this event.
CosNotification::StructuredEvent event;
@@ -87,64 +85,57 @@ TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
} // repeat for the next consumer at the next priority.
// Disconnect from the EC
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect ();
// Deactivate this object.
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
// we're done. shutdown the ORB to exit the process.
this->orb_objects_.orb_->shutdown (1);
}
void
-TAO_Notify_Lanes_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::connect (void)
{
// Activate the supplier object.
- CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
// Obtain the proxy.
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
this->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 () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
// connect to the proxyconsumer.
proxy_consumer_->connect_structured_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Lanes_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_structured_push_consumer();
}
void
-TAO_Notify_Lanes_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::deactivate (void)
{
- PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ PortableServer::POA_var poa (this->_default_POA ());
PortableServer::ObjectId_var id (poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
poa->deactivate_object (id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -172,14 +163,13 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
}
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index db4a8f816cd..6930c1592a8 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -39,20 +39,20 @@ class TAO_Notify_Lanes_Supplier
void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count ACE_ENV_ARG_DECL);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
protected:
// = Protected Methods
/// Connect the Supplier to the EventChannel.
/// Creates a new proxy consumer and connects to it.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
/// Disconnect the supplier.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Deactivate.
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
/// Send one event.
virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
@@ -72,7 +72,7 @@ protected:
));
// = StructuredPushSupplier method
- virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 2acb6bcc18b..5fd38a1da4c 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -61,24 +61,20 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
}
void
-TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::initialize (void)
{
PortableServer::POAManager_var poa_manager =
- this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->orb_objects_.root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
- CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec ();
// Create a Supplier Admin
CosNotifyChannelAdmin::AdminID adminid = 0;
CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
@@ -90,12 +86,11 @@ TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::create_ec (void)
{
CosNotifyChannelAdmin::EventChannel_var ec;
- CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec._retn ());
+ CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
// Create an EventChannel
CosNotification::QoSProperties qos;
@@ -108,7 +103,6 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
admin,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec._retn ());
// Set the Qos : 2 Lanes
NotifyExt::ThreadPoolLanesParams tpl_params;
@@ -149,26 +143,23 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
// Note that instead of <set_qos>, the <qos> can also be passed while creating the channel.
ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec._retn ());
return ec._retn ();
}
void
-TAO_Notify_Lanes_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::run (void)
{
/// First, signal that the supplier is ready.
- this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->write_ior ();
- this->supplier_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->supplier_->run ();
}
void
-TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::write_ior (void)
{
- CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
// Write the ior to a file to signal waiting consumers.
FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w"));
@@ -177,7 +168,6 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::String_var str =
this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_OS::fprintf (ior_output_file,
"%s",
@@ -192,13 +182,10 @@ TAO_Notify_Lanes_Supplier_Client::svc (void)
ACE_TRY_NEW_ENV
{
this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
+ this->initialize (); //Init the Client
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -221,13 +208,11 @@ main (int argc, char *argv [])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create a holder for the common ORB Objects.
TAO_Notify_ORB_Objects orb_objects;
orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/* Run the ORB in a seperate thread */
TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
index 7dd4eb19259..9761d77481a 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
@@ -36,10 +36,10 @@ public:
~TAO_Notify_Lanes_Supplier_Client ();
/// Init
- void initialize (ACE_ENV_SINGLE_ARG_DECL);
+ void initialize (void);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
/// Parse Args
int parse_args (int argc, char *argv[]);
@@ -49,10 +49,10 @@ public:
protected:
/// Create an EC
- CosNotifyChannelAdmin::EventChannel_ptr create_ec (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
/// Write ior to file.
- void write_ior (ACE_ENV_SINGLE_ARG_DECL);
+ void write_ior (void);
/// ORB Objects.
TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a7a0e96183f..b677c11d0db 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -34,28 +34,19 @@ void
Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
{
init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ resolve_naming_service ();
+ resolve_Notify_factory ();
+ create_EC ();
+ create_supplieradmin ();
+ create_consumeradmin ();
+ create_consumers ();
+ create_suppliers ();
}
void
-Subscribe::run (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::run (void)
{
- this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->send_events ();
if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb.
{ // if we still need to wait for events, run the orb.
@@ -80,12 +71,10 @@ Subscribe::init_ORB (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object))
{
@@ -95,23 +84,19 @@ Subscribe::init_ORB (int argc,
}
this->root_poa_ =
PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
void
-Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -119,11 +104,10 @@ Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_Notify_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -132,16 +116,14 @@ Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->notify_factory_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -149,65 +131,58 @@ Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL)
initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_supplieradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
supplier_admin_ =
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 (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe:: create_consumeradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
consumer_admin_ =
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 (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_consumers (void)
{
consumer_1_ = new Subscribe_StructuredPushConsumer (this);
consumer_1_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_2_ = new Subscribe_StructuredPushConsumer (this);
consumer_2_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_suppliers (void)
{
supplier_1_ = new Subscribe_StructuredPushSupplier ();
supplier_1_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_2_ = new Subscribe_StructuredPushSupplier ();
supplier_2_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::send_events (void)
{
// Setup the CA to receive event_type : "domain_A", "Type_a"
CosNotification::EventTypeSeq added(1);
@@ -218,7 +193,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
added[0].type_name = CORBA::string_dup (TYPE_A);
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"
CosNotification::EventTypeSeq added_1(1);
@@ -231,7 +205,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
CosNotification::EventTypeSeq added_2(1);
@@ -244,7 +217,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the events - one of each type
// Event 1
@@ -284,11 +256,8 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
for (int i = 0; i < 1; ++i)
{
supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -309,12 +278,10 @@ Subscribe_StructuredPushConsumer::connect
{
// Activate the consumer with the default_POA_
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
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 ()));
@@ -322,21 +289,18 @@ Subscribe_StructuredPushConsumer::connect
this->proxy_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::
_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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushConsumer::disconnect (void)
{
this->proxy_supplier_->
- disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disconnect_structured_push_supplier();
}
void
@@ -376,7 +340,7 @@ Subscribe_StructuredPushConsumer::push_structured_event
void
Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -406,33 +370,29 @@ Subscribe_StructuredPushSupplier::connect
ACE_ENV_ARG_DECL)
{
CosNotifyComm::StructuredPushSupplier_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
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 () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
proxy_consumer_->connect_structured_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushSupplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_structured_push_consumer();
}
void
@@ -456,12 +416,11 @@ Subscribe_StructuredPushSupplier::send_event
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 126b842a4ca..7fd58ae9b1d 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -38,7 +38,7 @@ class Subscribe
void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Init the Client.
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
// Run the demo.
void done (void);
@@ -48,28 +48,28 @@ class Subscribe
void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
// Initializes the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Try to get hold of a running naming service.
- void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_Notify_factory (void);
// Try to resolve the Notify factory from the Naming service.
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create an EC.
- void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
+ void create_supplieradmin(void);
// Create the Supplier Admin.
- void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
+ void create_consumeradmin (void);
// Create the Consumer Admin.
- void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_consumers (void);
// Create and initialize the consumers.
- void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_suppliers (void);
// create and initialize the suppliers.
- void send_events (ACE_ENV_SINGLE_ARG_DECL);
+ void send_events (void);
// send the events.
// = Data Members
@@ -133,7 +133,7 @@ class Subscribe_StructuredPushConsumer
// Connect the Consumer to the EventChannel.
// Creates a new proxy supplier and connects to it.
- virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect (void);
// Disconnect from the supplier.
CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
@@ -204,7 +204,7 @@ class Subscribe_StructuredPushSupplier
// Connect the Supplier to the EventChannel.
// Creates a new proxy consumer and connects to it.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier.
virtual void send_event (const CosNotification::StructuredEvent& event
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index b817728c231..18d86e4232a 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -12,10 +12,8 @@ main (int argc, char *argv [])
{
client.init (argc, argv
ACE_ENV_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
- client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.run ();
}
ACE_CATCH (CORBA::UserException, ue)
{
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 3f8b943dba2..489f6aabb9e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -39,27 +39,26 @@ TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyCha
ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer Delay = %d, param = %d\n", delay_.sec (), delay));
- this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->connect ();
}
PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ThreadPool_Consumer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_Notify_ThreadPool_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ThreadPool_Consumer::run (void)
{
// Nothing to do.
}
void
-TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::connect (void)
{
// Activate the consumer with the default_POA_
- CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier;
@@ -67,7 +66,6 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
{
// Narrow to the extended interface.
NotifyExt::ConsumerAdmin_var admin_ext = NotifyExt::ConsumerAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0,
0, this->proxy_supplier_thread_count_, 0, 0, 0, 0, 0 };
@@ -80,13 +78,11 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
// Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted.
proxysupplier = admin_ext->obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
, proxy_supplier_id_, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
proxysupplier = this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT
, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -94,13 +90,11 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
// narrow
this->proxy_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Call subscription_change to inform the supplier that this consumer is available.
CosNotification::EventTypeSeq added (1);
@@ -116,17 +110,15 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
added[0].type_name = CORBA::string_dup (type);
this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Consumer %d with %d threads at the ProxySupplier\n", proxy_supplier_id_,
this->proxy_supplier_thread_count_));
}
void
-TAO_Notify_ThreadPool_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::disconnect (void)
{
- this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_supplier_->disconnect_structured_push_supplier();
}
void
@@ -167,12 +159,10 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St
this->t_last_ = ACE_OS::gethrtime ();
// Disconnect from the EC
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect ();
// Deactivate this object.
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
// We received the event, shutdown the ORB.
this->orb_objects_.orb_->shutdown (1);
@@ -195,25 +185,22 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
}
void
-TAO_Notify_ThreadPool_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::deactivate (void)
{
- PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ PortableServer::POA_var poa (this->_default_POA ());
PortableServer::ObjectId_var id (poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
poa->deactivate_object (id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
}
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index 0af5b74d5fa..ee5620f4aae 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -39,7 +39,7 @@ public:
void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay ACE_ENV_ARG_DECL);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void run (void);
/// Print the consumer throughput
void dump_throughput (void);
@@ -51,16 +51,16 @@ protected:
/// Connect the Consumer to the EventChannel.
/// Creates a new proxy supplier and connects to it.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
/// Disconnect the supplier.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Deactivate.
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
// = ServantBase operations
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual PortableServer::POA_ptr _default_POA (void);
// = NotifyPublish method
virtual void offer_change (
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 480dbb5005c..d97ec85e0c5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -62,29 +62,24 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[])
}
void
-TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer_Client::_init (void)
{
PortableServer::POAManager_var poa_manager =
- this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->orb_objects_.root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
// Resolve the Notification Factory.
- CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
// Find the EventChannel created by the supplier.
- CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels ();
CosNotifyChannelAdmin::EventChannel_var ec;
if (channel_seq->length() > 0)
{
ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -97,12 +92,10 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
- PortableServer::POA_var rt_poa = this->create_rt_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var rt_poa = this->create_rt_poa ();
// Create a Consumer
this->consumer_ = new TAO_Notify_ThreadPool_Consumer (this->orb_objects_);
@@ -112,7 +105,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
}
PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
{
PortableServer::POA_var rt_poa;
@@ -122,14 +115,12 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Policy_var activation_policy =
this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
// Create a priority model policy.
priority_model_policy =
this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
, 0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
CORBA::ULong stacksize = 0;
CORBA::ULong static_threads = 1;
@@ -149,12 +140,10 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
max_buffered_requests,
max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
thread_pool_policy =
this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
CORBA::PolicyList poa_policy_list;
@@ -164,22 +153,20 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
poa_policy_list[2] = thread_pool_policy;
PortableServer::POAManager_var poa_manager =
- this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
+ this->orb_objects_.root_poa_->the_POAManager ();
rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
poa_manager.in (),
poa_policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (rt_poa._retn ());
return rt_poa._retn ();
}
void
-TAO_Notify_ThreadPool_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer_Client::run (void)
{
- this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->consumer_->run ();
}
void
@@ -195,13 +182,10 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void)
{
// Initialize this threads priority.
this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
+ this->_init (); //Init the Client
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -224,12 +208,10 @@ main (int argc, char *argv [])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_Notify_ORB_Objects orb_objects;
orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
index 158c1005daa..2967b227fcf 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
@@ -39,10 +39,10 @@ public:
~TAO_Notify_ThreadPool_Consumer_Client ();
/// Init
- void _init (ACE_ENV_SINGLE_ARG_DECL);
+ void _init (void);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
/// Parse Args
int parse_args (int argc, char *argv[]);
@@ -55,7 +55,7 @@ public:
protected:
/// Create an RT POA with a single threadpool.
- PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL);
+ PortableServer::POA_ptr create_rt_poa (void);
/// ORB Objects.
TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index b26b9dbb0ec..9790bf16f98 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -15,36 +15,28 @@ TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
CORBA::Object_var object = this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the RTORB.
object = this->orb_->resolve_initial_references ("RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the Current
object = this->orb_->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->current_ = RTCORBA::Current::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the Naming service
object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
@@ -52,7 +44,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
}
CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ORB_Objects::notify_factory (void)
{
CosNotifyChannelAdmin::EventChannelFactory_var ecf;
@@ -62,10 +54,8 @@ TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf._retn ());
ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf._retn ());
return ecf._retn ();
}
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index 7ca6ab99442..a95318ae05c 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -37,7 +37,7 @@ public:
void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
/// Resolve Notification
- CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
///= Public Data
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index 953328f78c5..2477f15457a 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -19,10 +19,8 @@ TAO_Notify_ORB_Run_Task::svc (void)
ACE_TRY_NEW_ENV
{
this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_objects_.orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_objects_.orb_->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index bb29cbd1af7..1985911cc5e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -31,11 +31,11 @@ TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var&
this->max_events_ = max_events;
this->proxy_consumer_thread_count_ = proxy_consumer_thread_count;
- this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->connect ();
}
void
-TAO_Notify_ThreadPool_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::run (void)
{
{
ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
@@ -61,21 +61,20 @@ TAO_Notify_ThreadPool_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
}
// Disconnect from the EC
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect ();
// Deactivate this object.
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
// we're done. shutdown the ORB to exit the process.
this->orb_objects_.orb_->shutdown (1);
}
void
-TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::connect (void)
{
// Activate the supplier object.
- CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer;
@@ -83,7 +82,6 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
{
// Narrow to the extended interface.
NotifyExt::SupplierAdmin_var admin_ext = NotifyExt::SupplierAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0,
0, this->proxy_consumer_thread_count_, 0, 0, 0, 0, 0 };
@@ -96,14 +94,12 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
// Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted.
proxyconsumer = admin_ext->obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
, proxy_consumer_id_, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
// Obtain the proxy.
proxyconsumer = this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT
, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
@@ -111,40 +107,35 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
// narrow
this->proxy_consumer_ =
CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
// connect to the proxyconsumer.
proxy_consumer_->connect_structured_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Supplier %d with %d threads at the ProxyConsumer\n", proxy_consumer_id_,
this->proxy_consumer_thread_count_));
}
void
-TAO_Notify_ThreadPool_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_structured_push_consumer();
}
void
-TAO_Notify_ThreadPool_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::deactivate (void)
{
- PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ PortableServer::POA_var poa (this->_default_POA ());
PortableServer::ObjectId_var id (poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
poa->deactivate_object (id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -181,14 +172,13 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
}
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index e5238d0af7e..70fbadc6b83 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -41,20 +41,20 @@ public:
int proxy_consumer_thread_count ACE_ENV_ARG_DECL);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
protected:
// = Protected Methods
/// Connect the Supplier to the EventChannel.
/// Creates a new proxy consumer and connects to it.
- void connect (ACE_ENV_SINGLE_ARG_DECL);
+ void connect (void);
/// Disconnect the supplier.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Deactivate.
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
/// Send one event.
virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
@@ -74,7 +74,7 @@ protected:
));
// = StructuredPushSupplier method
- virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index fb8dcf0c8ad..77d7f498645 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -80,24 +80,20 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
}
void
-TAO_Notify_ThreadPool_Supplier_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::_init (void)
{
PortableServer::POAManager_var poa_manager =
- this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->orb_objects_.root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
- CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec ();
// Create a Supplier Admin
CosNotifyChannelAdmin::AdminID adminid = 0;
CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
@@ -110,12 +106,11 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
{
CosNotifyChannelAdmin::EventChannel_var ec;
- CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec._retn ());
+ CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
// Create an EventChannel
CosNotification::QoSProperties qos;
@@ -128,7 +123,6 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
admin,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec._retn ());
// Set the Qos
// See $TAO_ROOT/orbsvcs/orbsvcs/NotifyExt.idl
@@ -144,7 +138,6 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
// Note that instead of <set_qos>, the <qos> can also be passed while creating the channel.
ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec._retn ());
}
ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Event Channel with %d threads\n", this->ec_thread_count_));
@@ -153,20 +146,18 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Notify_ThreadPool_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::run (void)
{
/// First, signal that the supplier is ready.
- this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->write_ior ();
- this->supplier_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->supplier_->run ();
}
void
-TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
{
- CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
// Write the ior to a file to signal waiting consumers.
FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w"));
@@ -175,7 +166,6 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::String_var str =
this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_OS::fprintf (ior_output_file,
"%s",
@@ -190,13 +180,10 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void)
ACE_TRY_NEW_ENV
{
this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
+ this->_init (); //Init the Client
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -219,13 +206,11 @@ main (int argc, char *argv [])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create a holder for the common ORB Objects.
TAO_Notify_ORB_Objects orb_objects;
orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/* Run the ORB in a seperate thread */
TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
index b54786ea808..be8f97fc337 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
@@ -35,10 +35,10 @@ public:
~TAO_Notify_ThreadPool_Supplier_Client ();
/// Init
- void _init (ACE_ENV_SINGLE_ARG_DECL);
+ void _init (void);
/// Run
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
/// Parse Args
int parse_args (int argc, char *argv[]);
@@ -48,10 +48,10 @@ public:
protected:
/// Create an EC
- CosNotifyChannelAdmin::EventChannel_ptr create_ec (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
/// Write ior to file.
- void write_ior (ACE_ENV_SINGLE_ARG_DECL);
+ void write_ior (void);
/// ORB Objects.
TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index ecc1d6e1055..3b1f0194992 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -23,13 +23,11 @@ make_object (const char *interface_repository_id,
this->old_factory_->make_object (interface_repository_id,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CORBA::Object_ptr object_ptr =
this->gateway_object_factory_->create_object (interface_repository_id,
object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return object_ptr;
}
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index f4ce9754556..81967f296f0 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -41,12 +41,10 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
CORBA::Object_var target_object =
this->orb_->string_to_object (stringified_object_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Use the IfR interfaces to query the NVList for this object...
CORBA::InterfaceDef_var target_interface =
- target_object->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ target_object->_get_interface ();
if (CORBA::is_nil (target_interface.in ()))
{
@@ -65,8 +63,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
// Save the result typecode...
CORBA::TypeCode_var result_typecode =
- operation.in ()->result (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ operation.in ()->result ();
CORBA::ParDescriptionSeq_var parameters =
operation.in ()->params ();
@@ -76,7 +73,6 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
this->orb_->create_list (parameters->length (),
arguments
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Flags flags = 0;
@@ -109,7 +105,6 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
any,
flags
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Extract the values of the arguments from the DSI ServerRequest
@@ -122,7 +117,6 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
this->orb_->create_named_value (named_value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ContextList *context_list = 0;
CORBA::ExceptionList *exceptions = 0;
@@ -136,7 +130,6 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
dii_request.inout (),
CORBA::Flags (0)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Set the return type...
dii_request->set_return_type (result_typecode.in ());
@@ -144,8 +137,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
ACE_TRY
{
// Make the DII request
- dii_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dii_request->invoke ();
// At this point the NVList contains all the out and inout
// arguments, but we need to extract the return value...
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 32c4e9ce579..b555cf58548 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -20,7 +20,6 @@ Object_Factory_i::create_object (const char *interface_repository_id,
{
CORBA::String_var stringified_object =
this->orb_->object_to_string (gatewayed_object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
const PortableServer::ObjectId_var id =
PortableServer::string_to_ObjectId (stringified_object.in ());
@@ -31,7 +30,6 @@ Object_Factory_i::create_object (const char *interface_repository_id,
ACE_UNUSED_ARG(interface_repository_id);
/*
TAO_POA *poa = dynamic_cast <TAO_POA *> (this->gateway_poa_);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableInterceptor::ObjectReferenceTemplate *ort_template =
poa->get_adapter_template();
@@ -43,7 +41,7 @@ Object_Factory_i::create_object (const char *interface_repository_id,
ort->make_object (interface_repository_id,
*obj_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());*/
+/
return CORBA::Object::_nil();
}
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 2cd8117b443..05a9ef46866 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -21,14 +21,14 @@ Server_IORInterceptor::~Server_IORInterceptor (void)
char *
-Server_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_IORInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("Server_IORInterceptor");
}
void
-Server_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_IORInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::release (this->gateway_object_factory_);
@@ -52,18 +52,15 @@ Server_IORInterceptor::components_established (
Gateway_ObjRef_Factory *my_factory = 0;
PortableInterceptor::ObjectReferenceFactory_var current_factory =
- ior_info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ior_info->current_factory ();
ACE_NEW_THROW_EX (my_factory,
Gateway_ObjRef_Factory (this->gateway_object_factory_,
current_factory.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK;
ior_info->current_factory (my_factory
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index da243325d05..86da86a019e 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -36,11 +36,11 @@ public:
*/
//@{
/// Return the name of this IORInterceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Cleanup resources acquired by this IORInterceptor.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Add the tagged components to the IOR.
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 93fd158c07b..051dc3be61f 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -27,13 +27,11 @@ Server_IORInterceptor_ORBInitializer::post_init (
CORBA::Object_var obj =
info->resolve_initial_references ("Gateway_Object_Factory"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
/// Narrow it down correctly.
Gateway::Object_Factory_var gateway_object_factory =
Gateway::Object_Factory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
/// Check for nil reference
if (CORBA::is_nil (gateway_object_factory.in ()))
@@ -49,11 +47,9 @@ Server_IORInterceptor_ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::IORInterceptor_var ior_interceptor = gateway;
info->add_ior_interceptor (ior_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 699985a1993..0298ae64c3c 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -40,18 +40,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var obj =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ORT::sum_server_var server =
ORT::sum_server::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -67,7 +64,6 @@ main (int argc, char *argv[])
CORBA::ULong result = server->add_variables (a,
b
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 8)
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index d52bc63f0f2..c5efc7af294 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -44,7 +44,6 @@ main (int argc, char *argv[])
argv,
"gateway_server_orb"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return -1;
@@ -53,12 +52,10 @@ main (int argc, char *argv[])
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Narrow it down correctly.
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Check for nil references
if (CORBA::is_nil (root_poa.in ()))
@@ -68,12 +65,10 @@ main (int argc, char *argv[])
/// Get poa_manager reference
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
/// Activate it.
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
///@}
@@ -83,25 +78,21 @@ main (int argc, char *argv[])
policies [0] =
root_poa->create_servant_retention_policy (PortableServer::RETAIN
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies [1] =
root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies [2] =
root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var gateway_poa =
root_poa->create_POA ("Gateway_POA",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies.length (); ++i) {
policies[i]->destroy ();
@@ -111,13 +102,11 @@ main (int argc, char *argv[])
obj =
orb->resolve_initial_references ("POACurrent"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Gateway_i *gateway;
@@ -125,10 +114,8 @@ main (int argc, char *argv[])
Gateway_i (orb.in (),
poa_current.in ()),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
gateway_poa->set_servant (gateway ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Get the ObjectID
PortableServer::ObjectId_var oid =
@@ -141,13 +128,11 @@ main (int argc, char *argv[])
Object_Factory_i (orb.in (),
gateway_poa.in ()),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
/// Activate the Object_Factory_i Object
gateway_poa->activate_object_with_id (oid.in (),
object_factory
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get the object reference.
CORBA::Object_var gateway_object_factory =
@@ -157,7 +142,6 @@ main (int argc, char *argv[])
CORBA::String_var ior =
orb->object_to_string (gateway_object_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// If the ior_output_file exists, output the IOR to it.
if (ior_output_file != 0)
@@ -173,8 +157,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index 1b76cecb393..af419e9cdef 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -54,7 +54,6 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#endif /* TAO_HAS_INTERCEPTORS == 1 */
@@ -65,7 +64,6 @@ main (int argc, char *argv[])
argv,
"server_sum_orb"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return -1;
@@ -74,12 +72,10 @@ main (int argc, char *argv[])
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow it down correctly.
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check for nil references
if (CORBA::is_nil (root_poa.in ()))
@@ -89,25 +85,21 @@ main (int argc, char *argv[])
// Get poa_manager reference
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Activate it.
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// initialize the sum_server
sum_server_i sum_server_impl;
// Activate
- obj = sum_server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ obj = sum_server_impl._this ();
// Narrow it down.
ORT::sum_server_var sum_server =
ORT::sum_server::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check for nil reference
if (CORBA::is_nil (sum_server.in ()))
@@ -119,7 +111,6 @@ main (int argc, char *argv[])
// Convert the object reference to a string format.
CORBA::String_var ior =
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.
if (ior_output_file != 0)
@@ -135,8 +126,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_INFO, "Successful.\n"));
}
diff --git a/TAO/orbsvcs/examples/PSS/Server_i.cpp b/TAO/orbsvcs/examples/PSS/Server_i.cpp
index 0d5e1bcfe43..70480aacaa9 100644
--- a/TAO/orbsvcs/examples/PSS/Server_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Server_i.cpp
@@ -13,7 +13,7 @@ Server_i::~Server_i (void)
}
char *
-Server_i::get_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_i::get_status (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("active");
diff --git a/TAO/orbsvcs/examples/PSS/Server_i.h b/TAO/orbsvcs/examples/PSS/Server_i.h
index 5f5937e24a5..24f406c9223 100644
--- a/TAO/orbsvcs/examples/PSS/Server_i.h
+++ b/TAO/orbsvcs/examples/PSS/Server_i.h
@@ -26,12 +26,12 @@
class Server_i : public virtual POA_Simple_Server::Server
{
public:
-
+
Server_i ();
-
+
~Server_i ();
-
- virtual char *get_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+ virtual char *get_status (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
index 91add5d9900..73677dbb51a 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
@@ -63,7 +63,6 @@ main (int argc, char *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
return -1;
@@ -71,21 +70,17 @@ main (int argc, char *argv[])
// Get a reference to the RootPOA
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down to the correct reference
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set a POA Manager
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Activate the POA Manager
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::PolicyList policies (2);
policies.length (2);
@@ -94,13 +89,11 @@ main (int argc, char *argv[])
policies[0] =
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
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// We use a different POA, otherwise the user would have to change
// the object key each time it invokes the server.
@@ -109,7 +102,6 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POAs over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0;
@@ -117,8 +109,7 @@ main (int argc, char *argv[])
++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
Naming_Context_i simple_naming_i (orb.in ());
@@ -130,7 +121,6 @@ main (int argc, char *argv[])
CORBA::String_var string_obj_ref =
orb->object_to_string (simple_naming.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the IOR to the <ior_output_file>
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -142,14 +132,11 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", string_obj_ref.in ());
ACE_OS::fclose (output_file);
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -158,7 +145,6 @@ main (int argc, char *argv[])
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
index 41178b04976..c1a47f4e299 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
@@ -27,7 +27,6 @@ Naming_Context_i::bind (const char *n,
// Save the binding to database.
int result =
this->code_gen_->set_name_obj_ref (n, obj ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return result;
}
@@ -41,7 +40,6 @@ Naming_Context_i::find (const char *n
// 'n'
CORBA::String_var obj_ref =
this->code_gen_->get_obj_ref (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CORBA::string_dup (obj_ref.in ());
}
diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp
index a634a736993..95f4df6406d 100644
--- a/TAO/orbsvcs/examples/PSS/client.cpp
+++ b/TAO/orbsvcs/examples/PSS/client.cpp
@@ -34,59 +34,48 @@ int main (int argc, char *argv [])
argv,
"" /* the ORB name, it can be anything! */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference to the RootPOA
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down to the correct reference
PortableServer::POA_var poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set a POA Manager
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Activate the POA Manager
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Get a reference to Simple_Naming
CORBA::Object_var simple_naming_object =
orb->resolve_initial_references ("Simple_Naming" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down the reference
Simple_Naming::Naming_Context_var simple_naming =
Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Naming::Name name = CORBA::string_dup ("Server");
CORBA::String_var ior_string =
simple_naming->find (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Connect to the server
CORBA::Object_var tmp =
orb->string_to_object(ior_string.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Server::Server_var server =
Simple_Server::Server::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var status =
- server->get_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->get_status ();
if (ACE_OS::strcmp (status.in (), "active") != 0)
{
@@ -99,7 +88,6 @@ int main (int argc, char *argv [])
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
"Client raised an exception:\n");
- ACE_CHECK_RETURN (-1);
}
ACE_ENDTRY;
diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp
index 0f305dfae1d..015225c079f 100644
--- a/TAO/orbsvcs/examples/PSS/server.cpp
+++ b/TAO/orbsvcs/examples/PSS/server.cpp
@@ -36,26 +36,21 @@ main (int argc, char *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference to the RootPOA
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down to the correct reference
PortableServer::POA_var poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set a POA Manager
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Activate the POA Manager
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
Server_i server_i;
@@ -64,19 +59,16 @@ main (int argc, char *argv[])
CORBA::String_var string_obj_ref =
orb->object_to_string (server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference to Simple_Naming
CORBA::Object_var simple_naming_object =
orb->resolve_initial_references ("Simple_Naming"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down the reference
Simple_Naming::Naming_Context_var simple_naming =
Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Naming::Name name = CORBA::string_dup ("Server");
@@ -84,16 +76,12 @@ main (int argc, char *argv[])
simple_naming->bind (CORBA::string_dup (name),
string_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -102,7 +90,6 @@ main (int argc, char *argv[])
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 05b214aabbc..9702c23c46f 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -47,7 +47,6 @@ Consumer::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
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
// the run() method.
@@ -55,20 +54,15 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel from the naming service
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,7 +71,6 @@ Consumer::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -85,12 +78,10 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (event_channel.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -99,16 +90,13 @@ Consumer::run (int argc, char* argv[])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
ACE_ConsumerQOS_Factory qos;
qos.start_disjunction_group ();
@@ -123,7 +111,6 @@ Consumer::run (int argc, char* argv[])
}
supplier->connect_push_consumer (consumer.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Wait for events, using work_pending()/perform_work() may help
// or using another thread, this example is too simple for that.
@@ -167,7 +154,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index c8268e1c3ea..8436a13c898 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -40,7 +40,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index a25e9f67569..6dcfcf0961a 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -46,19 +46,15 @@ EC::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var rootpoa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var root_poa_manager =
- rootpoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rootpoa->the_POAManager ();
// Create persistent POA
CORBA::PolicyList policies (2);
@@ -67,12 +63,10 @@ EC::run (int argc, char* argv[])
policies[0] =
rootpoa->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] =
rootpoa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_CString poaname = "POA";
PortableServer::POA_var child_poa_ =
@@ -92,22 +86,17 @@ EC::run (int argc, char* argv[])
PortableServer::ObjectId_var ecId = PortableServer::string_to_ObjectId(ecname);
child_poa_->activate_object_with_id(ecId.in(), &ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var ec_obj = child_poa_->id_to_reference(ecId.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Find the Naming Service.
object = orb->resolve_initial_references("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContextExt_var naming_context =
CosNaming::NamingContextExt::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create a name.
CosNaming::Name name;
@@ -117,10 +106,8 @@ EC::run (int argc, char* argv[])
// Register with the name server
naming_context->rebind (name, ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- root_poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa_manager->activate ();
// Wait for events, using work_pending()/perform_work() may help
// or using another thread, this example is too simple for that.
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index c1be767ffd8..18ae02c517b 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -47,24 +47,18 @@ Gateway::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel from the naming service
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -73,7 +67,6 @@ Gateway::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name supplierecname (1);
supplierecname.length (1);
@@ -81,7 +74,6 @@ Gateway::run (int argc, char* argv[])
CORBA::Object_var supplierec_obj =
naming_context->resolve (supplierecname ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name consumerecname (1);
consumerecname.length (1);
@@ -89,12 +81,10 @@ Gateway::run (int argc, char* argv[])
CORBA::Object_var consumerec_obj =
naming_context->resolve (consumerecname ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var supplier_event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (supplierec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (supplier_event_channel.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -104,7 +94,6 @@ Gateway::run (int argc, char* argv[])
RtecEventChannelAdmin::EventChannel_var consumer_event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (consumerec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (consumer_event_channel.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -114,23 +103,18 @@ Gateway::run (int argc, char* argv[])
TAO_EC_Gateway_IIOP gateway;
gateway.init(supplier_event_channel.in(), consumer_event_channel.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::ObjectId_var gateway_oid =
poa->activate_object(&gateway ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var gateway_obj =
poa->id_to_reference(gateway_oid.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::Observer_var obs =
RtecEventChannelAdmin::Observer::_narrow(gateway_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::Observer_Handle local_ec_obs_handle =
consumer_event_channel->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Wait for events, using work_pending()/perform_work() may help
// or using another thread, this example is too simple for that.
@@ -138,14 +122,11 @@ Gateway::run (int argc, char* argv[])
consumer_event_channel->remove_observer (local_ec_obs_handle
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (gateway_oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index aad09c037e8..df804cc4561 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -47,24 +47,18 @@ Supplier::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel from the naming service
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -73,7 +67,6 @@ Supplier::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -81,25 +74,20 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
// Publish the events the supplier provides.
ACE_SupplierQOS_Factory qos;
@@ -110,7 +98,6 @@ Supplier::run (int argc, char* argv[])
consumer->connect_push_supplier (supplier.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Push the events...
ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -133,28 +120,22 @@ Supplier::run (int argc, char* argv[])
i));
}
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::sleep (sleep_time);
}
// Disconnect from the EC
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
// Destroy the EC....
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivate this object...
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -166,7 +147,7 @@ Supplier::run (int argc, char* argv[])
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index 98e87ec39d2..e42042c197d 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -36,7 +36,7 @@ public:
// = The RtecEventComm::PushSupplier methods
/// The skeleton methods.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 4f23249c145..2ff7c221a9a 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index bdbdbaad894..d0cdaf1abcd 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -47,7 +47,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
};
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 3a01a04e9c0..f32c1701940 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -55,7 +55,6 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
{
@@ -66,15 +65,11 @@ main (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -97,8 +92,7 @@ main (int argc, char* argv[])
}
RtecScheduler::Scheduler_var scheduler =
- sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sched_impl->_this ();
// ****************************************************************
TAO_EC_Event_Channel_Attributes attributes (poa.in (),
@@ -107,8 +101,7 @@ main (int argc, char* argv[])
TAO_EC_Event_Channel ec_impl (attributes);
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Create a consumer, intialize its RT_Info structures, and
@@ -118,11 +111,9 @@ main (int argc, char* argv[])
RtecScheduler::handle_t consumer1_rt_info =
scheduler->create ("consumer1" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::handle_t consumer2_rt_info =
scheduler->create ("consumer2" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//consumer's rate will get propagated from the supplier.
//so no need to specify a period here. Specifying
@@ -140,7 +131,6 @@ main (int argc, char* argv[])
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
scheduler->set (consumer2_rt_info,
RtecScheduler::VERY_HIGH_CRITICALITY,
@@ -151,7 +141,6 @@ main (int argc, char* argv[])
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ConsumerQOS_Factory consumer_qos1, consumer_qos2;
//consumer_qos.start_disjunction_group ();
@@ -180,37 +169,30 @@ main (int argc, char* argv[])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy1 =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy2 =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var consumer1 =
- consumer_impl1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_impl1._this ();
RtecEventComm::PushConsumer_var consumer2 =
- consumer_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_impl2._this ();
ACE_DEBUG ((LM_DEBUG, "connecting consumers\n"));
ACE_DEBUG ((LM_DEBUG, "connecting consumer1\n"));
supplier_proxy1->connect_push_consumer (consumer1.in (),
consumer_qos1.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connecting consumer2\n"));
supplier_proxy2->connect_push_consumer (consumer2.in (),
consumer_qos2.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "consumers connected\n"));
@@ -218,11 +200,9 @@ main (int argc, char* argv[])
RtecScheduler::handle_t supplier1_rt_info =
scheduler->create ("supplier1" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::handle_t supplier2_rt_info =
scheduler->create ("supplier2" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventComm::EventSourceID supplier_id1 = 1, supplier_id2 = 2;
ACE_SupplierQOS_Factory supplier_qos1, supplier_qos2;
@@ -237,40 +217,33 @@ main (int argc, char* argv[])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy1 =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy2 =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
Supplier supplier_impl1(supplier_id1, consumer_proxy1.in ());
Supplier supplier_impl2(supplier_id2, consumer_proxy2.in ());
RtecEventComm::PushSupplier_var supplier1 =
- supplier_impl1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_impl1._this ();
RtecEventComm::PushSupplier_var supplier2 =
- supplier_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_impl2._this ();
ACE_DEBUG ((LM_DEBUG, "connecting suppliers\n"));
ACE_DEBUG ((LM_DEBUG, "connecting supplier1\n"));
consumer_proxy1->connect_push_supplier (supplier1.in (),
supplier_qos1.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connecting supplier2\n"));
consumer_proxy2->connect_push_supplier (supplier2.in (),
supplier_qos2.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "suppliers connected\n"));
// ****************************************************************
@@ -283,7 +256,6 @@ main (int argc, char* argv[])
RtecScheduler::handle_t supplier1_timeout_consumer_rt_info =
scheduler->create ("supplier1_timeout_consumer" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//Period = 1sec
tv.set (1,0);
@@ -298,11 +270,9 @@ main (int argc, char* argv[])
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::handle_t supplier2_timeout_consumer_rt_info =
scheduler->create ("supplier2_timeout_consumer" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//Period = 3sec
tv.set (3, 0);
@@ -317,7 +287,6 @@ main (int argc, char* argv[])
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ConsumerQOS_Factory timer_qos1, timer_qos2;
timer_qos1.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
@@ -328,33 +297,27 @@ main (int argc, char* argv[])
supplier2_timeout_consumer_rt_info);
RtecEventChannelAdmin::ProxyPushSupplier_var timeout_supplier_proxy1 =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventChannelAdmin::ProxyPushSupplier_var timeout_supplier_proxy2 =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var safe_timeout_consumer1 =
- timeout_consumer_impl1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ timeout_consumer_impl1._this ();
RtecEventComm::PushConsumer_var safe_timeout_consumer2 =
- timeout_consumer_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ timeout_consumer_impl2._this ();
ACE_DEBUG ((LM_DEBUG, "connecting timeout consumers\n"));
timeout_supplier_proxy1->
connect_push_consumer (safe_timeout_consumer1.in (),
timer_qos1.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
timeout_supplier_proxy2->
connect_push_consumer (safe_timeout_consumer2.in (),
timer_qos2.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "timeout consumers connected\n"));
@@ -367,14 +330,12 @@ main (int argc, char* argv[])
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
scheduler->add_dependency (supplier2_timeout_consumer_rt_info,
supplier2_rt_info,
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -422,7 +383,6 @@ main (int argc, char* argv[])
configs.out (),
anomalies.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Dump the schedule to a file..
ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -458,12 +418,10 @@ main (int argc, char* argv[])
// if (i % 2 == 0)
// {
// consumer_proxy1->push (event1 ACE_ENV_ARG_PARAMETER);
-// ACE_TRY_CHECK;
// }
// else
// {
// consumer_proxy2->push (event2 ACE_ENV_ARG_PARAMETER);
-// ACE_TRY_CHECK;
// }
// ACE_Time_Value rate (0, 10000);
@@ -471,11 +429,10 @@ main (int argc, char* argv[])
// }
ACE_DEBUG ((LM_DEBUG, "(%t) activating EC\n"));
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->run ();
// ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index 11b8f70666b..b83317551fb 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -15,7 +15,7 @@ Supplier::Supplier (RtecEventComm::EventSourceID id,
}
void
-Supplier::timeout_occured (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::timeout_occured (void)
{
RtecEventComm::EventSet event (1);
if (id_ == 1)
@@ -37,7 +37,7 @@ Supplier::timeout_occured (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -60,11 +60,11 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events
}
ACE_DEBUG ((LM_DEBUG, "(%t) Timeout Event received\n"));
- supplier_impl_->timeout_occured (ACE_ENV_SINGLE_ARG_PARAMETER);
+ supplier_impl_->timeout_occured ();
}
void
-Timeout_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Timeout_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 977586a3ec0..39c51c3f386 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -46,11 +46,11 @@ public:
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
- void timeout_occured (ACE_ENV_SINGLE_ARG_DECL);
+ void timeout_occured (void);
private:
RtecEventComm::EventSourceID id_;
@@ -64,8 +64,8 @@ class Timeout_Consumer : public POA_RtecEventComm::PushConsumer
//
// = DESCRIPTION
// This class is a consumer of timeout events from EC.
- // It registers for timeout event with EC and calls
- // the
+ // It registers for timeout event with EC and calls
+ // the
//
public:
Timeout_Consumer (Supplier * supplier_impl);
@@ -76,12 +76,12 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
-
+
private:
- Supplier *supplier_impl_;
+ Supplier *supplier_impl_;
};
#endif /* SUPPLIER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index b85abca57ee..6576372a4f5 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -18,12 +18,10 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
ACE_ENV_ARG_DECL)
{
this->proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Simple subscription, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -43,17 +41,15 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
this->proxy_->connect_push_consumer (me.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
{
ACE_TRY
{
// Disconnect from the proxy
- this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -64,15 +60,12 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Deactivate the object
poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -97,7 +90,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 536404b824b..4e03d8bb358 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -41,7 +41,7 @@ public:
ACE_ENV_ARG_DECL);
// Connect to the Event Channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the event channel
// = The RtecEventComm::PushConsumer methods
@@ -49,7 +49,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
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 f61cb958eeb..69f21355400 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -50,7 +50,6 @@ main (int argc, char* argv[])
// Create the ORB, pass the argv list for parsing.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse the arguments, you usually want to do this after
// invoking ORB_init() because ORB_init() will remove all the
@@ -68,15 +67,11 @@ main (int argc, char* argv[])
// it will not process any requests.
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// **************** THAT COMPLETS THE ORB SETUP
@@ -98,15 +93,13 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -142,8 +135,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ as_impl._this ();
// We need a local socket to send the data, open it and check
// that everything is OK:
@@ -160,7 +152,6 @@ main (int argc, char* argv[])
address_server.in (),
endpoint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now we connect the sender as a consumer of events, it will
// receive any event from any source and send it to the "right"
@@ -175,7 +166,6 @@ main (int argc, char* argv[])
ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
sender->connect (sub ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// To receive events we need to setup an event handler:
TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create();
@@ -193,7 +183,6 @@ main (int argc, char* argv[])
// events:
mcast_eh.open (event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Again the receiver connects to the event channel as a
// supplier of events, using the Observer features to detect
@@ -202,7 +191,6 @@ main (int argc, char* argv[])
endpoint,
address_server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The Receiver is also a supplier of events. The exact type of
// events is only known to the application, because it depends
@@ -222,7 +210,6 @@ main (int argc, char* argv[])
pub.is_gateway = 1;
receiver->connect (pub ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE FEDERATION SETUP
@@ -232,20 +219,16 @@ main (int argc, char* argv[])
// channel
Consumer consumer;
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
consumer.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// And now create a supplier
Supplier supplier;
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
supplier.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE CLIENT SETUP
@@ -257,8 +240,7 @@ main (int argc, char* argv[])
for (int i = 0; i != 1000; ++i)
{
CORBA::Boolean there_is_work =
- orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending ();
if (there_is_work)
{
// We use a TAO extension. The CORBA mechanism does not
@@ -267,12 +249,10 @@ main (int argc, char* argv[])
// them results in a spin loop.
ACE_Time_Value tv (0, 50000);
orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_Time_Value tv (0, 100000);
ACE_OS::sleep (tv);
- supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.perform_push ();
}
// **************** THAT COMPLETES THE EVENT LOOP
@@ -280,14 +260,11 @@ main (int argc, char* argv[])
// **************** HERE STARTS THE CLEANUP CODE
// First the easy ones
- supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.disconnect ();
+ consumer.disconnect ();
// Now let us close the Receiver
- receiver->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ receiver->shutdown ();
int r = mcast_eh.shutdown ();
@@ -298,14 +275,12 @@ main (int argc, char* argv[])
}
// And also close the sender of events
- sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sender->shutdown ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivating the event channel implementation is not strictly
// required, the POA will do it for us, but it is good manners:
@@ -316,25 +291,20 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Deactivate the object
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Finally destroy the ORB
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index f835dcb6daa..071cd1d5a98 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -17,12 +17,10 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
ACE_ENV_ARG_DECL)
{
this->proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Simple publication, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -37,17 +35,15 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
this->proxy_->connect_push_supplier (me.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
{
// Disconnect from the EC
ACE_TRY
{
- this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -55,17 +51,14 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
ACE_ENDTRY;
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (void)
{
ACE_TRY
{
@@ -78,7 +71,6 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
event[0].header.ttl = 1;
this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -87,7 +79,7 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 7c591f5fdb7..2640f06e31e 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -42,15 +42,15 @@ public:
ACE_ENV_ARG_DECL);
// Connect to the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the event channel
- void perform_push (ACE_ENV_SINGLE_ARG_DECL);
+ void perform_push (void);
// Push a single event
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
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 4f23249c145..2ff7c221a9a 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index bdbdbaad894..d0cdaf1abcd 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -47,7 +47,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
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 bb27f0bad68..01aec72c4eb 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -35,7 +35,6 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
{
@@ -46,15 +45,11 @@ main (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -62,11 +57,9 @@ main (int argc, char* argv[])
// Obtain a reference to the naming service...
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#endif /* 0 */
// ****************************************************************
@@ -92,8 +85,7 @@ main (int argc, char* argv[])
}
RtecScheduler::Scheduler_var scheduler =
- sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sched_impl->_this ();
#if 0
// Bind the scheduler with the naming service so clients
@@ -106,7 +98,6 @@ main (int argc, char* argv[])
// Register the servant with the Naming Context....
naming_context->rebind (schedule_name, scheduler.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#endif /* 0 */
// ****************************************************************
@@ -117,13 +108,11 @@ main (int argc, char* argv[])
TAO_EC_Event_Channel ec_impl (attributes);
ACE_DEBUG ((LM_DEBUG, "activating EC\n"));
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
@@ -134,7 +123,6 @@ main (int argc, char* argv[])
RtecScheduler::handle_t consumer_rt_info1 =
scheduler->create ("consumer_event_1" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Let's say that the execution time for event 1 is 2
// milliseconds...
@@ -150,11 +138,9 @@ main (int argc, char* argv[])
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::handle_t consumer_rt_info2 =
scheduler->create ("consumer_event_2" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Let's say that the execution time for event 2 is 1
// milliseconds...
@@ -169,7 +155,6 @@ main (int argc, char* argv[])
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ConsumerQOS_Factory consumer_qos;
consumer_qos.start_disjunction_group ();
@@ -182,22 +167,18 @@ main (int argc, char* argv[])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var consumer =
- consumer_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_impl._this ();
ACE_DEBUG ((LM_DEBUG, "connecting consumer\n"));
supplier_proxy->connect_push_consumer (consumer.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "consumer connected\n"));
// ****************************************************************
@@ -206,7 +187,6 @@ main (int argc, char* argv[])
RtecScheduler::handle_t supplier_rt_info1 =
scheduler->create ("supplier_event_1" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The execution times are set to reasonable values, but
// actually they are changed on the real execution, i.e. we
@@ -226,11 +206,9 @@ main (int argc, char* argv[])
1,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::handle_t supplier_rt_info2 =
scheduler->create ("supplier_event_2" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The execution times are set to reasonable values, but
// actually they are changed on the real execution, i.e. we
@@ -249,7 +227,6 @@ main (int argc, char* argv[])
1,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventComm::EventSourceID supplier_id = 1;
ACE_SupplierQOS_Factory supplier_qos;
@@ -264,22 +241,18 @@ main (int argc, char* argv[])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var supplier =
- supplier_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_impl._this ();
ACE_DEBUG ((LM_DEBUG, "connecting supplier\n"));
consumer_proxy->connect_push_supplier (supplier.in (),
supplier_qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "supplier connected\n"));
// ****************************************************************
@@ -318,7 +291,6 @@ main (int argc, char* argv[])
configs.out (),
anomalies.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Dump the schedule to a file..
ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -351,12 +323,10 @@ main (int argc, char* argv[])
if (i % 2 == 0)
{
consumer_proxy->push (event1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
consumer_proxy->push (event2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_Time_Value rate (0, 10000);
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 947378d616a..9411ec8c3b3 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -11,7 +11,7 @@ Supplier::Supplier (void)
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index b0391f7602b..d255d1e8c7f 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
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 e8af9a77ed8..42be12fb429 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -33,7 +33,6 @@ Consumer::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
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
// the run() method.
@@ -41,20 +40,15 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel from the naming service
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,7 +57,6 @@ Consumer::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -71,25 +64,20 @@ Consumer::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
// Simple subscription, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -107,7 +95,6 @@ Consumer::run (int argc, char* argv[])
supplier->connect_push_consumer (consumer.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Wait for events, using work_pending()/perform_work() may help
// or using another thread, this example is too simple for that.
@@ -151,7 +138,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 19005b96ec1..ccf75f912bc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -44,7 +44,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
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 a3bd5e5740d..c1a1e7523cf 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -25,24 +25,18 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the naming service
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,18 +45,15 @@ main (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// Create a name.
CosNaming::Name name;
@@ -72,12 +63,10 @@ main (int argc, char* argv[])
// Register with the name server
naming_context->bind (name, event_channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Example code: How to write ior to file
CORBA::String_var ior =
orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 21ced08639e..36f501d3fe9 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -33,24 +33,18 @@ Supplier::run (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// Obtain the event channel from the naming service
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,7 +53,6 @@ Supplier::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -67,25 +60,20 @@ Supplier::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
// Simple publication, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -98,7 +86,6 @@ Supplier::run (int argc, char* argv[])
consumer->connect_push_supplier (supplier.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Push the events...
ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -112,28 +99,22 @@ Supplier::run (int argc, char* argv[])
for (int i = 0; i != 2000; ++i)
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::sleep (sleep_time);
}
// Disconnect from the EC
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
// Destroy the EC....
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivate this object...
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Destroy the POA
poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -145,7 +126,7 @@ Supplier::run (int argc, char* argv[])
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index b1fce544ccc..edc8bd098a4 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
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 2153014c111..0dd55de9ce9 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -14,14 +14,13 @@ static int authorize_1 = 1;
static int authorize_2 = 1;
CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
+SLevel1_Server_i::authorize_level1 (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
/// Get a reference to the SecurityCurrent object.
CORBA::Object_var obj =
orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
/// Narrow it down correctly.
SecurityLevel1::Current_var current =
@@ -110,7 +109,7 @@ SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Boolean
-SLevel1_Server_i::authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+SLevel1_Server_i::authorize_level2 (void)
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 d284e65c293..0e7ae144123 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ CORBA::Boolean authorize_level1 (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- CORBA::Boolean authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ CORBA::Boolean authorize_level2 (void)
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 b7779c65615..52c321d9be2 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -38,18 +38,15 @@ main (int argc, char *argv [])
{
CORBA::ORB_var orb =
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
SLevel1_Server_var server =
SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -60,8 +57,7 @@ main (int argc, char *argv [])
}
CORBA::Boolean authorized =
- server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->authorize_level1 ();
if (authorized == 0)
ACE_DEBUG ((LM_DEBUG,
@@ -70,11 +66,9 @@ main (int argc, char *argv [])
ACE_DEBUG ((LM_DEBUG,
"DENIED: You Do NOT have enough privileges\n"));
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index 2b39bda82e3..a5a5668efb0 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -16,12 +16,10 @@ main (int argc, char *argv[])
/// Our regular ORB Initialization.
CORBA::ORB_var orb =
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" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -31,18 +29,15 @@ main (int argc, char *argv[])
/// Narrow down the reference to the currect interface.
PortableServer::POA_var root_poa =
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ level1_server._this ();
CORBA::String_var ior =
orb->object_to_string (server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -61,7 +56,6 @@ main (int argc, char *argv[])
orb->run ();
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SytemException, ex)
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 507bdde5847..d65c9b9c47d 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -40,18 +40,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Server_var server =
Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -68,15 +65,12 @@ main (int argc, char *argv[])
if (line == 0)
break;
server->send_line (line ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
buf.alloc ()->free (line);
}
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 97a4beace1c..2a9c9f54a42 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -41,11 +41,9 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,11 +52,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -66,12 +62,10 @@ main (int argc, char *argv[])
Simple_Server_i server_impl (orb.in ());
Simple_Server_var server =
- server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_impl._this ();
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -88,16 +82,13 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
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 93ba5bb076d..63199f1aa88 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::send_line (const char *line
}
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
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 f0c4aa7be58..76894de600f 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -35,7 +35,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
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 a3bd5a0947f..47fbf762dd5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -100,8 +100,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->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ flow_connection_entry->stop ();
}
}
else
@@ -111,8 +110,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
FlowConnection_Map_Entry *entry;
for (;iterator.next (entry) != 0;iterator.advance ())
{
- entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ entry->int_id_->stop ();
}
}
}
@@ -123,7 +121,6 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Start the transfer of data in the stream.
@@ -150,8 +147,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ flow_connection_entry->int_id_->start ();
}
}
else
@@ -161,8 +157,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ entry->int_id_->start ();
}
}
}
@@ -173,7 +168,6 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Tears down the stream. This will close the connection, and delete
@@ -200,8 +194,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ flow_connection_entry->int_id_->destroy ();
}
}
}
@@ -212,8 +205,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ entry->int_id_->destroy ();
}
}
}
@@ -224,7 +216,6 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Changes the QoS associated with the stream
@@ -266,7 +257,6 @@ 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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -303,7 +293,6 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
ACE_TRY
{
flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -311,7 +300,6 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
return;
}
ACE_ENDTRY;
- ACE_CHECK;
// add the flowname and the flowconnection to the hashtable.
this->flows_.length (this->flow_count_ + 1);
this->flows_ [this->flow_count_++] = CORBA::string_dup (flow_name);
@@ -382,7 +370,6 @@ MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
result =
this->mmdevice_->_is_equivalent (hash_key.mmdevice_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -390,7 +377,6 @@ MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
return false;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (false);
return result;
}
@@ -407,12 +393,10 @@ operator < (const MMDevice_Map_Hash_Key &left,
const CORBA::ULong left_hash =
left.mmdevice_->_hash (left.hash_maximum_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
const CORBA::ULong right_hash =
right.mmdevice_->_hash (right.hash_maximum_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = left_hash < right_hash;
}
@@ -423,7 +407,6 @@ operator < (const MMDevice_Map_Hash_Key &left,
return false;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (false);
return result;
}
@@ -437,7 +420,6 @@ MMDevice_Map_Hash_Key::hash (void) const
{
result = this->mmdevice_->_hash (this->hash_maximum_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -445,7 +427,6 @@ MMDevice_Map_Hash_Key::hash (void) const
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return result;
}
@@ -459,8 +440,7 @@ TAO_StreamCtrl::TAO_StreamCtrl (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->streamctrl_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->streamctrl_ = this->_this ();
char buf [BUFSIZ];
int result = ACE_OS::hostname (buf, BUFSIZ);
unsigned long ipaddr = 0;
@@ -473,7 +453,6 @@ TAO_StreamCtrl::TAO_StreamCtrl (void)
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::TAO_StreamCtrl");
}
ACE_ENDTRY;
- ACE_CHECK;
}
TAO_StreamCtrl::~TAO_StreamCtrl (void)
@@ -493,7 +472,6 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
ACE_TRY
{
TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->flow_connection_map_.current_size () > 0)
return;
MMDevice_Map_Iterator a_iterator (this->mmdevice_a_map_);
@@ -501,13 +479,11 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -516,7 +492,6 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Start the transfer of data in the stream.
@@ -530,7 +505,6 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
ACE_TRY
{
TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->flow_connection_map_.current_size () > 0)
return;
@@ -539,13 +513,11 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -554,7 +526,6 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Tears down the stream. This will close the connection, and delete
@@ -569,7 +540,6 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
ACE_TRY
{
TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->flow_connection_map_.current_size () > 0)
return;
@@ -578,13 +548,11 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -593,7 +561,6 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
return;
}
ACE_ENDTRY;
- ACE_CHECK;
int result = TAO_AV_Core::deactivate_servant (this);
if (result < 0)
@@ -659,7 +626,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
named_vdev.inout (),
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n"));
@@ -669,14 +635,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->sep_a_->define_property ("Related_StreamCtrl",
streamctrl_any
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
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any streamendpoint_a_any;
streamendpoint_a_any <<= this->sep_a_.in ();
@@ -684,14 +648,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
streamendpoint_a_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any mmdevice_a_any;
mmdevice_a_any <<= a_party;
this->vdev_a_->define_property ("Related_MMDevice",
mmdevice_a_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// add the mmdevice, sep and vdev to the map.
MMDevice_Map_Entry map_entry;
@@ -730,7 +692,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
named_vdev.inout (),
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
@@ -738,21 +699,18 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
"\n(%P|%t)stream_endpoint_b_ = %s",
TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()
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
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
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any streamendpoint_b_any;
streamendpoint_b_any <<= this->sep_b_.in ();
@@ -760,14 +718,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
streamendpoint_b_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any mmdevice_b_any;
mmdevice_b_any <<= b_party;
this->vdev_b_->define_property ("Related_MMDevice",
mmdevice_b_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// add the mmdevice, sep and vdev to the map.
MMDevice_Map_Entry map_entry;
MMDevice_Map_Hash_Key key (b_party);
@@ -793,12 +749,10 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->sep_a_->define_property ("PeerAdapter",
sep_a_peer_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->sep_b_->define_property ("PeerAdapter",
sep_b_peer_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// In the full profile case there's no VDev.
@@ -836,7 +790,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
}
ACE_CATCHANY
@@ -849,18 +802,15 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
// the sep.
this->sep_a_->set_source_id (this->source_id_++
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
if (!this->mcastconfigif_)
{
ACE_NEW_RETURN (this->mcastconfigif_,
TAO_MCastConfigIf,
0);
// @@: Deactivating the object thru poa means calling remove_ref after _this.
- this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->mcastconfigif_ptr_ = this->mcastconfigif_->_this ();
}
// Multicast source being added.
CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->streamctrl_.in (),
@@ -883,7 +833,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
the_qos,
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
int connect_leaf_success = 0;
@@ -908,16 +857,13 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::bind_devs");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
if (!connect_leaf_success)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -942,7 +888,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
the_qos,
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
@@ -961,14 +906,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->vdev_b_->set_peer (this->streamctrl_.in (),
this->vdev_a_.in (),
the_qos,
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now connect the streams together. This will
// establish the connection
@@ -977,7 +920,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
the_qos,
the_flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0);
}
@@ -989,7 +931,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -1025,24 +966,20 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
sep_a_->define_property ("PeerAdapter",
sep_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sep_any <<= sep_a;
sep_b_->define_property ("PeerAdapter",
sep_any
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" 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" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
flows_any.in () >>= temp_flows;
b_flows = *temp_flows;
u_int i;
@@ -1061,11 +998,9 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
CORBA::Object_var fep_obj =
sep_a_->get_fep (flowname
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::FlowEndPoint_var fep =
AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_CString fep_key (flowname);
result = a_fep_map->bind (fep_key, fep);
if (result == -1)
@@ -1079,11 +1014,9 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
CORBA::Object_var fep_obj =
sep_b->get_fep (flowname
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::FlowEndPoint_var fep =
AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_CString fep_key (flowname);
result = b_fep_map->bind (fep_key, fep);
if (result == -1)
@@ -1146,7 +1079,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
{
AVStreams::FlowEndPoint_var fep_a = a_feps_entry->int_id_;
AVStreams::FlowEndPoint_var connected_to =
- fep_a->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
+ fep_a->get_connected_fep ();
ACE_TRY_CHECK_EX (flow_connect);
if (!CORBA::is_nil (connected_to.in ()))
@@ -1163,7 +1096,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
+ fep_b->get_connected_fep ();
ACE_TRY_CHECK_EX (flow_connect);
if (!CORBA::is_nil (connected_to.in ()))
@@ -1202,7 +1135,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
ACE_NEW_RETURN (flowConnection,
TAO_FlowConnection,
0);
- flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ flow_connection = flowConnection->_this ();
ACE_TRY_CHECK_EX (flow_connect);
this->set_flow_connection (flowname,
flow_connection.in ()
@@ -1210,7 +1143,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
ACE_TRY_CHECK_EX (flow_connect);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
// make sure that a_feps is flow_producer
// and b_feps is flow_consumer
@@ -1258,7 +1190,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
ACE_RE_THROW;//_EX (producer_check);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
CORBA::String_var fep_a_name, fep_b_name;
flowname_any = fep_a->get_property_value ("FlowName"
ACE_ENV_ARG_PARAMETER);
@@ -1298,7 +1229,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
ACE_CATCHANY
{
@@ -1308,15 +1238,13 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
stream_qos,
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
void
-TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StreamCtrl::unbind (void)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed))
{
@@ -1333,13 +1261,11 @@ TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -1348,7 +1274,6 @@ TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -1466,13 +1391,11 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
if (in_flowspec.length () != 0)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -1481,7 +1404,6 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
return 1;
@@ -1518,7 +1440,6 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
Peer_Info,
0);
info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
info->qos_ = qos;
info->flow_spec_ = flow_spec;
this->peer_list_.insert_tail (info);
@@ -1529,7 +1450,6 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -1547,7 +1467,6 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
this->peer_list_iterator_.advance ())
{
info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -1556,7 +1475,6 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
@@ -1586,7 +1504,6 @@ TAO_MCastConfigIf::set_format (const char * flowName,
if (this->in_flowSpec (info->flow_spec_, flowName))
{
info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -1596,7 +1513,6 @@ TAO_MCastConfigIf::set_format (const char * flowName,
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// In future this should be a multicast message instead of point-to-point unicasts.
@@ -1619,7 +1535,6 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
if (this->in_flowSpec (info->flow_spec_, flowName))
{
info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -1629,7 +1544,6 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
@@ -1836,7 +1750,6 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::negotiate");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
ACE_TRY_EX (available_protocols)
{
@@ -1868,7 +1781,6 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Availableprotocols property not defined\n"));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
ACE_TRY
{
AVStreams::streamQoS network_qos;
@@ -1923,15 +1835,13 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::StreamEndPoint_var streamendpoint = this->_this ();
retv = responder->request_connection (streamendpoint.in (),
0,
network_qos,
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "%N:%l request_connection returned %d\n", retv));
@@ -1975,7 +1885,6 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return retv;
}
@@ -2004,7 +1913,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
{
// Make the upcall into the app
this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (flow_spec.length () > 0)
{
@@ -2057,7 +1965,6 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
// Make the upcall into the app
this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (flow_spec.length () > 0)
{
@@ -2353,7 +2260,6 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
// Make the upcall to the app
result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -2362,7 +2268,6 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return result;
}
@@ -2416,7 +2321,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
"TAO_StreamEndPoint::modify_QoS\n"));
int result = this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (result != 0)
return 0;
@@ -2440,7 +2344,6 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
this->define_property ("ProtocolRestriction",
protocol_restriction_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->protocols_ = protocols;
}
ACE_CATCHANY
@@ -2449,7 +2352,6 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -2519,7 +2421,6 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
fep->define_property ("Flow",
flowname_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -2543,7 +2444,6 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
{
CORBA::Any_var flow_name_any =
fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
const char *tmp;
flow_name_any >>= tmp;
@@ -2553,7 +2453,6 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
{
flow_name =
this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
ACE_ENDTRY;
return flow_name._retn ();
@@ -2568,16 +2467,13 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
{
AVStreams::FlowEndPoint_var fep =
AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::String_var flow_name =
this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_TRY
{
- fep->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fep->lock ();
// Add it to the sequence of flowNames supported.
// put the flowname and the flowendpoint in a hashtable.
ACE_CString fep_name_key (CORBA::string_dup (flow_name.in ()));
@@ -2595,7 +2491,6 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
this->define_property ("Flows",
flows_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -2633,14 +2528,12 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
this->define_property ("Flows",
flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::remove_fep");
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Sets the negotiator object.
@@ -2656,7 +2549,6 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
this->define_property ("Negotiator",
negotiator
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator);
}
ACE_CATCHANY
@@ -2664,7 +2556,6 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_negotiator");
}
ACE_ENDTRY;
- ACE_CHECK;
}
@@ -2685,14 +2576,12 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
this->define_property (PublicKey_property,
PublicKey
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_key");
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Set the source id.
@@ -2811,7 +2700,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
CORBA::Any_var streamctrl_any;
streamctrl_any = this->get_property_value ("Related_StreamCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
streamctrl_any.in () >>= streamctrl;
this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
@@ -2835,27 +2723,22 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ flow_connection = flowConnection->_this ();
this->streamctrl_->set_flow_connection (forward_entry->flowname (),
flow_connection.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
if (ACE_OS::strcmp (forward_entry->flow_protocol_str (), "") != 0)
{
CORBA::Any fp_settings;
flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (),
fp_settings
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
result = flow_connection->add_producer (producer.in (),
flow_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0);
}
@@ -2867,7 +2750,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
ACE_ERROR_RETURN ((LM_ERROR, "sep_a doesn't contain a flowproducer"), 0);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
else
{
@@ -2945,7 +2827,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -3032,7 +2913,6 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
ACE_ERROR_RETURN ((LM_ERROR, "sep_b doesn't contain a flowconsumer"), 0);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
AVStreams::QoS flow_qos;
result = qos.get_flow_qos (forward_entry->flowname (), flow_qos);
if (result < 0)
@@ -3045,7 +2925,6 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
CORBA::Any_var streamctrl_any;
streamctrl_any = this->get_property_value ("Related_StreamCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
streamctrl_any.in () >>= streamctrl;
this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
@@ -3064,11 +2943,9 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
result = flow_connection->add_consumer (consumer.in (),
flow_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0);
}
@@ -3124,7 +3001,6 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -3171,7 +3047,6 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (the_ctrl);
this->peer_ = AVStreams::VDev::_duplicate (the_peer_dev);
@@ -3179,15 +3054,12 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
CORBA::Any_var anyptr;
anyptr = this->peer_->get_property_value ("Related_MediaCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_ptr media_ctrl_obj = 0;
anyptr.in () >>= CORBA::Any::to_object(media_ctrl_obj);
- ACE_TRY_CHECK;
result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -3195,7 +3067,6 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return result;
}
@@ -3256,7 +3127,6 @@ TAO_VDev::set_format (const char *flowName,
this->define_property (format_property,
format
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -3264,7 +3134,6 @@ TAO_VDev::set_format (const char *flowName,
return;
}
ACE_ENDTRY;
- ACE_CHECK;
return;
}
@@ -3288,7 +3157,6 @@ TAO_VDev::set_dev_params (const char *flowName,
this->define_property (devParams_property,
devParams
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -3296,7 +3164,6 @@ TAO_VDev::set_dev_params (const char *flowName,
return;
}
ACE_ENDTRY;
- ACE_CHECK;
return;
}
@@ -3325,13 +3192,11 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
CORBA::Any_ptr streamendpoint_a_any =
this->get_property_value ("Related_StreamEndpoint"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
*streamendpoint_a_any >>= sep_a;
if (sep_a != 0)
{
sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else ACE_DEBUG ((LM_DEBUG,
"Stream EndPoint Not Found\n"));
@@ -3343,10 +3208,8 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
CORBA::Any_ptr streamendpoint_b_any =
this->get_property_value ("Related_StreamEndpoint"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
*streamendpoint_b_any >>= sep_b;
sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
return 1;
@@ -3389,16 +3252,13 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
ACE_NEW_RETURN (this->stream_ctrl_,
TAO_StreamCtrl,
0);
- AVStreams::MMDevice_var mmdevice = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::MMDevice_var mmdevice = this->_this ();
this->stream_ctrl_->bind_devs (peer_device,
mmdevice.in (),
the_qos,
the_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- streamctrl = this->stream_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ streamctrl = this->stream_ctrl_->_this ();
}
ACE_CATCHANY
{
@@ -3406,7 +3266,6 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
return streamctrl;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (streamctrl);
return streamctrl;
}
@@ -3474,7 +3333,6 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
default:
break;
}
- ACE_TRY_CHECK;
if (this->fdev_map_.current_size () > 0)
{
TAO_AV_QoS qos (the_qos);
@@ -3507,12 +3365,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
ACE_NEW_RETURN (flowConnection,
TAO_FlowConnection,
0);
- flowconnection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ flowconnection = flowConnection->_this ();
streamctrl->set_flow_connection (forward_entry.flowname(),
flowconnection.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -3520,7 +3376,6 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_a::get_flow_connection");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
int result = this->fdev_map_.find (flow_key, flow_dev);
if (result < 0)
@@ -3562,7 +3417,6 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
}
break;
}
- ACE_TRY_CHECK;
}
break;
case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT:
@@ -3596,7 +3450,6 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
}
break;
}
- ACE_TRY_CHECK;
}
break;
default:
@@ -3605,10 +3458,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
CORBA::Any flowname_any;
flowname_any <<= forward_entry.flowname ();
flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sep->add_fep (flow_endpoint.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -3618,7 +3469,6 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
return sep;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (sep);
return sep;
}
@@ -3642,9 +3492,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
ACE_TRY
{
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() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT( !CORBA::is_nil( sep_a ) );
}
@@ -3680,9 +3528,7 @@ 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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT ( !CORBA::is_nil( sep_b ) );
}
@@ -3692,7 +3538,6 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
return sep_b;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (sep_b);
return sep_b;
}
@@ -3734,7 +3579,6 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
CORBA::Any flowname_any;
flowname_any <<= flow_name.in ();
fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -3776,10 +3620,8 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
{
flow_name =
this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
// Add it to the sequence of flowNames supported.
@@ -3809,7 +3651,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return flow_name._retn ();
}
@@ -3857,14 +3698,12 @@ TAO_MMDevice::remove_fdev (const char *flow_name
this->define_property ("Flows",
flows
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::remove_fdev");
}
ACE_ENDTRY;
- ACE_CHECK;
}
// destructor.
@@ -3908,7 +3747,7 @@ TAO_FlowConnection::set_protocol (const char *protocol)
// stop this flow.
void
-TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::stop (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -3919,8 +3758,7 @@ TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
this->flow_producer_set_.end ();
producer_begin != producer_end; ++producer_begin)
{
- (*producer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*producer_begin)->stop ();
}
FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
();
@@ -3928,8 +3766,7 @@ TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
this->flow_consumer_set_.end ();
consumer_begin != consumer_end; ++consumer_begin)
{
- (*consumer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*consumer_begin)->stop ();
}
}
ACE_CATCHANY
@@ -3938,12 +3775,11 @@ TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// start this flow.
void
-TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::start (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -3954,8 +3790,7 @@ TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
this->flow_consumer_set_.end ();
consumer_begin != consumer_end; ++consumer_begin)
{
- (*consumer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*consumer_begin)->start ();
}
FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
();
@@ -3963,8 +3798,7 @@ TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
this->flow_producer_set_.end ();
producer_begin != producer_end; ++producer_begin)
{
- (*producer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*producer_begin)->start ();
}
}
ACE_CATCHANY
@@ -3973,12 +3807,11 @@ TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
return;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// destroy this flow.
void
-TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -3989,8 +3822,7 @@ TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
this->flow_producer_set_.end ();
producer_begin != producer_end; ++producer_begin)
{
- (*producer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*producer_begin)->destroy ();
}
FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
();
@@ -3998,8 +3830,7 @@ TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
this->flow_consumer_set_.end ();
consumer_begin != consumer_end; ++consumer_begin)
{
- (*consumer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*consumer_begin)->destroy ();
}
}
ACE_CATCHANY
@@ -4008,7 +3839,6 @@ TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
return;
}
ACE_ENDTRY;
- ACE_CHECK;
int result = TAO_AV_Core::deactivate_servant (this);
if (result < 0)
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::destroy failed\n"));
@@ -4044,7 +3874,6 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
{
(*producer_begin)->use_flow_protocol
(fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
();
@@ -4054,7 +3883,6 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
{
(*consumer_begin)->use_flow_protocol
(fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return 1;
}
@@ -4080,8 +3908,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
CORBA::Boolean result = 0;
ACE_TRY
{
- AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::FlowConnection_var flowconnection = this->_this ();
CORBA::Boolean met_qos;
CORBA::String_var named_fdev ((const char *)"");
AVStreams::FlowProducer_var producer =
@@ -4090,19 +3917,16 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
met_qos,
named_fdev.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::FlowConsumer_var consumer =
b_party->create_consumer (flowconnection.in (),
flow_qos,
met_qos,
named_fdev.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = this->connect (producer.in (),
consumer.in (),
flow_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -4110,7 +3934,6 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return result;
}
@@ -4136,20 +3959,17 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_this ();
flow_producer->set_peer (flowconnection.in (),
flow_consumer,
the_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
flow_consumer->set_peer (flowconnection.in (),
flow_producer,
the_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
char *consumer_address =
flow_consumer->go_to_listen (the_qos,
@@ -4157,7 +3977,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
flow_producer,
this->fp_name_.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ACE_OS::strcmp (consumer_address, "") == 0)
{
@@ -4167,12 +3986,10 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
flow_consumer,
this->fp_name_.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
flow_consumer->connect_to_peer (the_qos,
consumer_address,
this->fp_name_.inout ()
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.
}
@@ -4183,7 +4000,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
consumer_address,
this->fp_name_.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -4191,13 +4007,12 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::connect");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
CORBA::Boolean
-TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConnection::disconnect (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
@@ -4262,7 +4077,6 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
this->fp_name_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->producer_address_.in () == 0)
{
TAO_Forward_FlowSpec_Entry entry ("", "", "", "", address);
@@ -4283,16 +4097,13 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
ACE_NEW_RETURN (this->mcastconfigif_i_,
TAO_MCastConfigIf,
0);
- this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->mcastconfigif_ = this->mcastconfigif_i_->_this ();
}
- AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::FlowConnection_var flowconnection = this->_this ();
flow_producer->set_Mcast_peer (flowconnection.in (),
this->mcastconfigif_.in (),
the_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -4300,7 +4111,6 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -4346,21 +4156,18 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
{
flow_consumer->set_protocol_restriction (protocols
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
char * address =
flow_consumer->go_to_listen (the_qos,
1,
flow_producer,
this->fp_name_.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Boolean is_met;
flow_producer->connect_mcast (the_qos,
is_met,
address,
this->fp_name_.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -4381,7 +4188,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
// this->fp_name_.inout ()
// ACE_ENV_ARG_PARAMETER);
- // ACE_TRY_CHECK;
}
if (CORBA::is_nil (this->mcastconfigif_.in ()))
ACE_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0);
@@ -4394,7 +4200,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
stream_qos,
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -4402,7 +4207,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -4456,10 +4260,8 @@ TAO_FlowEndPoint::open (const char *flowname,
this->define_property ("FlowName",
flowname_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->set_format (format
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->protocol_addresses_ = protocols;
AVStreams::protocolSpec protocol_spec (protocols.length ());
protocol_spec.length (protocols.length ());
@@ -4476,7 +4278,6 @@ TAO_FlowEndPoint::open (const char *flowname,
}
this->set_protocol_restriction (protocol_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -4484,7 +4285,6 @@ TAO_FlowEndPoint::open (const char *flowname,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -4499,7 +4299,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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::lock (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// lock the current flowendpoint
@@ -4512,7 +4312,7 @@ TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// unlocks the flowendpoint , becomes free to be used in another flow.
void
-TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::unlock (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->lock_ = 0;
@@ -4520,7 +4320,7 @@ TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
void
-TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
int result = TAO_AV_Core::deactivate_servant (this);
@@ -4533,7 +4333,7 @@ TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_sep (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -4549,7 +4349,7 @@ TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep
}
AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_flow_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
@@ -4565,7 +4365,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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::get_connected_fep (void)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notConnected,
AVStreams::notSupported))
@@ -4589,7 +4389,6 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
this->define_property ("FlowProtocol",
flowname_property
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -4597,7 +4396,6 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -4617,14 +4415,12 @@ TAO_FlowEndPoint::set_format (const char * format
this->define_property ("Format",
format_val
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndpoint::set_format");
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -4642,14 +4438,12 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
this->define_property ("DevParams",
DevParams_property
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::set_dev_params");
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -4672,11 +4466,9 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
this->define_property ("AvailableProtocols",
AvailableProtocols_property
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::protocolSpec *temp_spec;
CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
temp_any.in () >>= temp_spec;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
for (i=0;i<temp_spec->length ();i++)
@@ -4691,7 +4483,6 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndpoint::set_protocol_restriction");
}
ACE_ENDTRY;
- ACE_CHECK;
}
CORBA::Boolean
@@ -4713,7 +4504,6 @@ 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"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
const char *temp_format;
format_ptr.in () >>= temp_format;
@@ -4722,7 +4512,6 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]";
format_ptr = peer_fep->get_property_value ("Format"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
format_ptr.in () >>= temp_format;
peer_format = CORBA::string_dup (temp_format);
if (ACE_OS::strcmp (my_format.in (),
@@ -4738,7 +4527,6 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
"TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols";
AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AvailableProtocols_ptr.in () >>= temp_protocols;
my_protocol_spec = *temp_protocols;
@@ -4746,7 +4534,6 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
"TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]";
AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AvailableProtocols_ptr.in () >>= temp_protocols;
peer_protocol_spec = *temp_protocols;
@@ -4783,7 +4570,6 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -4842,13 +4628,11 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
CORBA::Any_var AvailableProtocols_ptr =
peer_fep->get_property_value ("AvailableProtocols"
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"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
AvailableProtocols_ptr.in () >>= temp_protocols;
my_protocol_spec = *temp_protocols;
int protocol_match = 0;
@@ -4984,7 +4768,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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::stop (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4997,7 +4781,7 @@ TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_FlowProducer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::start (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5111,14 +4895,12 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key
this->define_property ("PublicKey",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowProducer::set_key");
}
ACE_ENDTRY;
- ACE_CHECK;
}
// source id to be used to distinguish this source from others.
@@ -5149,7 +4931,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
// The start, stop and destroy are to be handled by the application.
void
-TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::stop (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5159,7 +4941,7 @@ TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_FlowConsumer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::start (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 38c3c75e711..1a014abe0a4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -305,7 +305,7 @@ public:
AVStreams::noSuchFlow));
/// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
- virtual void unbind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void unbind (void)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed));
@@ -1047,15 +1047,15 @@ public:
TAO_FlowConnection (void);
/// stop this flow.
- virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void stop (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// start this flow.
- virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void start (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// destroy this flow.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// modify the QoS for this flow.
@@ -1099,7 +1099,7 @@ public:
AVStreams::alreadyConnected));
/// disconnect this flow connection.
- virtual CORBA::Boolean disconnect (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean disconnect (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// adds the producer to this flow connection.
@@ -1179,21 +1179,21 @@ public:
TAO_AV_Protocol_Object *object);
/// lock the flow endpoint for a particular flow.
- virtual CORBA::Boolean lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean lock (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// unlock the flow endpoint for subsequent use.
- virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void unlock (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// destroy this flow.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// get method for the related streamendpoint under which this
/// flowendpoint is.
- virtual AVStreams::StreamEndPoint_ptr related_sep(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual AVStreams::StreamEndPoint_ptr related_sep(void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// set method for the related streamendpoint under which this
@@ -1202,7 +1202,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual AVStreams::FlowConnection_ptr related_flow_connection(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual AVStreams::FlowConnection_ptr related_flow_connection(void)
ACE_THROW_SPEC ((CORBA::SystemException));
// accessor for the related flow connection attribute.
@@ -1213,7 +1213,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// returns the other flowendpoint to which this is connected.
- virtual AVStreams::FlowEndPoint_ptr get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notConnected,
AVStreams::notSupported));
@@ -1376,11 +1376,11 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// stop this flow, to be overridden by the application.
- virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void stop (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// start this flow, to be overridden by the application.
- virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void start (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char * go_to_listen (AVStreams::QoS & the_qos,
@@ -1446,11 +1446,11 @@ public:
const char *format);
/// stop this flow, to be overridden by the application.
- virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void stop (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// start this flow, to be overridden by the application.
- virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void start (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char * go_to_listen (AVStreams::QoS & the_qos,
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 830f8fe5e98..01e8fb523ea 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -591,7 +591,6 @@ TAO_AV_Core::get_acceptor (const char *flowname)
{
TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin ();
- ACE_TRY_CHECK;
TAO_AV_AcceptorSetItor end =
this->acceptor_registry_->end ();
@@ -618,7 +617,6 @@ TAO_AV_Core::remove_acceptor (const char *flowname)
{
TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin ();
- ACE_TRY_CHECK;
TAO_AV_AcceptorSetItor end =
this->acceptor_registry_->end ();
@@ -1134,16 +1132,13 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ PortableServer::POA_var poa = servant->_default_POA ();
PortableServer::ObjectId_var id = poa->servant_to_id (servant
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -1151,7 +1146,6 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 4d15bdd853a..b5435bb0b6d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -154,16 +154,13 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
ACE_TRY
{
// Get ourselves a Naming service
- this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->bind_to_naming_service ();
// Get the stream endpoint created by the child from the naming service
- this->get_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->get_stream_endpoint ();
// Get the Vdev created by the child from the naming service
- this->get_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->get_vdev ();
}
ACE_CATCHANY
{
@@ -171,13 +168,12 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
// Get ourselves a Naming service reference
int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void)
{
ACE_TRY
{
@@ -186,7 +182,6 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DEC
CORBA::Object_var naming_obj =
TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -195,7 +190,6 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DEC
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -203,13 +197,12 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DEC
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
// Get the VDev created in the child process from the namingservice
int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::get_vdev (void)
{
ACE_TRY
{
@@ -231,13 +224,11 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var vdev =
this->naming_context_->resolve (VDev_Name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow it
this->vdev_ =
AVStreams::VDev::_narrow (vdev.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check if valid
if (CORBA::is_nil (this->vdev_.in() ))
@@ -251,7 +242,6 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -291,7 +281,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 (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void)
{
ACE_TRY
{
@@ -314,13 +304,11 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
CORBA::Object_var stream_endpoint_a =
this->naming_context_->resolve (Stream_Endpoint_A_Name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow the reference
this->stream_endpoint_a_ =
AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check for validity
if (CORBA::is_nil (this->stream_endpoint_a_.in() ))
@@ -334,7 +322,6 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -369,7 +356,6 @@ 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_.in()
ACE_ENV_ARG_PARAMETER)));
- ACE_TRY_CHECK;
stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() );
vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
}
@@ -379,13 +365,12 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
// Gets the B type stream_endpoint from the Naming service
int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void)
{
ACE_TRY
{
@@ -408,13 +393,11 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
CORBA::Object_var stream_endpoint_b =
this->naming_context_->resolve (Stream_Endpoint_B_Name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow the reference
this->stream_endpoint_b_ =
AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check for validity
if (CORBA::is_nil (this->stream_endpoint_b_.in() ))
@@ -428,7 +411,6 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 2cc9158853b..d2f1bdde465 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -93,18 +93,18 @@ public:
protected:
/// Bind to the naming service
- virtual int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int bind_to_naming_service (void);
/**
* 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 (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual int get_stream_endpoint (void) = 0;
/// Get the Vdev object reference for the newly created
/// endpoint
- virtual int get_vdev (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int get_vdev (void);
/// Naming context
CosNaming::NamingContext_var naming_context_;
@@ -144,7 +144,7 @@ protected:
ACE_ENV_ARG_DECL);
/// Gets the "A" type stream endpoint from the child process
- virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int get_stream_endpoint (void);
};
@@ -173,7 +173,7 @@ protected:
/// Gets the object reference of the "B" type streamendpoint.
- virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int get_stream_endpoint (void);
};
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index b52287ef621..c7676adf1c7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -35,39 +35,29 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_
{
stream_endpoint_a_servant_->_remove_ref (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if(this->stream_endpoint_b_servant_)
{
stream_endpoint_b_servant_->_remove_ref (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if(this->vdev_servant_)
{
vdev_servant_->_remove_ref (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if(this->media_ctrl_servant_)
{
media_ctrl_servant_->_remove_ref (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
{
}
-# if defined (ACE_HAS_EXCEPTIONS) \
- && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
- ACE_CATCHALL
- {
- }
-# endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
ACE_ENDTRY;
}
@@ -80,16 +70,13 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->activate_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->activate_stream_endpoint ();
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
- this->activate_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->activate_vdev ();
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n"));
- this->activate_mediactrl (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->activate_mediactrl ();
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
}
ACE_CATCHANY
@@ -98,7 +85,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -110,17 +96,14 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
PortableServer::ObjectId_var id =
this->poa_->activate_object (servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Object_var obj =
this->poa_->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::String_var str =
this->orb_->object_to_string (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return str._retn ();
}
@@ -129,7 +112,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate VDev into the POA
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (void)
{
ACE_TRY
{
@@ -141,13 +124,11 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate the object under the root poa.
// CORBA::String_var vdev_ior = this->activate_with_poa (vdev,
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->vdev_ = vdev->_this ();
}
ACE_CATCHANY
{
@@ -155,7 +136,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -163,7 +143,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate the media_controller
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (void)
{
ACE_TRY
{
@@ -174,18 +154,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Associate the media controller object reference with the vdev, as per the OMG spec
CORBA::Any anyval;
media_ctrl_obj_
- = media_ctrl_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = media_ctrl_servant_->_this ();
anyval <<= media_ctrl_obj_.in();
- ACE_TRY_CHECK;
this->vdev_->define_property ("Related_MediaCtrl",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -193,7 +170,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -282,7 +258,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
// Put the stream_endpoint into the POA
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
{
ACE_TRY
{
@@ -292,8 +268,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
return -1;
// Save the object references, so that create_a can return them
- this->stream_endpoint_a_ = this->stream_endpoint_a_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->stream_endpoint_a_ = this->stream_endpoint_a_servant_->_this ();
}
ACE_CATCHANY
{
@@ -301,7 +276,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -335,15 +309,14 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
// Activate stream_endpoint
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
{
ACE_TRY
{
if (this->make_stream_endpoint ( this->stream_endpoint_b_servant_ ) == -1)
return -1;
- this->stream_endpoint_b_ = this->stream_endpoint_b_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->stream_endpoint_b_ = this->stream_endpoint_b_servant_->_this ();
}
ACE_CATCHANY
{
@@ -351,7 +324,6 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -409,19 +381,15 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
this->activate_objects (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get ourselves a naming_service object reference
- this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->bind_to_naming_service ();
// Register the vdev with the naming service
- this->register_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->register_vdev ();
// register the stream_endpoing with the naming_service
- this->register_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->register_stream_endpoint ();
}
ACE_CATCHANY
{
@@ -448,17 +416,14 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa
PortableServer::ObjectId_var id =
this->poa_->activate_object (servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Object_var obj =
this->poa_->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::String_var str =
this->orb_->object_to_string (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return str._retn ();
}
@@ -487,7 +452,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
// activate the stream_endpoint
CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_
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",
stream_endpoint_ior.in ()));
@@ -495,7 +459,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
// activate the vdev
CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_
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",
vdev_ior.in ()));
@@ -504,7 +467,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_
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 ()));
}
ACE_CATCHANY
@@ -513,20 +475,18 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
// Bind to the namingservice
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (void)
{
ACE_TRY
{
CORBA::Object_var naming_obj =
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,
" (%P|%t) Unable to resolve the Name Service.\n"),
@@ -535,7 +495,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -543,14 +502,13 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
// register the vdev with the naming service
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (void)
{
ACE_TRY
{
@@ -569,18 +527,14 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC
// make the media controller a property of the vdev
CORBA::Any media_ctrl_property;
media_ctrl_obj_ =
- this->media_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->media_ctrl_->_this ();
this->vdev_->define_property ("Related_MediaCtrl",
media_ctrl_obj_.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- vdev_obj_ = this->vdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ vdev_obj_ = this->vdev_->_this ();
- ACE_TRY_CHECK;
ACE_TRY_EX (bind)
{
// Register the vdev with the naming server.
@@ -596,7 +550,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC
this->naming_context_->rebind (this->vdev_name_,
vdev_obj_.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -604,7 +557,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
ACE_CATCHANY
{
@@ -612,7 +564,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -625,7 +576,6 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V
ACE_TRY
{
this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -672,13 +622,12 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
// register the stream_endpoint with the naming service
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (void)
{
CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
ACE_TRY
{
- stream_endpoint_obj = this->stream_endpoint_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ stream_endpoint_obj = this->stream_endpoint_->_this ();
// Create a name for the video control object
// subclasses can define their own name for the streamendpoint
@@ -686,7 +635,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
this->naming_context_->bind (this->stream_endpoint_name_,
stream_endpoint_obj
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
{
@@ -694,7 +642,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
this->naming_context_->rebind (this->stream_endpoint_name_,
stream_endpoint_obj
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -702,7 +649,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -753,11 +699,9 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
return 0;
this->naming_context_->unbind (this->stream_endpoint_name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->naming_context_->unbind (this->vdev_name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -765,7 +709,6 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 45210da5406..2d44463ac4d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -41,13 +41,13 @@ protected:
virtual int activate (void);
/// activates the stream_endpoint with the POA
- virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual int activate_stream_endpoint (void) = 0;
/// activates the vdev with the POA
- virtual int activate_vdev (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int activate_vdev (void);
/// activates the media controller with the POA
- virtual int activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int activate_mediactrl (void);
/// Bridge method to create a vdev, a la Acceptor. Applications
/// can override this
@@ -101,7 +101,7 @@ public:
/// Overrides the base class stream_endpoint activator, to activate
/// an "A" type endpoint
- virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int activate_stream_endpoint (void);
/// Called by the MMDevice, when it needs to create an A type endpoint
virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
@@ -132,7 +132,7 @@ public:
/// Overrides the base class stream_endpoint activator, to activate
/// a "B" type endpoint
- virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int activate_stream_endpoint (void);
/// Called by the MMDevice, when it needs to create a B type endpoint
virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
@@ -183,13 +183,13 @@ protected:
int unbind_names (void);
/// Binds to the naming service
- int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_naming_service (void);
/// Registers vdev with the naming service
- int register_vdev (ACE_ENV_SINGLE_ARG_DECL);
+ int register_vdev (void);
/// Registers stream_endpoint with the naming service
- int register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+ int register_stream_endpoint (void);
/// 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 c2e6683d223..6a838aed345 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -30,14 +30,12 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
this->define_property ("Flow",
flowname_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::TAO_FDev");
}
ACE_ENDTRY;
- ACE_CHECK;
}
template <class T_Producer, class T_Consumer>
@@ -65,14 +63,12 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name)
this->define_property ("Flow",
flowname_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::flowname");
}
ACE_ENDTRY;
- ACE_CHECK;
this->flowname_ = flow_name;
}
@@ -113,8 +109,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
T_Producer *producer_i;
ACE_NEW_RETURN (producer_i, T_Producer, 0);
this->producer_list_.insert_tail (producer_i);
- producer = producer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ producer = producer_i->_this ();
}
ACE_CATCHANY
{
@@ -122,7 +117,6 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
return producer;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (producer);
return producer;
}
@@ -143,8 +137,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
ACE_NEW_RETURN (consumer_i, T_Consumer, 0 );
this->consumer_list_.insert_tail (consumer_i);
- consumer = consumer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer = consumer_i->_this ();
}
ACE_CATCHANY
{
@@ -152,7 +145,6 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
return consumer;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (consumer);
return consumer;
}
@@ -190,7 +182,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
ACE_UNUSED_ARG (peer_device);
ACE_UNUSED_ARG (the_qos);
ACE_UNUSED_ARG (is_met);
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -208,7 +199,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
ACE_UNUSED_ARG (first_peer);
ACE_UNUSED_ARG (the_qos);
ACE_UNUSED_ARG (is_met);
- ACE_CHECK_RETURN (0);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index f79296289ab..e0ca8fa3ba6 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -25,7 +25,7 @@ ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
ACE_THROW_SPEC ((CORBA::SystemException))
{
- target_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ target_->disconnect_push_consumer ();
}
template<class TARGET> void
@@ -33,7 +33,7 @@ ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ target_->disconnect_push_supplier ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 9f56182745b..c63e0db6595 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -50,7 +50,7 @@ public:
ACE_THROW_SPEC (( CORBA::SystemException));
/// Forwards to target_.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC (( CORBA::SystemException));
private:
@@ -74,7 +74,7 @@ public:
ACE_PushSupplier_Adapter (TARGET *target);
/// Forwards to target_.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC (( CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 3e62837cfdb..3afb449d168 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -20,8 +20,8 @@
#include "orbsvcs/Concurrency/CC_Lock.h"
#include "ace/Log_Msg.h"
-ACE_RCSID (Concurrency,
- CC_Lock,
+ACE_RCSID (Concurrency,
+ CC_Lock,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -43,7 +43,7 @@ CC_Lock::~CC_Lock (void)
}
void
-CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CC_Lock::lock (void)
{
ACE_DEBUG ((LM_DEBUG,
"CC_Lock::lock\n"));
@@ -51,7 +51,7 @@ CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::Boolean
-CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL)
+CC_Lock::try_lock (void)
{
ACE_DEBUG ((LM_DEBUG,
"CC_Lock::try_lock. "));
@@ -86,7 +86,7 @@ CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL)
}
void
-CC_Lock::unlock (ACE_ENV_SINGLE_ARG_DECL)
+CC_Lock::unlock (void)
{
ACE_DEBUG ((LM_DEBUG,
"CC_Lock::unlock\n"));
@@ -205,7 +205,7 @@ void CC_LockModeIterator::First (void)
current_ = CosConcurrencyControl::intention_read;
}
-void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL)
+void CC_LockModeIterator::Next (void)
{
switch (current_)
{
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 622f973a9df..d4a5d529f6e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -60,14 +60,14 @@ public:
~CC_Lock (void);
/// Acquires this lock. Blocks until lock is obtained
- void lock (ACE_ENV_SINGLE_ARG_DECL);
+ void lock (void);
/// Tries to acquire this lock. If it is not possible to acquire the
/// lock, false is returned
- CORBA::Boolean try_lock (ACE_ENV_SINGLE_ARG_DECL);
+ CORBA::Boolean try_lock (void);
/// Releases this lock.
- void unlock (ACE_ENV_SINGLE_ARG_DECL);
+ void unlock (void);
/// Changes the mode of this lock.
void change_mode (CosConcurrencyControl::lock_mode new_mode
@@ -130,7 +130,7 @@ public:
/// Advance the iterator to the next element
/// Throws exception if out of range
- void Next(ACE_ENV_SINGLE_ARG_DECL);
+ void Next(void);
/// Returns true if the iterator has reached the last element
CORBA::Boolean IsDone(void);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 91ef3d63be5..e1c22fdf270 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -29,8 +29,7 @@ CC_LockSet::CC_LockSet (void)
{
ACE_TRY_NEW_ENV
{
- this->Init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->Init ();
}
ACE_CATCHANY
{
@@ -47,8 +46,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
{
ACE_TRY_NEW_ENV
{
- this->Init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->Init ();
}
ACE_CATCHANY
{
@@ -61,7 +59,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
// Initialization.
void
-CC_LockSet::Init (ACE_ENV_SINGLE_ARG_DECL)
+CC_LockSet::Init (void)
{
// Set the mode of the statically allocated locks
lock_[CC_IR] = 0;
@@ -219,7 +217,6 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
else if (this->change_mode_i (lm_held, lm_new)==1)
{
this->unlock (held_mode ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (semaphore_.acquire () == -1)
ACE_THROW (CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 1d01ebeef27..40056dc46bf 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -126,7 +126,7 @@ private:
/// Initiatlizes the lock set array and acquires the initial
/// semaphore.
- void Init (ACE_ENV_SINGLE_ARG_DECL);
+ void Init (void);
/// Returns true if the held lock and the requested lock are compatible
CORBA::Boolean compatible (CC_LockModeEnum mr);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index dfe17f3913a..0bb2a79f3e3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -27,7 +27,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
}
CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL)
+CC_LockSetFactory::create (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CC_LockSet *ls = 0;
@@ -37,9 +37,8 @@ CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (ls,
CC_LockSet,
CORBA::NO_MEMORY());
- ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
- return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return ls->_this ();
}
CosConcurrencyControl::LockSet_ptr
@@ -54,9 +53,8 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
ACE_NEW_THROW_EX (ls,
CC_LockSet (which),
CORBA::NO_MEMORY());
- ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
- return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return ls->_this ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index b12a3a41e57..5364af0b881 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -37,12 +37,10 @@ TAO_Concurrency_Loader::init (int argc, char *argv[])
// Initialize the ORB
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This function call initializes the Concurrency Service
CORBA::Object_var object =
this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -70,15 +68,11 @@ TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
{
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ poa->the_POAManager ();
+ poa_manager->activate ();
return this->concurrency_server_.init (orb, poa.in ());
}
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 570cef2f20f..cc5e240ab3a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -47,7 +47,6 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
this->poa_= PortableServer::POA::_duplicate (poa);
// Get the naming context ptr to NameService.
- // ACE_TRY_CHECK;
PortableServer::ObjectId_var id =
PortableServer::string_to_ObjectId ("ConcurrencyService");
@@ -55,7 +54,6 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
poa->activate_object_with_id (id.in (),
&this->lock_set_factory_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Stringify the objref we'll be implementing, and print it to
// stdout. Someone will take that string and give it to a
@@ -63,12 +61,10 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
obj =
poa->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var str =
orb->object_to_string (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"listening as object <%s>\n",
@@ -96,7 +92,6 @@ TAO_Concurrency_Server::fini (void)
this->poa_->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index ac6dce9b64a..f04f3f1beb7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -39,13 +39,11 @@ TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event
this->push_admin_.for_each (&push_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_CEC_Propagate_Event_Pull pull_worker (event);
this->pull_admin_.for_each (&pull_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -91,31 +89,29 @@ TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier
}
void
-TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::shutdown (void)
{
- this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->push_admin_.shutdown ();
- this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->pull_admin_.shutdown ();
}
CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->push_admin_.obtain ();
}
CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->pull_admin_.obtain ();
}
PortableServer::POA_ptr
-TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerAdmin::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index aba60f615c6..c75e0c9a4bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -47,7 +47,7 @@ class TAO_CEC_EventChannel;
* externally.
* = TODO
*/
-class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin
+class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin
: public POA_CosEventChannelAdmin::ConsumerAdmin
{
public:
@@ -88,18 +88,18 @@ public:
/// The event channel is shutting down, inform all the consumers of
/// this
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
// = The CosEventChannelAdmin::ConsumerAdmin methods...
virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
- obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The PortableServer::ServantBase methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
/// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 5911d5c109d..8db5cf88fa2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -43,8 +43,7 @@ TAO_CEC_Dispatching_Task::svc (void)
continue;
}
- int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int result = command->execute ();
ACE_Message_Block::release (mb);
@@ -116,7 +115,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void)
// ****************************************************************
int
-TAO_CEC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_Shutdown_Task_Command::execute (void)
{
return -1;
}
@@ -129,10 +128,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void)
}
int
-TAO_CEC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Push_Command::execute (void)
{
this->proxy_->push_to_consumer (this->event_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -145,10 +143,9 @@ TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void)
}
int
-TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Invoke_Command::execute (void)
{
this->proxy_->invoke_to_consumer (this->typed_event_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 5c213395a89..7d987927f44 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -87,7 +87,7 @@ public:
virtual ~TAO_CEC_Dispatch_Command (void);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+ virtual int execute (void) = 0;
};
// ****************************************************************
@@ -99,7 +99,7 @@ public:
TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual int execute (void);
};
// ****************************************************************
@@ -117,7 +117,7 @@ public:
virtual ~TAO_CEC_Push_Command (void);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual int execute (void);
private:
/// The proxy
@@ -143,7 +143,7 @@ public:
virtual ~TAO_CEC_Invoke_Command (void);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual int execute (void);
private:
/// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index f00965a58b2..810d90abe5f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -29,14 +29,13 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0)
{
this->is_a (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
CORBA::NVList_ptr list;
// Get the operation paramter information from the IFR cache.
- TAO_CEC_Operation_Params *oper_params =
+ TAO_CEC_Operation_Params *oper_params =
this->typed_event_channel_->find_from_ifr_cache (request->operation () );
if (oper_params == 0)
@@ -48,25 +47,21 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
}
this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
// Populate the NVList from the parameter information.
this->typed_event_channel_->create_operation_list (oper_params, list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
+
// Get the operation arguments. This ahould demarshal correctly.
request->arguments (list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Populate the TypedEvent with the list and operation name.
TAO_CEC_TypedEvent typed_event (list, request->operation () );
// Pass the TypedEvent to the TypedProxyPushConsumer
this->typed_pp_consumer_->invoke (typed_event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -81,7 +76,7 @@ TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::O
}
PortableServer::POA_ptr
-TAO_CEC_DynamicImplementationServer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_DynamicImplementationServer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
@@ -93,7 +88,6 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
CORBA::NVList_ptr list;
this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Any any_1;
any_1._tao_set_typecode(CORBA::_tc_string);
@@ -102,14 +96,11 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
any_1,
CORBA::ARG_IN
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- request->arguments (list
+ request->arguments (list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Any_ptr ap = nv->value ();
const char *value;
@@ -123,8 +114,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
}
const char *object_id =
- CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::_tc_Object->id ();
if (TAO_debug_level >= 10)
{
@@ -153,27 +143,26 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
ACE_TEXT ("***** is_a using base interface %s *****\n"),
this->typed_event_channel_->base_interfaces (base) ));
}
-
+
if (ACE_OS::strcmp (value, this->typed_event_channel_->base_interfaces (base) ) == 0)
{
result = 1;
}
}
}
-
+
if (TAO_debug_level >= 10)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("***** is_a returning %d *****\n"),
result));
}
-
+
CORBA::Any result_any;
CORBA::Any::from_boolean from_boolean (result);
result_any <<= from_boolean;
request->set_result (result_any ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 6d85505f431..6101bf34738 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_EventChannel::activate (void)
{
this->dispatching_->activate ();
this->pulling_strategy_->activate ();
@@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::shutdown (void)
{
this->dispatching_->shutdown ();
this->pulling_strategy_->shutdown ();
@@ -91,28 +91,20 @@ TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_control_->shutdown ();
PortableServer::POA_var consumer_poa =
- this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->_default_POA ();
PortableServer::ObjectId_var consumer_id =
consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POA_var supplier_poa =
- this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_admin_->_default_POA ();
PortableServer::ObjectId_var supplier_id =
supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_admin_->shutdown ();
- this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->shutdown ();
}
void
@@ -120,7 +112,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -128,7 +119,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -136,7 +126,6 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -144,7 +133,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -152,7 +140,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -160,7 +147,6 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -168,7 +154,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -176,7 +161,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -184,7 +168,6 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -192,7 +175,6 @@ TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -200,7 +182,6 @@ TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -208,28 +189,27 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CEC_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->consumer_admin_->_this ();
}
CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CEC_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->supplier_admin_->_this ();
}
void
-TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->shutdown ();
}
CORBA::Policy_ptr TAO_CEC_EventChannel::create_roundtrip_timeout_policy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index e7ac5d173e2..81afadc878c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -133,11 +133,11 @@ public:
/// Start the internal threads (if any), etc.
/// After this call the EC can be used.
- virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void activate (void);
/// Shutdown any internal threads, cleanup all the internal
/// structures, flush all the messages, etc.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void shutdown (void);
/// Access the dispatching module....
TAO_CEC_Dispatching* dispatching (void) const;
@@ -243,17 +243,17 @@ public:
/// The default implementation is:
/// this->consumer_admin ()->_this (env);
virtual CosEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// The default implementation is:
/// this->supplier_admin ()->_this (env);
virtual CosEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Commit suicide.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
ServantRetryMap& get_servant_retry_map (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index e9a9e726717..202b473face 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -63,11 +63,9 @@ TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
// ORB initialization boiler plate...
this->orb_=
CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj =
this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in() ))
return -1;
@@ -193,15 +191,11 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
// POA initialization and activation ...
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -226,18 +220,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
this->factory_,
this->terminate_flag_);
- this->ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_impl_->activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_impl_->_this ();
if (ior_file != 0)
{
CORBA::String_var ior =
orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
if (iorf != 0)
@@ -268,12 +259,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
CORBA::Object_var obj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->naming_context_ =
CosNaming::NamingContext::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->channel_name_.length (1);
this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
@@ -283,14 +272,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
this->naming_context_->rebind (this->channel_name_,
event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
this->naming_context_->bind (this->channel_name_,
event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
return CosEventChannelAdmin::EventChannel::_duplicate (event_channel.in () );
@@ -313,7 +300,6 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
CORBA::Object_var ifr_obj_var =
orb->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(ifr_obj_var.in () ))
{
@@ -328,7 +314,6 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
{
interface_repository = CORBA::Repository::_narrow(ifr_obj_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(interface_repository.in () ))
{
@@ -367,18 +352,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
this->factory_,
this->terminate_flag_);
- this->typed_ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->typed_ec_impl_->activate ();
CosTypedEventChannelAdmin::TypedEventChannel_var event_channel =
- this->typed_ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->typed_ec_impl_->_this ();
if (ior_file != 0)
{
CORBA::String_var ior =
orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
if (iorf != 0)
@@ -409,12 +391,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
CORBA::Object_var obj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->naming_context_ =
CosNaming::NamingContext::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->channel_name_.length (1);
this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
@@ -424,14 +404,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
this->naming_context_->rebind (this->channel_name_,
event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
this->naming_context_->bind (this->channel_name_,
event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
return CosTypedEventChannelAdmin::TypedEventChannel::_duplicate (event_channel.in () );
@@ -461,38 +439,30 @@ TAO_CEC_Event_Loader::fini (void)
if(this->typed_ec_impl_)
{
// Release the resources of the Typed Event Channel
- this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->typed_ec_impl_->destroy ();
// Deactivate the Typed EC
// This will raise an exception if destroy == 1
PortableServer::POA_var t_poa =
- this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->typed_ec_impl_->_default_POA ();
PortableServer::ObjectId_var t_id =
t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
#else
// Release the resources of the Event Channel
- this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_impl_->destroy ();
// Deactivate the EC
PortableServer::POA_var poa =
- this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_impl_->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
}
ACE_CATCHANY
@@ -500,7 +470,6 @@ TAO_CEC_Event_Loader::fini (void)
// Do Nothing
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_TRY_EX (foo)
{
@@ -526,7 +495,6 @@ TAO_CEC_Event_Loader::fini (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index ba48e98cea8..b119e82f692 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -51,8 +51,7 @@ TAO_CEC_ProxyPullConsumer::activate (
CosEventChannelAdmin::ProxyPullConsumer_var result;
ACE_TRY
{
- result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = this->_this ();
}
ACE_CATCHANY
{
@@ -63,19 +62,16 @@ TAO_CEC_ProxyPullConsumer::activate (
}
void
-TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -104,7 +100,6 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK_RETURN (0);
if (this->is_connected_i () == 0)
return 0; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -123,7 +118,6 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
ACE_TRY
{
any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Inform the control that we got something from the supplier
control->successful_transmission(this);
@@ -131,14 +125,12 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -158,7 +150,6 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK_RETURN (0);
if (this->is_connected_i () == 0)
return 0; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -173,8 +164,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
CORBA::Any_var any;
ACE_TRY
{
- any = supplier->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ any = supplier->pull ();
}
ACE_CATCHANY
{
@@ -195,7 +185,6 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_connected_i () == 0)
@@ -211,14 +200,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return supplier->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
}
void
-TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::shutdown (void)
{
CosEventComm::PullSupplier_var supplier;
@@ -227,21 +216,18 @@ TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
supplier = this->supplier_._retn ();
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (supplier.in ()))
return;
ACE_TRY
{
- supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_pull_supplier ();
}
ACE_CATCHANY
{
@@ -296,7 +282,6 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -316,10 +301,8 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
TAO_CEC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// What if a second thread connected us after this?
@@ -372,7 +355,6 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
@@ -384,14 +366,12 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
// Notify the event channel...
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->event_channel_->disconnect_callbacks ())
{
ACE_TRY
{
- supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_pull_supplier ();
}
ACE_CATCHANY
{
@@ -403,19 +383,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
}
PortableServer::POA_ptr
-TAO_CEC_ProxyPullConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_CEC_ProxyPullConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_remove_ref (void)
{
this->_decr_refcnt ();
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 033e4e5476f..9ce0be748d9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -63,7 +63,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return 0 if no supplier is connected...
@@ -76,7 +76,7 @@ public:
/// Pulls from the supplier, verifies that it is connected.
CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event
ACE_ENV_ARG_DECL);
- CORBA::Any* pull_from_supplier (ACE_ENV_SINGLE_ARG_DECL);
+ CORBA::Any* pull_from_supplier (void);
/**
* Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -87,7 +87,7 @@ public:
ACE_ENV_ARG_DECL);
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
/// Increment and decrement the reference count.
CORBA::ULong _incr_refcnt (void);
@@ -99,13 +99,13 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
CosEventChannelAdmin::AlreadyConnected));
- virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
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 ecadbc25ecf..cbbdc1c51d7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -50,8 +50,7 @@ TAO_CEC_ProxyPullSupplier::activate (
CosEventChannelAdmin::ProxyPullSupplier_var result;
ACE_TRY
{
- result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = this->_this ();
}
ACE_CATCHANY
{
@@ -62,19 +61,16 @@ TAO_CEC_ProxyPullSupplier::activate (
}
void
-TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -87,7 +83,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::shutdown (void)
{
// Save the consumer we where connected to, we need to send a
// disconnect message to it.
@@ -98,21 +94,18 @@ TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
consumer = this->consumer_._retn ();
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (consumer.in ()))
return;
ACE_TRY
{
- consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_pull_consumer ();
}
ACE_CATCHANY
{
@@ -132,7 +125,6 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_connected_i () == 0)
@@ -148,7 +140,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
@@ -170,7 +162,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
}
CORBA::Any *
-TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::pull (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosEventComm::Disconnected))
{
@@ -257,7 +249,6 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -277,10 +268,8 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
TAO_CEC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
return;
}
@@ -333,7 +322,6 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
ACE_THROW (CORBA::BAD_INV_ORDER ());
@@ -345,7 +333,6 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
// Notify the event channel....
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (consumer.in ()))
return;
@@ -354,8 +341,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
{
ACE_TRY
{
- consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_pull_consumer ();
}
ACE_CATCHANY
{
@@ -369,19 +355,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
}
PortableServer::POA_ptr
-TAO_CEC_ProxyPullSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_CEC_ProxyPullSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_remove_ref (void)
{
this->_decr_refcnt ();
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index fa84ba336da..949afe498b7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -70,7 +70,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return 0 if no consumer is connected...
@@ -85,7 +85,7 @@ public:
CosEventComm::PullConsumer_ptr consumer (void) const;
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
/**
* Invoke the _non_existent() pseudo-operation on the consumer. If
@@ -105,12 +105,12 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
CosEventChannelAdmin::AlreadyConnected));
- virtual CORBA::Any * pull (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::Any * pull (void)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
- virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Increment and decrement the reference count.
@@ -118,9 +118,9 @@ public:
CORBA::ULong _decr_refcnt (void);
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
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 c65d0968f98..b909b4b423c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -51,8 +51,7 @@ TAO_CEC_ProxyPushConsumer::activate (
CosEventChannelAdmin::ProxyPushConsumer_var result;
ACE_TRY
{
- result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = this->_this ();
}
ACE_CATCHANY
{
@@ -63,19 +62,16 @@ TAO_CEC_ProxyPushConsumer::activate (
}
void
-TAO_CEC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -97,7 +93,6 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = false;
if (!this->is_connected_i ())
@@ -113,14 +108,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return supplier->_non_existent ();
#else
return false;
#endif /* TAO_HAS_MINIMUM_CORBA */
}
void
-TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::shutdown (void)
{
CosEventComm::PushSupplier_var supplier;
@@ -129,22 +124,19 @@ TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
supplier = this->supplier_._retn ();
this->connected_ = false;
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (supplier.in ()))
return;
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -196,7 +188,6 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -216,10 +207,8 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
TAO_CEC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// What if a second thread connected us after this?
@@ -276,7 +265,6 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
this->event_channel_->consumer_admin ()->push (event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -291,7 +279,6 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (!this->is_connected_i ())
ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
@@ -303,7 +290,6 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
// Notify the event channel...
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (supplier.in ()))
return;
@@ -312,8 +298,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
{
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -325,19 +310,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
}
PortableServer::POA_ptr
-TAO_CEC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_CEC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_CEC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_remove_ref (void)
{
this->_decr_refcnt ();
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 574670778c5..6057f466c8b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -65,7 +65,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return false if no supplier is connected...
@@ -84,7 +84,7 @@ public:
ACE_ENV_ARG_DECL);
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
/// Increment and decrement the reference count.
CORBA::ULong _incr_refcnt (void);
@@ -99,13 +99,13 @@ public:
virtual void push (const CORBA::Any& event
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
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 b213428c4ed..139f413d2a0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -104,8 +104,7 @@ TAO_CEC_ProxyPushSupplier::activate (
CosEventChannelAdmin::ProxyPushSupplier_var result;
ACE_TRY
{
- result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = this->_this ();
}
ACE_CATCHANY
{
@@ -116,19 +115,16 @@ TAO_CEC_ProxyPushSupplier::activate (
}
void
-TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -141,7 +137,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::shutdown (void)
{
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
if (this->is_typed_ec () )
@@ -154,20 +150,18 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
typed_consumer = this->typed_consumer_._retn ();
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (typed_consumer.in ()))
return;
ACE_TRY_EX (typed)
{
- typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ typed_consumer->disconnect_push_consumer ();
ACE_TRY_CHECK_EX (typed);
}
ACE_CATCHANY
@@ -190,21 +184,18 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
consumer = this->consumer_._retn ();
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (consumer.in ()))
return;
ACE_TRY
{
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -242,7 +233,6 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
this->event_channel_->dispatching ()->push (this,
event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -273,7 +263,6 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event
this->typed_event_channel_->dispatching ()->invoke (this,
typed_event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -302,7 +291,6 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
this->event_channel_->dispatching ()->push_nocopy (this,
event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -383,20 +371,17 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
CosTypedEventComm::TypedPushConsumer_var local_typed_consumer =
CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Obtain the typed object interface from the consumer
CORBA::Object_var local_typed_consumer_obj =
CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer (
ACE_ENV_SINGLE_ARG_PARAMETER) );
- ACE_CHECK;
{
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -407,7 +392,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
this->cleanup_i ();
this->typed_consumer_ = apply_policy (local_typed_consumer.in () );
- ACE_CHECK;
TAO_CEC_Unlock reverse_lock (*this->lock_);
@@ -416,27 +400,22 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
TAO_CEC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->typed_event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
return;
}
this->typed_consumer_ = apply_policy (local_typed_consumer.in () );
- ACE_CHECK;
// Store the typed object interface from the consumer
this->typed_consumer_obj_ =
apply_policy_obj (local_typed_consumer_obj.in () );
- ACE_CHECK;
}
// Notify the event channel...
this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
} /* this->is_typed_ec */
else
@@ -456,7 +435,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -475,10 +453,8 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
TAO_CEC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
return;
}
@@ -488,7 +464,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
// Notify the event channel...
this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
} /* ! this->is_typed_ec */
@@ -565,7 +540,6 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
ACE_THROW (CORBA::BAD_INV_ORDER ());
@@ -591,16 +565,13 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
if (this->is_typed_ec () )
{
this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#else
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
// Disconnect callbacks
@@ -611,7 +582,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
{
ACE_TRY_EX (typed)
{
- typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ typed_consumer->disconnect_push_consumer ();
ACE_TRY_CHECK_EX (typed);
}
ACE_CATCHANY
@@ -632,8 +603,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
{
ACE_TRY
{
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -660,7 +630,6 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
return; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -674,7 +643,6 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
ACE_TRY
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Inform the control that we were able to push something
control->successful_transmission(this);
@@ -682,14 +650,12 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
{
control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -719,7 +685,6 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
ACE_TRY
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Inform the control that we were able to push something
control->successful_transmission(this);
@@ -731,7 +696,6 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
}
control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -743,7 +707,6 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -767,7 +730,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
return; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -791,11 +753,9 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
target_request.inout(),
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Call the DII invoke for the operation on the target object
- target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ target_request->invoke ();
// Inform the control that we were able to invoke something
control->successful_transmission(this);
@@ -807,7 +767,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
}
control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -818,7 +777,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -872,11 +830,9 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
target_request.inout(),
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Call the DII invoke for the operation on the target object
- target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ target_request->invoke ();
// Inform the control that we were able to invoke something
control->successful_transmission(this);
@@ -888,7 +844,6 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
}
control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -899,7 +854,6 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -923,7 +877,6 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_connected_i () == 0)
@@ -956,26 +909,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
}
PortableServer::POA_ptr
-TAO_CEC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_CEC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_remove_ref (void)
{
this->_decr_refcnt ();
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index d6fd0f41987..c712ca1aae3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -81,7 +81,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return 0 if no consumer is connected...
@@ -96,7 +96,7 @@ public:
CosEventComm::PushConsumer_ptr consumer (void) const;
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
/// Internal methods to push an event to each consumer.
virtual void push (const CORBA::Any &event
@@ -136,7 +136,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
CosEventChannelAdmin::AlreadyConnected,
CosEventChannelAdmin::TypeError));
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Increment and decrement the reference count.
@@ -144,9 +144,9 @@ public:
CORBA::ULong _decr_refcnt (void);
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
protected:
/// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index d6c54e6d063..5e49263fc21 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -2,7 +2,7 @@
// Note: This class controls the behaviour of consumers connected to both
// the Typed and Un-typed Event Channels. A check must be made in the code
-// to ensure the correct EC is referenced.
+// to ensure the correct EC is referenced.
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
@@ -104,7 +104,6 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers (
// Typed EC
this->typed_event_channel_->typed_consumer_admin ()->for_each (&push_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -113,12 +112,10 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers (
// Un-typed EC
this->event_channel_->consumer_admin ()->for_each (&push_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_CEC_Ping_Pull_Consumer pull_worker (this);
this->event_channel_->consumer_admin ()->for_each (&pull_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
}
@@ -216,18 +213,16 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (query)
{
// Query the state of the consumers...
- this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->query_consumers ();
ACE_TRY_CHECK_EX (query);
}
ACE_CATCHANY
@@ -239,11 +234,9 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -263,12 +256,10 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Pre-compute the policy list to the set the right timeout
// value...
@@ -285,7 +276,6 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Only schedule the timer, when the rate is not zero
if (this->rate_ != ACE_Time_Value::zero)
@@ -330,8 +320,7 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
{
ACE_TRY
{
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_supplier ();
if (TAO_debug_level >= 10)
{
@@ -355,8 +344,7 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
{
ACE_TRY
{
- proxy->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_pull_supplier ();
}
ACE_CATCHANY
{
@@ -377,8 +365,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception (
{
if (this->need_to_disconnect (proxy))
{
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_supplier ();
if (TAO_debug_level >= 10)
{
@@ -423,24 +410,20 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
CORBA::Boolean non_existent =
supplier->consumer_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
if (this->control_->need_to_disconnect (supplier))
{
this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -462,24 +445,20 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
CORBA::Boolean non_existent =
supplier->consumer_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
if (this->control_->need_to_disconnect (supplier))
{
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 16f6923d049..2f136c4f597 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -131,7 +131,7 @@ public:
private:
/// Check if the consumers still exists. It is a helper method for
/// handle_timeout() to isolate the exceptions.
- void query_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void query_consumers (void);
private:
/// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index fd58a376e20..955464c9fb7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -58,13 +58,11 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (query)
{
@@ -84,11 +82,9 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -115,12 +111,10 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Pre-compute the policy list to the set the right timeout
// value...
@@ -137,7 +131,6 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -185,7 +178,6 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
{
any = consumer->try_pull_from_supplier (has_event
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -197,7 +189,6 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
if (has_event)
{
this->consumer_admin_->push (any.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index cd355c6c968..b56792be72b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -2,7 +2,7 @@
// Note: This class controls the behaviour of suppliers connected to both
// the Typed and Un-typed Event Channels. A check must be made in the code
-// to ensure the correct EC is referenced.
+// to ensure the correct EC is referenced.
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
@@ -105,7 +105,6 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -115,12 +114,10 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
TAO_CEC_Ping_Push_Supplier push_worker (this);
this->event_channel_->supplier_admin ()->for_each (&push_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_CEC_Ping_Pull_Supplier pull_worker (this);
this->event_channel_->supplier_admin ()->for_each (&pull_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
}
@@ -217,18 +214,16 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (query)
{
// Query the state of the suppliers...
- this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->query_suppliers ();
ACE_TRY_CHECK_EX (query);
}
ACE_CATCHANY
@@ -240,11 +235,9 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -264,12 +257,10 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Pre-compute the policy list to the set the right timeout
// value...
@@ -286,7 +277,6 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Only schedule the timer, when the rate is not zero
if (this->rate_ != ACE_Time_Value::zero)
@@ -331,8 +321,7 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
{
ACE_TRY
{
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -349,8 +338,7 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
{
ACE_TRY
{
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -367,8 +355,7 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
{
ACE_TRY
{
- proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_pull_consumer ();
}
ACE_CATCHANY
{
@@ -387,8 +374,7 @@ TAO_CEC_Reactive_SupplierControl::system_exception (
{
if (this->need_to_disconnect (proxy))
{
- proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_pull_consumer ();
}
}
ACE_CATCHANY
@@ -427,24 +413,20 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
CORBA::Boolean non_existent =
consumer->supplier_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
if (this->control_->need_to_disconnect (consumer))
{
this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -467,24 +449,20 @@ TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer
CORBA::Boolean non_existent =
consumer->supplier_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
if (this->control_->need_to_disconnect (consumer))
{
this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -507,24 +485,20 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
CORBA::Boolean non_existent =
consumer->supplier_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
if (this->control_->need_to_disconnect (consumer))
{
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 da0433e2385..680925267fb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -133,7 +133,7 @@ public:
private:
/// Check if the suppliers still exists. It is a helper method for
/// handle_timeout() to isolate the exceptions.
- void query_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void query_suppliers (void);
private:
/// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 6735b37cf40..a7b094610c1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -31,7 +31,7 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void)
}
PortableServer::POA_ptr
-TAO_CEC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierAdmin::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
@@ -79,27 +79,25 @@ TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer
}
void
-TAO_CEC_SupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::shutdown (void)
{
- this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->push_admin_.shutdown ();
- this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->pull_admin_.shutdown ();
}
CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->push_admin_.obtain ();
}
CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::obtain_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->pull_admin_.obtain ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 7a9b06f4c3c..9880032ad37 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -51,7 +51,7 @@ class TAO_CEC_EventChannel;
* externally.
* = TODO
*/
-class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin
+class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin
: public POA_CosEventChannelAdmin::SupplierAdmin
{
public:
@@ -85,18 +85,18 @@ public:
/// The event channel is shutting down, inform all the consumers of
/// this
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
// = The CosEventChannelAdmin::SupplierAdmin methods...
virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
- obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The PortableServer::ServantBase methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
/// The Event Channel we belong to
@@ -105,11 +105,11 @@ private:
/// The push and pull aspects are implemented using these classes
TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,
TAO_CEC_ProxyPushConsumer,
- CosEventChannelAdmin::ProxyPushConsumer>
+ CosEventChannelAdmin::ProxyPushConsumer>
push_admin_;
TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,
TAO_CEC_ProxyPullConsumer,
- CosEventChannelAdmin::ProxyPullConsumer>
+ CosEventChannelAdmin::ProxyPullConsumer>
pull_admin_;
/// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index eb44b1cbf9f..08b01c76972 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -36,7 +36,6 @@ TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event
this->typed_push_admin_.for_each (&typed_event_worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -61,10 +60,9 @@ TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
}
void
-TAO_CEC_TypedConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::shutdown (void)
{
- this->typed_push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->typed_push_admin_.shutdown ();
}
CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
@@ -93,32 +91,31 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
{
// Register the consumer uses_interface with the EC
int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (result == -1)
{
ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0);
}
- return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->typed_push_admin_.obtain ();
}
CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
PortableServer::POA_ptr
-TAO_CEC_TypedConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedConsumerAdmin::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 6fd7eeb02dd..f5fe7cc752d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -65,7 +65,7 @@ public:
/// The typed event channel is shutting down, inform all the consumers of
/// this
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
// = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
@@ -79,15 +79,15 @@ public:
// = The CosEventChannelAdmin::ConsumerAdmin methods...
virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
- obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The PortableServer::ServantBase methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
/// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index 66c4a913cdd..238ff2bb8b9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -76,7 +76,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void)
}
void
-TAO_CEC_TypedEventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedEventChannel::activate (void)
{
this->dispatching_->activate ();
this->consumer_control_->activate ();
@@ -101,49 +101,38 @@ namespace
}
void
-TAO_CEC_TypedEventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::shutdown (void)
{
this->dispatching_->shutdown ();
this->supplier_control_->shutdown ();
this->consumer_control_->shutdown ();
PortableServer::POA_var typed_consumer_poa =
- this->typed_consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->typed_consumer_admin_->_default_POA ();
PortableServer::ObjectId_var typed_consumer_id =
typed_consumer_poa->servant_to_id (this->typed_consumer_admin_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
typed_consumer_poa->deactivate_object (typed_consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POA_var typed_supplier_poa =
- this->typed_supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->typed_supplier_admin_->_default_POA ();
PortableServer::ObjectId_var typed_supplier_id =
typed_supplier_poa->servant_to_id (this->typed_supplier_admin_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
typed_supplier_poa->deactivate_object (typed_supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->typed_supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->typed_supplier_admin_->shutdown ();
- this->typed_consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->typed_consumer_admin_->shutdown ();
if (destroy_on_shutdown_)
{
// Deactivate the Typed EC
PortableServer::POA_var t_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var t_id =
t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Event_Handler *timer;
ACE_NEW (timer, ShutdownHandler (this->orb_.in ()));
@@ -157,7 +146,6 @@ TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->typed_supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -165,7 +153,6 @@ TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->typed_supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -173,7 +160,6 @@ TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consume
ACE_ENV_ARG_DECL)
{
this->typed_supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -181,7 +167,6 @@ TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->typed_consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -189,7 +174,6 @@ TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->typed_consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -197,7 +181,6 @@ TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->typed_consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Find from the ifr cache the operation and return the parameter array pointer.
@@ -279,12 +262,10 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
// Lookup the Interface Name in the IFR
CORBA::Contained_var contained =
this->interface_repository_->lookup_id (interface_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow the interface
CORBA::InterfaceDef_var interface =
CORBA::InterfaceDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (interface.in () ))
{
@@ -300,8 +281,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
{
// Obtain the full interface description
CORBA::InterfaceDef::FullInterfaceDescription_var fid =
- interface->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ interface->describe_interface ();
// Obtain the base interfaces
this->base_interfaces_ = fid->base_interfaces;
@@ -453,7 +433,6 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
{
// Neither a consumer nor a supplier has connected yet
int result = cache_interface_description (uses_interface ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (result == 0)
{
@@ -517,7 +496,6 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
{
// Neither a consumer nor a supplier has connected yet
int result = cache_interface_description (supported_interface ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (result == 0)
{
@@ -534,7 +512,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper
ACE_ENV_ARG_DECL)
{
this->orb_->create_list (0, new_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
for (CORBA::ULong param=0; param<oper_params->num_params_; param++)
{
@@ -546,7 +523,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper
any_1,
oper_params->parameters_[param].direction_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -557,33 +533,31 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count,
ACE_ENV_ARG_DECL)
{
this->orb_->create_list (count, new_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// The CosTypedEventChannelAdmin::TypedEventChannel methods...
CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-TAO_CEC_TypedEventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->typed_consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->typed_consumer_admin_->_this ();
}
CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-TAO_CEC_TypedEventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->typed_supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->typed_supplier_admin_->_this ();
}
void
-TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (!destroyed_)
{
destroyed_ = 1;
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->shutdown ();
}
}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index dcec1e0713c..9765591afde 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -142,11 +142,11 @@ public:
/// Start the internal threads (if any), etc.
/// After this call the EC can be used.
- virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void activate (void);
/// Shutdown any internal threads, cleanup all the internal
/// structures, flush all the messages, etc.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void shutdown (void);
/// Access the dispatching module....
TAO_CEC_Dispatching* dispatching (void) const;
@@ -255,14 +255,14 @@ public:
// = The CosTypedEventChannelAdmin::TypedEventChannel methods...
virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
ServantRetryMap& get_servant_retry_map (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index d352ff988c9..418a36b24a5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -52,7 +52,6 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer
this->oid_ =
this->default_POA_->activate_object (this->dsi_impl_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
}
@@ -65,7 +64,6 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
ACE_TRY_NEW_ENV {
this->default_POA_->deactivate_object (this->oid_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
}
@@ -86,8 +84,7 @@ TAO_CEC_TypedProxyPushConsumer::activate (
CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result;
ACE_TRY
{
- result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = this->_this ();
}
ACE_CATCHANY
{
@@ -98,19 +95,16 @@ TAO_CEC_TypedProxyPushConsumer::activate (
}
void
-TAO_CEC_TypedProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -132,7 +126,6 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_connected_i () == 0)
@@ -149,14 +142,14 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return supplier->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
}
void
-TAO_CEC_TypedProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::shutdown (void)
{
CosEventComm::PushSupplier_var supplier;
@@ -165,22 +158,19 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
supplier = this->typed_supplier_._retn ();
this->connected_ = 0;
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (supplier.in ()))
return;
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -232,7 +222,6 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -252,10 +241,8 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
TAO_CEC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// What if a second thread connected us after this?
@@ -316,7 +303,6 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
@@ -328,7 +314,6 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
// Notify the event channel...
this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (supplier.in ()))
{
@@ -336,8 +321,7 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
{
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -350,25 +334,25 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
}
PortableServer::POA_ptr
-TAO_CEC_TypedProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedProxyPushConsumer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_CEC_TypedProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedProxyPushConsumer::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_CEC_TypedProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedProxyPushConsumer::_remove_ref (void)
{
this->_decr_refcnt ();
}
CORBA::Object_ptr
-TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 1e4e92bf612..a2c2365d2eb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -56,7 +56,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void deactivate (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -68,7 +68,7 @@ public:
ACE_ENV_ARG_DECL);
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
/// Increment and decrement the reference count.
CORBA::ULong _incr_refcnt (void);
@@ -89,7 +89,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
@@ -99,9 +99,9 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
protected:
// The guard needs access to the following protected methods.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index fe047155c0f..a282e7d3995 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -25,7 +25,7 @@ TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void)
}
PortableServer::POA_ptr
-TAO_CEC_TypedSupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedSupplierAdmin::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
@@ -52,10 +52,9 @@ TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consum
}
void
-TAO_CEC_TypedSupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::shutdown (void)
{
- this->typed_push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->typed_push_admin_.shutdown ();
}
CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
@@ -70,14 +69,13 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
{
int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (result == -1)
{
ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (),0);
}
- return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->typed_push_admin_.obtain ();
}
CosEventChannelAdmin::ProxyPullConsumer_ptr
@@ -95,14 +93,14 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
}
CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index d7c29fb9f81..4d6bfa36941 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -57,7 +57,7 @@ public:
/// The typed event channel is shutting down, inform all the consumers of
/// this
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
// = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
@@ -74,15 +74,15 @@ public:
// = The CosEventChannelAdmin::SupplierAdmin methods...
virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
- obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The PortableServer::ServantBase methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
/// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index ea15a0e703e..fc6a0584a54 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -55,7 +55,6 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
for (PROXY **j = proxies; j != proxies + size; ++j)
{
worker->work (*j ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
(*j)->_decr_refcnt ();
}
delete[] proxies;
@@ -108,11 +107,11 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
- shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ shutdown (void)
{
ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
- this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->collection_.shutdown ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index d5c7c22fcd8..5a761792bcd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -51,7 +51,7 @@ public:
ACE_ENV_ARG_DECL);
virtual void disconnected (PROXY *proxy
ACE_ENV_ARG_DECL);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
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 cd6173e3181..e0fdc79c247 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -78,7 +78,6 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
{
worker->work (*i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -128,7 +127,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
- shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ shutdown (void)
{
// We need to perform a copy to follow the protocol.
Write_Guard ace_mon (this->mutex_,
@@ -137,7 +136,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
this->writing_,
this->collection_);
- ace_mon.copy->collection.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ace_mon.copy->collection.shutdown ();
}
template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index d4a6d9af9c1..e162b5f7c78 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -140,7 +140,7 @@ public:
ACE_ENV_ARG_DECL);
virtual void disconnected (PROXY *proxy
ACE_ENV_ARG_DECL);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
private:
typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 67c61362f21..a1bcf09b8df 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -56,7 +56,6 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
for (ITERATOR i = this->collection_.begin (); i != end; ++i)
{
worker->work (*i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -114,14 +113,12 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
{
ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
proxy->_incr_refcnt ();
if (this->busy_count_ == 0)
{
// We can add the object immediately
this->connected_i (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -141,14 +138,12 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
{
ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
proxy->_incr_refcnt ();
if (this->busy_count_ == 0)
{
// We can reconnect the object immediately
this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -168,13 +163,11 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
{
ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
if (this->busy_count_ == 0)
{
// We can remove the object immediately
this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -189,17 +182,15 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
- shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ shutdown (void)
{
ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
if (this->busy_count_ == 0)
{
// We can shutdown the object immediately
- this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->shutdown_i ();
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 350f756867e..ae0b28f92c3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -101,7 +101,7 @@ public:
ACE_ENV_ARG_DECL);
void disconnected_i (PROXY *proxy
ACE_ENV_ARG_DECL);
- void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown_i (void);
typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -117,7 +117,7 @@ public:
ACE_ENV_ARG_DECL);
virtual void disconnected (PROXY *proxy
ACE_ENV_ARG_DECL);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
private:
COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index 4a2192e5a18..bf723bce96e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -30,9 +30,9 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
- shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
+ shutdown_i (void)
{
- this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->collection_.shutdown ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index e47522719c4..1ef85a18da8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -82,12 +82,12 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
{
ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
*static_cast<CORBA::Environment*> (arg));
- this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->target_->shutdown_i ();
}
else
{
ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
- this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->target_->shutdown_i ();
}
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index ff3e7daa3c4..5fbe626a794 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -40,7 +40,6 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
for (ITERATOR i = this->collection_.begin (); i != end; ++i)
{
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 574f6f559db..c8eb2a844fd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -42,7 +42,7 @@ public:
ACE_ENV_ARG_DECL);
virtual void disconnected (PROXY *proxy
ACE_ENV_ARG_DECL);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
private:
COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index ac26e4d5800..849b2827a91 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -38,11 +38,11 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
- shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ shutdown (void)
{
ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
- this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->collection_.shutdown ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index 7016971b2f3..b57ad33fed6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -16,10 +16,10 @@ TAO_ESF_Peer_Connected<P,R>::work (P *proxy
ACE_ENV_ARG_DECL)
{
proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
}
// ****************************************************************
@@ -29,10 +29,10 @@ TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
ACE_ENV_ARG_DECL)
{
proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
}
// ****************************************************************
@@ -42,10 +42,10 @@ TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
ACE_ENV_ARG_DECL)
{
proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Shouldn't happen, just following the discipline
+// Shouldn't happen, just following the discipline
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 68407b8a0ea..5ea8f3bc1b6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -28,7 +28,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
- obtain (ACE_ENV_SINGLE_ARG_DECL)
+ obtain (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PROXY* proxy;
@@ -38,27 +38,25 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
ACE_TYPENAME PROXY::_ptr_type r;
proxy->activate (r ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (INTERFACE::_nil ());
ACE_TYPENAME PROXY::_var_type result = r;
this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (INTERFACE::_nil ());
return result._retn ();
}
template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
- shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_ESF_Shutdown_Proxy<PROXY> worker;
this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
- ACE_CHECK; // Cannot happen, just following the discipline.
+// Cannot happen, just following the discipline.
- this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->collection_->shutdown ();
}
template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
@@ -84,13 +82,12 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK; // Cannot happen, just following the discipline.
+ proxy->deactivate ();
+// Cannot happen, just following the discipline.
ACE_TRY
{
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 e42104dae90..0833c214e0f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -56,7 +56,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
* // The T_var for the IDL interface implemented by the PROXY.
*
* PROXY::_ptr_type
- * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
+ * PROXY::activate (void) throw ();
* // activate the proxy and return the object reference
* @endverbatim
*
@@ -83,7 +83,7 @@ public:
// code is supposed to run under TAO only.
/// Create a new PROXY and activate it.
virtual INTERFACE*
- obtain (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -91,7 +91,7 @@ public:
* down. Invoke <shutdown> on all the proxies, cleanup the
* collection and prepare to terminate.
*/
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index ceaeda03db0..61beba4d15b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -155,7 +155,7 @@ public:
ACE_ENV_ARG_DECL) = 0;
/// The EC is shutting down, must release all the elements.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void shutdown (void) = 0;
};
// ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index 3b9a49c729c..fe6d5c67822 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -77,7 +77,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
}
template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::shutdown (void)
{
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 a50358146d3..e3e03ba24e4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -64,7 +64,7 @@ public:
/// Shutdown the collection, i.e. remove all elements and release
/// resources
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void shutdown (void);
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 f3bcdaa5a6b..bd765ad36bd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -75,7 +75,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
}
template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (void)
{
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 34a4fe9522e..92eba90b814 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -90,7 +90,7 @@ public:
/// Shutdown the collection, i.e. remove all elements and release
/// resources
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void shutdown (void);
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 e7347443f4c..884bddb37ca 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -18,8 +18,7 @@ TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
{
ACE_TRY
{
- proxy->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->shutdown ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 092af3fa7f8..018a572fab2 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -48,8 +48,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
ACE_TRY_NEW_ENV
{
- corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ corba_type = type->kind ();
}
ACE_CATCHANY
{
@@ -331,18 +330,15 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
ACE_TRY_NEW_ENV
{
- kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ kind = type->kind ();
CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (type);
while (kind == CORBA::tk_alias)
{
- tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tmp = tmp->content_type ();
- kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ kind = tmp->kind ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 7ab74bdf599..e6d4dc1ef33 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -101,7 +101,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iov,
iovcnt
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
++fragment_id;
fragment_offset += max_fragment_payload;
@@ -129,7 +128,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iov,
iovcnt
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
++fragment_id;
fragment_offset += max_fragment_payload;
@@ -150,7 +148,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iov,
iovcnt
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
++fragment_id;
fragment_offset += fragment_size;
@@ -174,7 +171,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr,
iov,
iovcnt
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
++fragment_id;
fragment_offset += fragment_size;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 3c22ae7efb4..140195dbe5e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -99,7 +99,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Shutdown this component. Frees up the endpoint.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
//@}
/// Setters/getters.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
index aa1242d07fe..f754037692f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
@@ -15,7 +15,7 @@ TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc)
}
ACE_INLINE void
-TAO_ECG_CDR_Message_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ECG_CDR_Message_Sender::shutdown (void)
{
// Release the endpoint.
TAO_ECG_Refcounted_Endpoint empty_endpoint_rptr;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 9c4851c70c1..c2126149284 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -64,20 +64,17 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
TAO_EC_Object_Deactivator observer_deactivator;
RtecEventChannelAdmin::Observer_var observer_ref;
PortableServer::POA_var poa =
- this->observer_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->observer_->_default_POA ();
activate (observer_ref,
poa.in (),
this->observer_.in (),
observer_deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecEventChannelAdmin::Observer_Handle handle =
ec->append_observer (observer_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_->set_deactivator (observer_deactivator);
this->auto_observer_disconnect_.set_command
@@ -145,7 +142,6 @@ TAO_ECG_Mcast_EH::update_consumer (
this->compute_required_subscriptions (sub,
multicast_addresses
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->delete_unwanted_subscriptions (multicast_addresses);
@@ -171,7 +167,6 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions (
RtecUDPAdmin::UDP_Addr addr;
this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
// Ignore errors, if the element is in the set we simply ignore
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 79393ced36c..d28b3419ee5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -220,7 +220,7 @@ private:
Observer_Disconnect_Command (const Observer_Disconnect_Command &rhs);
Observer_Disconnect_Command & operator= (const Observer_Disconnect_Command & rhs);
- void execute (ACE_ENV_SINGLE_ARG_DECL);
+ void execute (void);
private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
index 587c2721944..2964653c55d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
@@ -45,7 +45,7 @@ Observer_Disconnect_Command::operator= (
ACE_INLINE void
TAO_ECG_Mcast_EH::
-Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+Observer_Disconnect_Command::execute (void)
{
if (CORBA::is_nil (this->ec_.in ()))
// We are not connected.
@@ -55,7 +55,6 @@ Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
this->ec_._retn ();
release_ec->remove_observer (this->handle_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
//***************************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index fc88ebf5ee9..a599a828479 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -451,7 +451,6 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
h->reactor (reactor);
h->open (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO_ECG_Refcounted_Handler ());
}
else if (this->handler_type_ == ECG_HANDLER_UDP)
@@ -502,7 +501,6 @@ TAO_ECG_Mcast_Gateway::init_sender (
address_server,
endpoint_rptr
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> ());
TAO_EC_Auto_Command<UDP_Sender_Shutdown> sender_shutdown;
sender_shutdown.set_command (UDP_Sender_Shutdown (sender));
@@ -512,7 +510,6 @@ TAO_ECG_Mcast_Gateway::init_sender (
// Client supplied consumer qos. Use it.
this->consumer_qos_.is_gateway = 1;
sender->connect (this->consumer_qos_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> ());
}
else
{
@@ -527,7 +524,6 @@ TAO_ECG_Mcast_Gateway::init_sender (
qos.is_gateway = 1;
sender->connect (qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> ());
}
sender_shutdown.disallow_command ();
@@ -550,7 +546,6 @@ TAO_ECG_Mcast_Gateway::init_receiver (
endpoint_rptr,
address_server
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> ());
TAO_EC_Auto_Command<UDP_Receiver_Shutdown> receiver_shutdown;
receiver_shutdown.set_command (UDP_Receiver_Shutdown (receiver));
@@ -564,7 +559,6 @@ TAO_ECG_Mcast_Gateway::init_receiver (
qos.is_gateway = 1;
receiver->connect (qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> ());
receiver_shutdown.disallow_command ();
return receiver;
@@ -598,7 +592,6 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
{
// Verify args.
this->verify_args (orb, ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Auto-cleanup objects.
TAO_EC_Object_Deactivator address_server_deactivator;
@@ -618,15 +611,13 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
RtecUDPAdmin::AddrServer_var address_server;
PortableServer::POA_var poa =
- address_server_servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ address_server_servant->_default_POA ();
activate (address_server,
poa.in (),
address_server_servant.in (),
address_server_deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_ECG_Refcounted_Endpoint endpoint_rptr;
TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender;
@@ -645,7 +636,6 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
address_server.in (),
endpoint_rptr
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!sender.in ())
{
ACE_THROW (CORBA::INTERNAL ());
@@ -665,7 +655,6 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
address_server.in (),
endpoint_rptr
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!receiver.in ())
{
ACE_THROW (CORBA::INTERNAL ());
@@ -678,7 +667,6 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
ec,
reactor
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
if (handler_rptr.get () == 0)
{
ACE_THROW (CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 0906d59820f..36c4bd1f7cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -43,17 +43,14 @@ TAO_ECG_Reactive_ConsumerEC_Control::query_eventchannel (
CORBA::Boolean non_existent =
gateway_->consumer_ec_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
@@ -61,7 +58,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::query_eventchannel (
// want to be more lenient in the future..
// if (transient.minor () == 0x54410085)
this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -91,26 +87,21 @@ TAO_ECG_Reactive_ConsumerEC_Control::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Query the state of the consumers...
- this->query_eventchannel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->query_eventchannel ();
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -130,12 +121,10 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Timeout for polling state (default = 10 msec)
TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -148,7 +137,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Only schedule the timer, when the rate is not zero
if (this->rate_ != ACE_Time_Value::zero)
@@ -199,8 +187,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist (
"channel %x does not exists\n"));
gateway->cleanup_consumer_ec ();
- gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway->cleanup_consumer_proxies ();
}
ACE_CATCHANY
@@ -222,8 +209,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::system_exception (
{
gateway->cleanup_consumer_ec ();
- gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway->cleanup_consumer_proxies ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index e7ccad73c2a..06a75e2f5a5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -93,7 +93,7 @@ public:
private:
/// Check if the consumers still exists. It is a helper method for
/// handle_timeout() to isolate the exceptions.
- void query_eventchannel (ACE_ENV_SINGLE_ARG_DECL);
+ void query_eventchannel (void);
private:
/// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 2e14b4da681..6a995f35dc5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -43,11 +43,9 @@ TAO_ECG_Reconnect_ConsumerEC_Control::try_reconnect (
CORBA::Boolean non_existent =
gateway_->consumer_ec_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!non_existent)
{
- this->reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->reconnect();
}
}
ACE_CATCHANY
@@ -65,8 +63,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::reconnect (
{
is_consumer_ec_connected_ = 1;
- gateway_->reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway_->reconnect_consumer_ec();
}
ACE_CATCHANY
{
@@ -87,23 +84,19 @@ TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel (
CORBA::Boolean non_existent =
gateway_->consumer_ec_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
else
{
- this->try_reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->try_reconnect();
}
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
@@ -111,7 +104,6 @@ TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel (
// want to be more lenient in the future..
// if (transient.minor () == 0x54410085)
this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -140,26 +132,21 @@ TAO_ECG_Reconnect_ConsumerEC_Control::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Query the state of the consumers...
- this->query_eventchannel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->query_eventchannel ();
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -179,12 +166,10 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Timeout for polling state (default = 10 msec)
TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -197,7 +182,6 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Only schedule the timer, when the rate is not zero
if (this->rate_ != ACE_Time_Value::zero)
@@ -248,11 +232,9 @@ TAO_ECG_Reconnect_ConsumerEC_Control::event_channel_not_exist (
// "channel %x does not exists\n"));
is_consumer_ec_connected_ = 0;
- gateway->suspend_supplier_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway->suspend_supplier_ec ();
- gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway->cleanup_consumer_proxies ();
}
ACE_CATCHANY
{
@@ -286,11 +268,9 @@ TAO_ECG_Reconnect_ConsumerEC_Control::system_exception (
// "channel %x does not exists system except\n"));
is_consumer_ec_connected_ = 0;
- gateway->suspend_supplier_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway->suspend_supplier_ec ();
- gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway->cleanup_consumer_proxies ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index b1f4a6c2987..1bb9a0bef76 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -98,13 +98,13 @@ public:
private:
/// Check if the consumers still exists. It is a helper method for
/// handle_timeout() to isolate the exceptions.
- void query_eventchannel (ACE_ENV_SINGLE_ARG_DECL);
+ void query_eventchannel (void);
/// Look if we can reconnect again.
- void try_reconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void try_reconnect (void);
/// Reconnect to the consumer ec.
- void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void reconnect (void);
private:
/// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 1d903fdeb2b..8148250d41e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -75,12 +75,10 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
if (CORBA::is_nil (this->consumer_proxy_.in ()))
{
this->new_connect (pub ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
this->reconnect (pub ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -98,22 +96,18 @@ TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
this,
deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Connect as a supplier to the local EC.
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->lcl_ec_->for_suppliers ();
RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
ECG_Receiver_Auto_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
proxy->connect_push_supplier (supplier_ref.in (),
pub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update resource managers.
this->consumer_proxy_ = proxy._retn ();
@@ -130,10 +124,8 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub
PortableServer::POA_var poa = this->_default_POA ();
CORBA::Object_var obj = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_ref =
RtecEventComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (supplier_ref.in ()))
{
@@ -144,21 +136,20 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub
this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
pub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_ECG_UDP_Receiver::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Receiver::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Prevent attempts to disconnect.
this->auto_proxy_disconnect_.disallow_command ();
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->shutdown ();
}
void
-TAO_ECG_UDP_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ECG_UDP_Receiver::shutdown (void)
{
if (this->handler_rptr_.get ())
this->handler_rptr_->shutdown ();
@@ -210,8 +201,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
"TAO_ECG_UDP_Receiver::handle_input() "
"called but the Receiver is not connected "
"to an event channel. Shutting down the Receiver.\n"));
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->shutdown ();
return 0;
}
@@ -233,7 +223,6 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
}
this->consumer_proxy_->push (cdr_decoder.events ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 4d8002aa862..29909831f89 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -83,7 +83,7 @@ public:
TAO_ECG_UDP_Receiver_Disconnect_Command &
operator= (const TAO_ECG_UDP_Receiver_Disconnect_Command & rhs);
- void execute (ACE_ENV_SINGLE_ARG_DECL);
+ void execute (void);
private:
@@ -161,7 +161,7 @@ public:
* result in decrementing of the reference count (due to
* deactivation) and deletion of the object.
*/
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
//@}
/// Accessor.
@@ -174,7 +174,7 @@ public:
/// The PushSupplier idl method.
/// Invokes shutdown (), which may result in the object being deleted, if
/// refcounting is used to manage its lifetime.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// TAO_ECG_Dgram_Handler method.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index 47eb3d83958..5b11edc393c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
@@ -41,7 +41,7 @@ TAO_ECG_UDP_Receiver_Disconnect_Command::operator= (
ACE_INLINE void
TAO_ECG_UDP_Receiver_Disconnect_Command::
-execute (ACE_ENV_SINGLE_ARG_DECL)
+execute (void)
{
if (CORBA::is_nil (this->proxy_.in ()))
// We are not connected.
@@ -50,8 +50,7 @@ execute (ACE_ENV_SINGLE_ARG_DECL)
RtecEventChannelAdmin::ProxyPushConsumer_var release_proxy =
this->proxy_._retn ();
- release_proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ release_proxy->disconnect_push_consumer ();
}
//***************************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index 2cfc4b5f35f..2db287e18af 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -50,7 +50,6 @@ TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
}
this->cdr_sender_.init (endpoint_rptr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->lcl_ec_ =
RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
@@ -80,12 +79,10 @@ TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub
if (CORBA::is_nil (this->supplier_proxy_.in ()))
{
this->new_connect (sub ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
this->reconnect (sub ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -103,22 +100,18 @@ TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
this,
deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Connect as a consumer to the local EC.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->lcl_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->lcl_ec_->for_consumers ();
RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
ECG_Sender_Auto_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
proxy->connect_push_consumer (consumer_ref.in (),
sub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update resource managers.
this->supplier_proxy_ = proxy._retn ();
@@ -135,10 +128,8 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub
PortableServer::POA_var poa = this->_default_POA ();
CORBA::Object_var obj = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_ref =
RtecEventComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (consumer_ref.in ()))
{
@@ -149,21 +140,20 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub
this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
sub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_ECG_UDP_Sender::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Prevent attempts to disconnect.
this->auto_proxy_disconnect_.disallow_command ();
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->shutdown ();
}
void
-TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender::shutdown (void)
{
this->supplier_proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -174,8 +164,7 @@ TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
this->deactivator_.deactivate ();
- this->cdr_sender_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->cdr_sender_.shutdown ();
}
void
@@ -223,13 +212,11 @@ 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 (header, udp_addr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_INET_Addr inet_addr (udp_addr.port,
udp_addr.ipaddr);
this->cdr_sender_.send_message (cdr, inet_addr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 6210db74d1d..6ad39c52b89 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -83,7 +83,7 @@ public:
TAO_ECG_UDP_Sender_Disconnect_Command &
operator= (const TAO_ECG_UDP_Sender_Disconnect_Command & rhs);
- void execute (ACE_ENV_SINGLE_ARG_DECL);
+ void execute (void);
private:
@@ -154,7 +154,7 @@ public:
* Calling this method may result in decrementing of the reference
* count (due to deactivation) and deletion of the object.
*/
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
//@}
/// Accessors.
@@ -176,7 +176,7 @@ public:
//@{
/// Invokes shutdown (), which may result in the object being deleted, if
/// refcounting is used to manage its lifetime.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void push (const RtecEventComm::EventSet &events
ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index c58a7a81ca8..db0e235abbd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -80,7 +80,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::operator= (
}
ACE_INLINE void
-TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender_Disconnect_Command::execute (void)
{
if (CORBA::is_nil (this->proxy_.in ()))
// We are not connected.
@@ -89,8 +89,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
RtecEventChannelAdmin::ProxyPushSupplier_var release_proxy =
this->proxy_._retn ();
- release_proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ release_proxy->disconnect_push_supplier ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 715979d31a9..7a01d634e15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -62,7 +62,6 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
for (ChildrenIterator i = this->begin (); i != end; ++i)
{
int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (n == 0)
return 0;
}
@@ -71,7 +70,6 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
if (this->parent () != 0)
{
this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return 1;
@@ -86,7 +84,6 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
for (ChildrenIterator i = this->begin (); i != end; ++i)
{
int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (n == 0)
return 0;
}
@@ -95,7 +92,6 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
if (this->parent () != 0)
{
this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return 1;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
index 3759342a5e9..cdceb92356d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -18,8 +18,7 @@ TAO_EC_Channel_Destroyer_Functor::operator() (
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
}
ACE_CATCHALL
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index e8fae3ae659..22412e08276 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -89,7 +89,6 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
++this->current_child_)
{
int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (n != 0)
return n;
}
@@ -107,7 +106,6 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
++i)
{
int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (n != 0)
return n;
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 73bf25fff47..d12e6b6fb52 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 (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ConsumerAdmin::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->obtain ();
}
PortableServer::POA_ptr
-TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ConsumerAdmin::_default_POA (void)
{
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 60e45de355a..c6804bd5dcb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -63,11 +63,11 @@ public:
// = The RtecEventChannelAdmin::ConsumerAdmin methods...
virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The PortableServer::ServantBase methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
/// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index e3bca47a2d0..01b3cd76bdb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -35,7 +35,6 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -55,10 +54,8 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
TAO_EC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// A separate thread could have connected siomultaneously,
@@ -101,7 +98,6 @@ TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
ace_mon.filter->push (event, this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -117,7 +113,6 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
connected = this->is_connected_i ();
supplier = this->supplier_._retn ();
@@ -129,7 +124,6 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
// Notify the event channel...
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (supplier.in ()))
{
@@ -140,8 +134,7 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
{
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -153,19 +146,19 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
}
PortableServer::POA_ptr
-TAO_EC_Default_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushConsumer::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_EC_Default_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushConsumer::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_EC_Default_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushConsumer::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -176,12 +169,11 @@ TAO_EC_Default_ProxyPushConsumer::activate (
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- proxy = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy = this->_this ();
}
PortableServer::ObjectId
-TAO_EC_Default_ProxyPushConsumer::object_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushConsumer::object_id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ObjectId_var result =
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index e08d7d4c092..2afe9080b4f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -63,18 +63,18 @@ public:
virtual void push (const RtecEventComm::EventSet& event
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
private:
virtual PortableServer::ObjectId
- object_id (ACE_ENV_SINGLE_ARG_DECL)
+ object_id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index a431afb219f..04fe2aee46b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -43,7 +43,6 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i ())
{
@@ -60,7 +59,6 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
this->event_channel_->filter_builder ()->build (this,
this->qos_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->adopt_child (this->child_);
@@ -71,10 +69,8 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
TAO_EC_Unlock, ace_mon, reverse_lock,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// A separate thread could have connected simultaneously,
@@ -91,7 +87,6 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
CORBA::PolicyList_var unused;
int status = push_consumer->_validate_connection (unused
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if TAO_EC_ENABLE_DEBUG_MESSAGES
ACE_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status));
#else
@@ -113,7 +108,6 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
this->event_channel_->filter_builder ()->build (this,
this->qos_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->adopt_child (this->child_);
}
@@ -135,7 +129,6 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
connected = this->is_connected_i ();
consumer = this->consumer_._retn ();
@@ -146,7 +139,6 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
// Notify the event channel....
this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!connected)
{
@@ -157,8 +149,7 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
{
ACE_TRY
{
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -172,35 +163,33 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
}
void
-TAO_EC_Default_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::suspend_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->suspend_connection_locked (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suspend_connection_locked ();
}
void
-TAO_EC_Default_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::resume_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->resume_connection_locked (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->resume_connection_locked ();
}
PortableServer::POA_ptr
-TAO_EC_Default_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushSupplier::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_EC_Default_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushSupplier::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_EC_Default_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushSupplier::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -211,12 +200,11 @@ TAO_EC_Default_ProxyPushSupplier::activate (
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- proxy = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy = this->_this ();
}
PortableServer::ObjectId
-TAO_EC_Default_ProxyPushSupplier::object_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::object_id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ObjectId_var result =
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index ae59254ea93..5bdcc4453b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -56,22 +56,22 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
RtecEventChannelAdmin::AlreadyConnected,
RtecEventChannelAdmin::TypeError));
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void suspend_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void resume_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The Servant methods
- 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);
+ virtual PortableServer::POA_ptr _default_POA (void);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
private:
virtual PortableServer::ObjectId
- object_id (ACE_ENV_SINGLE_ARG_DECL)
+ object_id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 9016401e2f4..82ae4e97f2b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -65,7 +65,6 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
++i)
{
int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (n != 0)
return n;
}
@@ -83,7 +82,6 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
++i)
{
int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (n != 0)
return n;
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 0dcbf675bd9..f06a5e0cfe1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -122,8 +122,7 @@ TAO_EC_Dispatching_Task::svc (void)
continue;
}
- int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int result = command->execute ();
ACE_Message_Block::release (mb);
@@ -152,7 +151,6 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
this->queue_full_service_object_->queue_full_action (this, proxy,
consumer, event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (action == TAO_EC_Queue_Full_Service_Object::SILENTLY_DISCARD)
return;
@@ -186,7 +184,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void)
// ****************************************************************
int
-TAO_EC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Shutdown_Task_Command::execute (void)
{
return -1;
}
@@ -199,7 +197,7 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void)
}
int
-TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Push_Command::execute (void)
{
this->proxy_->push_to_consumer (this->consumer_.in (),
this->event_
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 3fcdc312679..b8aa758449f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -141,7 +141,7 @@ public:
virtual ~TAO_EC_Dispatch_Command (void);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+ virtual int execute (void) = 0;
};
// ****************************************************************
@@ -153,7 +153,7 @@ public:
TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual int execute (void);
};
// ****************************************************************
@@ -172,7 +172,7 @@ public:
virtual ~TAO_EC_Push_Command (void);
/// Command callback
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual int execute (void);
private:
/// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index b10f5168dda..3b78da8ed16 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -109,7 +109,7 @@ TAO_EC_Event_Channel_Base::create_strategies (void)
}
void
-TAO_EC_Event_Channel_Base::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Event_Channel_Base::activate (void)
{
{
// First check if the EC is idle, if it is not then we need to
@@ -133,7 +133,7 @@ TAO_EC_Event_Channel_Base::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_EC_Event_Channel_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::shutdown (void)
{
{
// First check if the EC is already active, if it is not then we
@@ -151,11 +151,9 @@ TAO_EC_Event_Channel_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->deactivate_supplier_admin ();
this->deactivate_consumer_admin ();
- this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_admin_->shutdown ();
- this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->shutdown ();
{
// Wait until all the shutdown() operations return before marking
@@ -173,13 +171,10 @@ TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void)
ACE_TRY
{
PortableServer::POA_var supplier_poa =
- this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->supplier_admin_->_default_POA ();
PortableServer::ObjectId_var supplier_id =
supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -194,13 +189,10 @@ TAO_EC_Event_Channel_Base::deactivate_consumer_admin (void)
ACE_TRY_NEW_ENV
{
PortableServer::POA_var consumer_poa =
- this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumer_admin_->_default_POA ();
PortableServer::ObjectId_var consumer_id =
consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -214,11 +206,8 @@ TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -226,11 +215,8 @@ TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -238,11 +224,8 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushConsumer* consumer
ACE_ENV_ARG_DECL)
{
this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -250,11 +233,8 @@ TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -262,11 +242,8 @@ TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -274,32 +251,29 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL)
{
this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EC_Event_Channel_Base::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->consumer_admin_->_this ();
}
RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_EC_Event_Channel_Base::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->supplier_admin_->_this ();
}
void
-TAO_EC_Event_Channel_Base::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->shutdown ();
}
RtecEventChannelAdmin::Observer_Handle
@@ -336,7 +310,6 @@ TAO_EC_Event_Channel_Base::for_each_consumer (
{
this->consumer_admin_->for_each (worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -347,7 +320,6 @@ TAO_EC_Event_Channel_Base::for_each_supplier (
{
this->supplier_admin_->for_each (worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 9027e64de4a..4b4bfa75f9d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -116,11 +116,11 @@ public:
/// Start the internal threads (if any), etc.
/// After this call the EC can be used.
- virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void activate (void);
/// Shutdown any internal threads, cleanup all the internal
/// structures, flush all the messages, etc.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void shutdown (void);
virtual void for_each_consumer (
TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker
@@ -227,19 +227,19 @@ public:
// = The RtecEventChannelAdmin::EventChannel methods...
/// The default implementation is:
- /// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ /// this->consumer_admin ()->_this ();
virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// The default implementation is:
- /// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ /// this->supplier_admin ()->_this ();
virtual RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Commit suicide.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::Observer_Handle
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index b8c32a6ad68..260e65786a7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -62,7 +62,6 @@ TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event,
// This is a leaf, no need to query any children, and we accept all
// events, so push it.
this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
@@ -74,7 +73,6 @@ TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event,
// This is a leaf, no need to query any children, and we accept all
// events, so push it.
this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 965e6a9daf6..4553477035d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -54,7 +54,7 @@ public:
/// The gateway must disconnect from all the relevant event channels,
/// or any other communication media (such as multicast groups).
- virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+ virtual void close (void) = 0;
/// Obtain and modify the observer handle.
void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index cf58d8cbd06..f4c1c343c21 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -97,15 +97,15 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec
}
void
-TAO_EC_Gateway_IIOP::close (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::close (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
- this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->close_i ();
}
void
-TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -116,22 +116,20 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_DECL)
return;
}
- this->cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->cleanup_consumer_proxies_i ();
}
void
-TAO_EC_Gateway_IIOP::close_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::close_i (void)
{
// ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
- this->disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_consumer_proxies_i ();
- this->disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_supplier_proxy_i ();
}
void
-TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void)
{
if (this->consumer_proxy_map_.current_size () > 0)
{
@@ -144,8 +142,7 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
continue;
ACE_TRY
{
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -160,8 +157,7 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
if (!CORBA::is_nil (this->default_consumer_proxy_.in ()))
{
- this->default_consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->default_consumer_proxy_->disconnect_push_consumer ();
this->default_consumer_proxy_ =
RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -169,12 +165,11 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void)
{
if (!CORBA::is_nil (this->supplier_proxy_.in ()))
{
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
this->supplier_proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -182,7 +177,7 @@ TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_EC_Gateway_IIOP::reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -218,7 +213,7 @@ TAO_EC_Gateway_IIOP::update_consumer (
}
void
-TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (void)
{
if (this->consumer_proxy_map_.current_size () > 0)
{
@@ -249,8 +244,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
const RtecEventChannelAdmin::ConsumerQOS& c_qos
ACE_ENV_ARG_DECL)
{
- this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->close_i ();
if (CORBA::is_nil (this->consumer_ec_.in ())
|| CORBA::is_nil (this->supplier_ec_.in ()))
@@ -259,7 +253,6 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
// ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i \n"));
this->open_i (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -269,8 +262,7 @@ TAO_EC_Gateway_IIOP::open_i (
{
// = Connect as a supplier to the consumer EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->consumer_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_ec_->for_suppliers ();
RtecEventChannelAdmin::ConsumerQOS sub = c_qos;
sub.is_gateway = 1;
@@ -307,8 +299,7 @@ TAO_EC_Gateway_IIOP::open_i (
//ACE_DEBUG ((LM_DEBUG,
// "ECG (%t) binding source %d\n",
// sid));
- proxy = supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy = supplier_admin->obtain_push_consumer ();
this->consumer_proxy_map_.bind (sid, proxy);
}
}
@@ -322,8 +313,7 @@ TAO_EC_Gateway_IIOP::open_i (
// Obtain a reference to our supplier personality...
RtecEventComm::PushSupplier_var supplier_ref =
- this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_._this ();
// For each subscription by source build the set of publications
// (they may several, by type, for instance) and connect to the
@@ -367,7 +357,6 @@ TAO_EC_Gateway_IIOP::open_i (
(*j).int_id_->connect_push_supplier (supplier_ref.in (),
pub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -407,13 +396,11 @@ TAO_EC_Gateway_IIOP::open_i (
// Obtain a reference to our supplier personality...
RtecEventComm::PushSupplier_var supplier_ref =
- this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_._this ();
// Obtain the consumer....
this->default_consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
pub.publications.length (c);
// ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
@@ -421,21 +408,17 @@ TAO_EC_Gateway_IIOP::open_i (
this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (),
pub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->supplier_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_ec_->for_consumers ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
this->consumer_is_active_ = 1;
RtecEventComm::PushConsumer_var consumer_ref =
- this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_._this ();
// ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer "));
// ACE_ConsumerQOS_Factory::debug (sub);
@@ -443,7 +426,6 @@ TAO_EC_Gateway_IIOP::open_i (
this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
sub
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -456,7 +438,7 @@ TAO_EC_Gateway_IIOP::update_supplier (
}
void
-TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::disconnect_push_consumer (void)
{
// ACE_DEBUG ((LM_DEBUG,
// "ECG (%t): Supplier-consumer received "
@@ -464,7 +446,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::disconnect_push_supplier (void)
{
// ACE_DEBUG ((LM_DEBUG,
// "ECG (%t): Supplier received "
@@ -523,7 +505,6 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
// ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n"));
this->push_to_consumer(proxy, out ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
{
@@ -534,15 +515,13 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
if (this->busy_count_ == 0 && this->cleanup_posted_ != 0)
{
this->cleanup_posted_ = 0;
- this->cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->cleanup_consumer_proxies_i ();
}
if (this->busy_count_ == 0 && this->update_posted_ != 0)
{
this->update_posted_ = 0;
this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -556,19 +535,16 @@ TAO_EC_Gateway_IIOP::push_to_consumer (
ACE_TRY
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
{
ec_control_->event_channel_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
ec_control_->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -578,38 +554,31 @@ TAO_EC_Gateway_IIOP::push_to_consumer (
}
int
-TAO_EC_Gateway_IIOP::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::shutdown (void)
{
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
ec_control_->shutdown();
- this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->close_i ();
if (this->supplier_is_active_)
{
PortableServer::POA_var poa =
- this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->supplier_._default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->supplier_is_active_ = 0;
}
if (this->consumer_is_active_)
{
PortableServer::POA_var poa =
- this->consumer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->consumer_._default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->consumer_is_active_ = 0;
}
@@ -669,7 +638,6 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
ACE_GUARD_THROW_EX (
TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_consumer_ec_connected_i () == 0)
@@ -682,31 +650,29 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return consumer_ec->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_ec->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
}
void
-TAO_EC_Gateway_IIOP::suspend_supplier_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::suspend_supplier_ec (void)
{
if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 0)
{
- this->supplier_proxy_->suspend_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->suspend_connection ();
supplier_ec_suspended_ = 1;
}
}
void
-TAO_EC_Gateway_IIOP::resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::resume_supplier_ec (void)
{
if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 1)
{
- this->supplier_proxy_->resume_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->resume_connection ();
supplier_ec_suspended_ = 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 6f957042c3a..38405741d13 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -78,10 +78,10 @@ public:
ACE_ENV_ARG_DECL);
/// The channel is disconnecting.
- void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void disconnect_push_supplier (void);
/// The channel is disconnecting.
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void disconnect_push_consumer (void);
/// This is the consumer side behavior, it pushes the events to the
/// local event channel.
@@ -89,10 +89,10 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Disconnect and shutdown the gateway
- int shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int shutdown (void);
// The following methods are documented in the base class.
- virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void close (void);
virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
@@ -101,7 +101,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Let the gateway reconnect itself to the consumer ec given exisiting QoS
- void reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_DECL);
+ void reconnect_consumer_ec(void);
/// Check whether the consumer event channel is non existent or not
CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected
@@ -113,7 +113,7 @@ public:
* the consumer proxy administration in case we know that the consumers
* are all unreachable.
*/
- void cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_DECL);
+ void cleanup_consumer_proxies (void);
/// Cleanup the connection to the consumer ec. Doesn't call anything on the
/// ec again, just set the object to nil
@@ -124,22 +124,22 @@ public:
int cleanup_supplier_ec (void);
/// Suspend the connection to the supplier ec
- void suspend_supplier_ec (ACE_ENV_SINGLE_ARG_DECL);
+ void suspend_supplier_ec (void);
/// Resume the connection to the supplier ec
- void resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL);
+ void resume_supplier_ec (void);
private:
- void close_i (ACE_ENV_SINGLE_ARG_DECL);
+ void close_i (void);
/// Disconnect the supplier proxy
- void disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_supplier_proxy_i (void);
/// Disconnect all consumer proxies
- void disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_consumer_proxies_i (void);
/// Remove all consumer proxies without calling disconnect on them
- void cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL);
+ void cleanup_consumer_proxies_i (void);
void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub
ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 1b1a0d4479e..0e90d510031 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/Event/EC_Gateway_Sched.h"
#include "orbsvcs/Time_Utilities.h"
-ACE_RCSID (Event,
- EC_Gateway_sched,
+ACE_RCSID (Event,
+ EC_Gateway_sched,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -30,7 +30,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
this->init_i (supplier_ec, consumer_ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ Should we throw a system exception here?
if (CORBA::is_nil (supplier_sched)
@@ -41,7 +40,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
this->supplier_info_ =
supplier_sched->create (supplier_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ TODO Many things are hard-coded in the RT_Info here.
@@ -59,11 +57,9 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_info_ =
consumer_sched->create (consumer_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
tv = ACE_Time_Value (0, 500);
ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
@@ -76,7 +72,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
1,
RtecScheduler::REMOTE_DEPENDANT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 7c20f6e0c66..b6a0b9d0f67 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -61,7 +61,6 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void)
ACE_TRY
{
this->scheduler_->get_config_infos(configs.out());
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -196,7 +195,6 @@ TAO_EC_Kokyu_Push_Command::execute ()
this->proxy_->push_to_consumer (this->consumer_.in (),
this->event_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index ab2015ea52d..1aeeb35af7a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -75,8 +75,7 @@ void
TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
ACE_ENV_ARG_DECL)
{
- this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->init_rt_info ();
qos_info.rt_info = this->rt_info_;
switch (this->info_type_)
@@ -96,7 +95,6 @@ TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
p_subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos_info.preemption_priority = p_priority;
}
}
@@ -110,10 +108,8 @@ TAO_EC_Kokyu_Filter::push (const RtecEventComm::EventSet &event,
if (this->parent () != 0)
{
this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -125,10 +121,8 @@ TAO_EC_Kokyu_Filter::push_nocopy (RtecEventComm::EventSet &event,
if (this->parent () != 0)
{
this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -184,8 +178,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n"));
#endif
- this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->init_rt_info ();
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG,
@@ -197,21 +190,18 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
int matches = this->body_->add_dependencies (header,
qos_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (matches != 0)
{
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n"));
-#endif
+#endif
this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
RtecBase::ONE_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
RtecScheduler::RT_Info_var info =
this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n",
this->name_.c_str (),
this->rt_info_,
@@ -222,17 +212,16 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
{
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches == 0\n"));
-#endif
+#endif
}
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG, "about to iterate thru children\n"));
-#endif
+#endif
ChildrenIterator end = this->end ();
for (ChildrenIterator i = this->begin (); i != end; ++i)
{
(*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n"));
@@ -244,14 +233,13 @@ void
TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
ACE_ENV_ARG_DECL)
{
- this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->init_rt_info ();
qos_info.rt_info = this->rt_info_;
}
void
-TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Kokyu_Filter::init_rt_info (void)
{
if (this->rt_info_computed_)
return;
@@ -271,7 +259,6 @@ TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
0, // threads
this->info_type_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif //ifdef'ed by VS
#if 0 //ifdef changed from 1 to 0 by VS
@@ -282,11 +269,9 @@ TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecScheduler::RT_Info_var info =
this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
info->entry_point.in (),
this->name_.c_str ()));
@@ -299,11 +284,9 @@ TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecScheduler::RT_Info_var info =
this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
this->name_.c_str (),
info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 09f521997d4..b31c5ba7425 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -91,7 +91,7 @@ private:
TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&);
/// Initialize our RT_Info handle and dependencies
- void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+ void init_rt_info (void);
/// Compute a new qos_info to push up.
void compute_qos_info (TAO_EC_QOS_Info& qos_info
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 6012492d79a..8140345939f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -57,7 +57,6 @@ TAO_EC_Kokyu_Filter_Builder::build (
RtecScheduler::Scheduler_var scheduler =
RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
#ifdef EC_KOKYU_LOGGING
for (i=0; i<qos.dependencies.length (); ++i)
@@ -122,7 +121,6 @@ TAO_EC_Kokyu_Filter_Builder::build (
RtecScheduler::RT_Info_var final_consumer_rt_info =
scheduler->get ( h_final_consumer_rt_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
final_consumer_rep_name = final_consumer_rt_info->entry_point.in ();
final_consumer_rep_name += "#rep";
@@ -136,7 +134,6 @@ TAO_EC_Kokyu_Filter_Builder::build (
h_final_consumer_rep_rt_info =
scheduler->create (final_consumer_rep_name.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG, "consumer rep created\n"));
#endif
@@ -152,7 +149,6 @@ TAO_EC_Kokyu_Filter_Builder::build (
scheduler.in (),
h_final_consumer_rep_rt_info //parent_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
#ifdef EC_KOKYU_LOGGING
ACE_DEBUG ((LM_DEBUG,
@@ -174,14 +170,12 @@ TAO_EC_Kokyu_Filter_Builder::build (
//the final consumer
TAO_EC_QOS_Info qos_info;
kokyu_filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
scheduler->add_dependency (h_final_consumer_rt_info,
qos_info.rt_info,
1,
RtecBase::ONE_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return filter;
}
@@ -211,7 +205,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
this->recursive_name (qos, npos,
scheduler, name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
pos++; // Consume the designator
@@ -227,7 +220,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
scheduler,
conj_rt_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
TAO_EC_Kokyu_Filter *filter;
@@ -244,7 +236,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
// @@
- ACE_CHECK_RETURN (0);
return filter;
}
@@ -258,7 +249,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
this->recursive_name (qos, npos,
scheduler, name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
pos++; // Consume the designator
@@ -274,7 +264,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
scheduler,
disj_rt_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
TAO_EC_Kokyu_Filter *filter;
ACE_NEW_RETURN (filter,
@@ -291,7 +280,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
// @@
- ACE_CHECK_RETURN (0);
return filter;
}
else if (e.header.type == ACE_ES_EVENT_TIMEOUT
@@ -317,7 +305,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
qos_info.rt_info =
scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Convert the time to the proper units....
RtecScheduler::Period_t period =
@@ -338,14 +325,12 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
1, // threads
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
scheduler->add_dependency (qos_info.rt_info,
h_consumer_rt_info,
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
#endif //by VS
pos++;
@@ -385,7 +370,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
RtecScheduler::RT_Info_var info =
scheduler->get (parent_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_CString name = info->entry_point.in ();
@@ -404,7 +388,6 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
// @@
- ACE_CHECK_RETURN (0);
return filter;
}
@@ -430,7 +413,6 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
scheduler,
child_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i == 0)
name += "(";
@@ -455,7 +437,6 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
scheduler,
child_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i == 0)
name += "(";
@@ -485,7 +466,6 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
RtecScheduler::RT_Info_var info =
scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
name = info->entry_point.in ();
name += "#rep";
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 8d7e32b9c8e..7f1f2a89db2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -42,11 +42,9 @@ TAO_EC_Kokyu_Scheduling::add_proxy_supplier_dependencies (
p_subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos_info.preemption_priority = p_priority;
supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -86,13 +84,11 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
p_subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos_info.preemption_priority = p_priority;
}
filter->push_scheduled_event (single_event, qos_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 0384ea70e8f..9552d221124 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -60,7 +60,7 @@ private:
TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&);
/// Initialize our RT_Info handle and dependencies
- void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+ void init_rt_info (void);
private:
/// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
index 2884f04108d..a2c6e3a3dd7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
@@ -32,7 +32,6 @@ TAO_EC_Object_Deactivator::deactivate (void)
{
this->deactivate_ = 0;
this->poa_->deactivate_object (id_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -125,8 +124,7 @@ TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCHANY
{
@@ -158,8 +156,7 @@ TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index d454d0c1233..78ec7efbc6f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -23,14 +23,12 @@ activate (T & obj_ref,
PortableServer::ObjectId_var obj_id =
poa->activate_object (servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
suggested_object_deactivator.set_values (poa, obj_id.in ());
// Get the object reference of the activated object.
CORBA::Object_var obj =
poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Don't try to use T::_obj_type::_narrow, some compilers don't like it so
// do this in two steps
@@ -38,7 +36,6 @@ activate (T & obj_ref,
obj_ref =
my_object_type::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (obj_ref.in ()))
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 0a3d886138a..b626216e0be 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -48,7 +48,7 @@ void activate (T & obj_ref,
*
* Template argument requirements:
*
- * Has void execute (ACE_ENV_SINGLE_ARG_DECL); method which
+ * Has void execute (void); method which
* can throw ONLY CORBA exceptions.
* Has default and copy constructors.
*
@@ -84,7 +84,7 @@ class TAO_EC_Shutdown_Command
public:
TAO_EC_Shutdown_Command (void);
TAO_EC_Shutdown_Command (T target);
- void execute (ACE_ENV_SINGLE_ARG_DECL);
+ void execute (void);
private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index e93998fee0f..74e0c219295 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -57,8 +57,7 @@ TAO_EC_Auto_Command<T>::execute (void)
ACE_TRY_NEW_ENV
{
- this->command_.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->command_.execute ();
}
ACE_CATCHANY
{
@@ -101,12 +100,11 @@ TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command (T target)
template <class T>
ACE_INLINE void
-TAO_EC_Shutdown_Command<T>::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Shutdown_Command<T>::execute (void)
{
if (this->target_.in ())
{
- this->target_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->target_->shutdown ();
}
}
@@ -140,8 +138,7 @@ TAO_EC_Servant_Var(TAO_EC_Servant_Var<T> const & rhs)
{
ACE_TRY_NEW_ENV
{
- ptr_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ptr_->_add_ref ();
}
ACE_CATCHALL
{
@@ -191,8 +188,7 @@ ACE_INLINE TAO_EC_Servant_Var<T>::
{
ACE_TRY_NEW_ENV
{
- ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ptr_->_remove_ref ();
}
ACE_CATCHALL
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 0ab3197ef29..fe0b630e686 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -55,7 +55,6 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
if (this->parent () != 0)
{
this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return 1;
}
@@ -75,7 +74,6 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
if (this->parent () != 0)
{
this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return 1;
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 204685379ac..2d72037f250 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -42,11 +42,9 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
{
int n =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
return 0;
@@ -59,11 +57,9 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
{
int n =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index f9ddf2d9f68..e980e93b5e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -34,6 +34,5 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
TAO_EC_QOS_Info event_info;
filter->push_scheduled_event (single_event, event_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 6dddfd74ecc..dd58901ce10 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -94,7 +94,6 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
- ACE_CHECK_RETURN (0);
this->handle_generator_++;
Observer_Entry entry (this->handle_generator_,
@@ -108,15 +107,11 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
RtecEventChannelAdmin::ConsumerQOS c_qos;
this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
RtecEventChannelAdmin::SupplierQOS s_qos;
this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return this->handle_generator_;
}
@@ -133,7 +128,6 @@ TAO_EC_Basic_ObserverStrategy::remove_observer (
{
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
- ACE_CHECK;
if (this->observers_.unbind (handle) == -1)
ACE_THROW (
@@ -147,7 +141,6 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list (
{
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
- ACE_CHECK_RETURN (0);
int size = static_cast<int> (this->observers_.current_size ());
RtecEventChannelAdmin::Observer_var *tmp;
@@ -177,7 +170,6 @@ TAO_EC_Basic_ObserverStrategy::connected (
ACE_ENV_ARG_DECL)
{
this->supplier_qos_update (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -186,7 +178,6 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
ACE_ENV_ARG_DECL)
{
this->supplier_qos_update (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -199,11 +190,9 @@ TAO_EC_Basic_ObserverStrategy::supplier_qos_update (
RtecEventChannelAdmin::SupplierQOS s_qos;
this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecEventChannelAdmin::Observer_var *tmp = 0;
int size = this->create_observer_list (tmp ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
for (int i = 0; i != size; ++i)
@@ -211,7 +200,6 @@ TAO_EC_Basic_ObserverStrategy::supplier_qos_update (
ACE_TRY
{
copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -228,7 +216,6 @@ TAO_EC_Basic_ObserverStrategy::connected (
ACE_ENV_ARG_DECL)
{
this->consumer_qos_update (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -237,7 +224,6 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
ACE_ENV_ARG_DECL)
{
this->consumer_qos_update (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -250,11 +236,9 @@ TAO_EC_Basic_ObserverStrategy::consumer_qos_update (
RtecEventChannelAdmin::ConsumerQOS c_qos;
this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecEventChannelAdmin::Observer_var *tmp = 0;
int size = this->create_observer_list (tmp ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
for (int i = 0; i != size; ++i)
@@ -262,7 +246,6 @@ TAO_EC_Basic_ObserverStrategy::consumer_qos_update (
ACE_TRY
{
copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -283,7 +266,6 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
TAO_EC_Accumulate_Supplier_Headers worker (headers);
this->event_channel_->for_each_consumer (&worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
@@ -311,7 +293,6 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
TAO_EC_Accumulate_Consumer_Headers worker (headers);
this->event_channel_->for_each_supplier (&worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos.publications.length (static_cast<CORBA::ULong> (headers.current_size ()));
@@ -339,11 +320,9 @@ TAO_EC_Reactive_ObserverStrategy::supplier_qos_update (
RtecEventChannelAdmin::SupplierQOS s_qos;
this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Observer_Map copy;
this->create_observer_map (copy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Observer_Map_Iterator end = copy.end ();
for (Observer_Map_Iterator i = copy.begin ();
@@ -354,21 +333,18 @@ TAO_EC_Reactive_ObserverStrategy::supplier_qos_update (
ACE_TRY
{
entry.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
// Exception occured while updating observer, so remove it from the
// observer list
this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
// Exception occured while updating observer, so remove it from the
// observer list
this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -388,11 +364,9 @@ TAO_EC_Reactive_ObserverStrategy::consumer_qos_update (
RtecEventChannelAdmin::ConsumerQOS c_qos;
this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Observer_Map copy;
this->create_observer_map (copy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Observer_Map_Iterator end = copy.end ();
for (Observer_Map_Iterator i = copy.begin ();
@@ -403,21 +377,18 @@ TAO_EC_Reactive_ObserverStrategy::consumer_qos_update (
ACE_TRY
{
entry.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
// Exception occured while updating observer, so remove it from the
// observer list
this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
// Exception occured while updating observer, so remove it from the
// observer list
this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -433,7 +404,6 @@ TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map
{
ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
- ACE_CHECK_RETURN (0);
Observer_Map_Iterator end = this->observers_.end ();
for (Observer_Map_Iterator i = this->observers_.begin ();
@@ -460,7 +430,6 @@ TAO_EC_Reactive_ObserverStrategy::observer_not_exists (Observer_Entry& observer
ACE_TRY
{
this->remove_observer(observer.handle ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 5a222b54ddd..a7805acdc24 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -57,8 +57,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
ACE_TRY_NEW_ENV
{
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->shutdown ();
}
ACE_CATCHANY
{
@@ -96,7 +95,6 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
ACE_DEBUG ((LM_DEBUG, " matched\n"));
#endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return;
}
#if TAO_EC_ENABLE_DEBUG_MESSAGES
@@ -129,7 +127,6 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
{
// ACE_DEBUG ((LM_DEBUG, " matched %x\n", supplier));
this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return;
}
}
@@ -144,9 +141,9 @@ TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier
}
void
-TAO_EC_Per_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::shutdown (void)
{
- this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->collection_->shutdown ();
}
void
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 62d9836fed2..acbbbfa640d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -59,7 +59,7 @@ public:
ACE_ENV_ARG_DECL);
virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
virtual void push (const RtecEventComm::EventSet& event,
TAO_EC_ProxyPushConsumer *consumer
ACE_ENV_ARG_DECL_NOT_USED);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 1e41905c0ca..782ea9f5169 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -50,7 +50,6 @@ TAO_EC_Priority_Dispatching::activate (void)
RtecScheduler::handle_t rt_info =
this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->scheduler_->set (rt_info,
RtecScheduler::VERY_LOW_CRITICALITY,
@@ -63,7 +62,6 @@ TAO_EC_Priority_Dispatching::activate (void)
1, // threads
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 345f9c89a01..0f3456c0e86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -43,11 +43,9 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
p_subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos_info.preemption_priority = p_priority;
supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -87,13 +85,11 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event
p_subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos_info.preemption_priority = p_priority;
}
filter->push_scheduled_event (single_event, qos_info
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 0bcf644848a..5816bec091d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -59,7 +59,7 @@ private:
TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&);
/// Initialize our RT_Info handle and dependencies
- void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+ void init_rt_info (void);
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 315f0a968ce..c48713fad93 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -52,7 +52,6 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_connected_i () == 0)
@@ -68,7 +67,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return supplier->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
@@ -135,12 +134,12 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*
}
void
-TAO_EC_ProxyPushConsumer::shutdown_hook (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::shutdown_hook (void)
{
}
void
-TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::shutdown (void)
{
RtecEventComm::PushSupplier_var supplier;
@@ -148,33 +147,28 @@ TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
supplier = this->supplier_._retn ();
this->connected_ = 0;
- this->shutdown_hook (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->shutdown_hook ();
if (this->filter_ != 0)
{
- this->filter_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->filter_->shutdown ();
this->cleanup_i ();
}
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (supplier.in ()))
return;
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -200,15 +194,13 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
}
void
-TAO_EC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::deactivate (void)
{
ACE_TRY
{
PortableServer::ObjectId id =
- this->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->object_id ();
this->default_POA_->deactivate_object (id ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 5ffb2b12c08..9977077cae5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -73,7 +73,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void deactivate (void);
/// Disconnect this from
virtual void disconnect_push_consumer (
@@ -116,7 +116,7 @@ public:
ACE_ENV_ARG_DECL);
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void shutdown (void);
/// The QoS (subscription) used to connect to the EC, assumes the
/// locks are held, use with care!
@@ -172,11 +172,11 @@ protected:
private:
/// Template method hooks.
- virtual void shutdown_hook (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown_hook (void);
virtual void refcount_zero_hook (void);
virtual PortableServer::ObjectId
- object_id (ACE_ENV_SINGLE_ARG_DECL)
+ object_id (void)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
};
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 0512c4962cf..c3953adfb4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -94,7 +94,7 @@ TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*
}
void
-TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::shutdown (void)
{
// Save the consumer we where connected to, we need to send a
// disconnect message to it.
@@ -104,7 +104,6 @@ TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
int connected = this->is_connected_i ();
@@ -114,16 +113,14 @@ TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->cleanup_i ();
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
if (CORBA::is_nil (consumer.in ()))
return;
ACE_TRY
{
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -146,15 +143,13 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
}
void
-TAO_EC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (())
+TAO_EC_ProxyPushSupplier::deactivate (void) ACE_THROW_SPEC (())
{
ACE_TRY
{
PortableServer::ObjectId id =
- this->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->object_id ();
this->default_POA_->deactivate_object (id ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -210,14 +205,12 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK_RETURN (0);
if (this->is_connected_i () == 0)
return 0;
result =
this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return result;
}
@@ -236,14 +229,12 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK_RETURN (0);
if (this->is_connected_i () == 0)
return 0;
result =
this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return result;
}
@@ -277,7 +268,6 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&> (event)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
{
// We have to release the lock to avoid dead-locks.
@@ -285,14 +275,12 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
ACE_GUARD_THROW_EX (TAO_EC_Unlock, ace_mon, reverse_lock,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->dispatching ()->push (this,
consumer.in (),
event,
qos_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->child_ != 0)
@@ -333,21 +321,18 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
this->pre_dispatch_hook (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
{
TAO_EC_Unlock reverse_lock (*this->lock_);
ACE_GUARD_THROW_EX (TAO_EC_Unlock, ace_mon, reverse_lock,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
this->event_channel_->dispatching ()->push_nocopy (this,
consumer.in (),
event,
qos_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->child_ != 0)
@@ -364,7 +349,6 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
if (this->is_connected_i () == 0)
return; // ACE_THROW (RtecEventComm::Disconnected ());????
@@ -376,7 +360,6 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
ACE_TRY
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
{
@@ -393,7 +376,6 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
this->event_channel_->consumer_control ();
control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCH (CORBA::SystemException, sysex)
@@ -413,7 +395,6 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -432,7 +413,6 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
ACE_TRY
{
consumer->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
{
@@ -440,7 +420,6 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
this->event_channel_->consumer_control ();
control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -450,7 +429,6 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
control->system_exception (this,
sysex
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_CATCHANY
{
@@ -469,7 +447,6 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
disconnected = 0;
if (this->is_connected_i () == 0)
@@ -482,7 +459,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
}
#if (TAO_HAS_MINIMUM_CORBA == 0)
- return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer->_non_existent ();
#else
return 0;
#endif /* TAO_HAS_MINIMUM_CORBA */
@@ -525,7 +502,6 @@ TAO_EC_ProxyPushSupplier::add_dependencies (
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK_RETURN (0);
return this->child_->add_dependencies (header,
qos_info
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index c0a4b442c82..2fcb80d42de 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -73,7 +73,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
/// Deactivate from the POA
- virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void deactivate (void)
ACE_THROW_SPEC (());
/// Disconnect this from
@@ -114,7 +114,7 @@ public:
ACE_ENV_ARG_DECL);
/// The event channel is shutting down
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
/// Pushes to the consumer, verifies that it is connected and that it
/// is not suspended.
@@ -168,13 +168,13 @@ protected:
void consumer (RtecEventComm::PushConsumer_ptr consumer);
void consumer_i (RtecEventComm::PushConsumer_ptr consumer);
- void suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL)
+ void suspend_connection_i (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- void resume_connection_i (ACE_ENV_SINGLE_ARG_DECL)
+ void resume_connection_i (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- void suspend_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+ void suspend_connection_locked (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- void resume_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+ void resume_connection_locked (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// The private version (without locking) of is_connected().
@@ -216,7 +216,7 @@ private:
virtual void pre_dispatch_hook (RtecEventComm::EventSet&
ACE_ENV_ARG_DECL);
virtual PortableServer::ObjectId
- object_id (ACE_ENV_SINGLE_ARG_DECL)
+ object_id (void)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
};
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
index c64085ea2e1..efe0d76ae82 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
@@ -5,43 +5,41 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
-TAO_EC_ProxyPushSupplier::suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::suspend_connection_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->suspended_ = 1;
}
ACE_INLINE void
-TAO_EC_ProxyPushSupplier::suspend_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::suspend_connection_locked (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
- this->suspend_connection_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->suspend_connection_i ();
}
ACE_INLINE void
-TAO_EC_ProxyPushSupplier::resume_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::resume_connection_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->suspended_ = 0;
}
ACE_INLINE void
-TAO_EC_ProxyPushSupplier::resume_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::resume_connection_locked (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (
ACE_Lock, ace_mon, *this->lock_,
CORBA::INTERNAL ());
// @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
- ACE_CHECK;
- this->resume_connection_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->resume_connection_i ();
}
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
index 557a2b4f708..c3e610630d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -18,8 +18,7 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier->disconnect_push_supplier ();
}
ACE_CATCHALL
{
@@ -35,8 +34,7 @@ TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() (
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer->disconnect_push_consumer ();
}
ACE_CATCHALL
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index f57b86ae813..b51e300ca1e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -85,8 +85,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
ACE_ENV_ARG_DECL)
{
RTCORBA::Priority current_priority =
- this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->current_->the_priority ();
for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i)
{
@@ -98,7 +97,6 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
this->tasks_[i].push (proxy, consumer, event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 087ffc53b03..5bf849a9a80 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -48,17 +48,14 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
CORBA::ORB_var orb =
CORBA::ORB_init (argc, 0, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj =
orb->resolve_initial_references ("PriorityMappingManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RTCORBA::PriorityMappingManager_var priority_mapping_manager =
RTCORBA::PriorityMappingManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RTCORBA::PriorityMapping *priority_mapping =
priority_mapping_manager->mapping ();
@@ -66,12 +63,10 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
obj =
orb->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RTCORBA::Current_var current =
RTCORBA::Current::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_NEW_RETURN (dispatching,
TAO_EC_RTCORBA_Dispatching (this->lanes_,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 5cc0e3bf3c5..2911ef0ee92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -48,7 +48,6 @@ TAO_EC_Reactive_ConsumerControl::query_consumers (
TAO_EC_Ping_Consumer worker (this);
this->event_channel_->for_each_consumer (&worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -72,26 +71,21 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Query the state of the consumers...
- this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->query_consumers ();
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -111,12 +105,10 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Timeout for polling state (default = 10 msec)
TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -129,7 +121,6 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Only schedule the timer, when the rate is not zero
if (this->rate_ != ACE_Time_Value::zero)
@@ -177,8 +168,7 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
//ACE_DEBUG ((LM_DEBUG,
// "EC_Reactive_ConsumerControl(%P|%t) - "
// "Consumer %x does not exists\n", long(proxy)));
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -207,8 +197,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception (
// return;
// Anything else is serious, including timeouts...
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -246,17 +235,14 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
CORBA::Boolean non_existent =
supplier->consumer_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
@@ -264,7 +250,6 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
// want to be more lenient in the future..
// if (transient.minor () == 0x54410085)
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 bcbf77a74a2..a59d80661c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -97,7 +97,7 @@ public:
private:
/// Check if the consumers still exists. It is a helper method for
/// handle_timeout() to isolate the exceptions.
- void query_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void query_consumers (void);
private:
/// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index e6e08c409d5..81026aa8fd3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -48,7 +48,6 @@ TAO_EC_Reactive_SupplierControl::query_suppliers (
TAO_EC_Ping_Supplier worker (this);
this->event_channel_->for_each_supplier (&worker
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -64,26 +63,21 @@ TAO_EC_Reactive_SupplierControl::handle_timeout (
CORBA::PolicyList_var policies =
this->policy_current_->get_policy_overrides (types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Change the timeout
this->policy_current_->set_policy_overrides (this->policy_list_,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Query the state of the suppliers...
- this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->query_suppliers ();
this->policy_current_->set_policy_overrides (policies.in (),
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i != policies->length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
}
ACE_CATCHANY
@@ -103,12 +97,10 @@ TAO_EC_Reactive_SupplierControl::activate (void)
CORBA::Object_var tmp =
this->orb_->resolve_initial_references ("PolicyCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->policy_current_ =
CORBA::PolicyCurrent::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Timeout for polling state (default = 10 msec)
TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -121,7 +113,6 @@ TAO_EC_Reactive_SupplierControl::activate (void)
Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Only schedule the timer, when the rate is not zero
if (this->rate_ != ACE_Time_Value::zero)
@@ -169,8 +160,7 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist (
//ACE_DEBUG ((LM_DEBUG,
// "EC_Reactive_SupplierControl(%P|%t) - "
// "Consumer %x does not exists\n", long(proxy)));
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -197,8 +187,7 @@ TAO_EC_Reactive_SupplierControl::system_exception (
// return;
// Anything else is serious, including timeouts...
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -236,17 +225,14 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
CORBA::Boolean non_existent =
consumer->supplier_non_existent (disconnected
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (non_existent && !disconnected)
{
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, transient)
{
@@ -254,7 +240,6 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
// want to be more lenient in the future..
// if (transient.minor () == 0x54410085)
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 a2e37e70acf..a704ea96b0c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -108,7 +108,7 @@ public:
private:
/// Check if the suppliers still exists. It is a helper method for
/// handle_timeout() to isolate the exceptions.
- void query_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void query_suppliers (void);
private:
/// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 3eb8e03e214..f49b407ff6d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -73,8 +73,7 @@ void
TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
ACE_ENV_ARG_DECL)
{
- this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->init_rt_info ();
qos_info.rt_info = this->rt_info_;
switch (this->info_type_)
@@ -94,7 +93,6 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
p_subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
qos_info.preemption_priority = p_priority;
}
}
@@ -108,10 +106,8 @@ TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
if (this->parent () != 0)
{
this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -123,10 +119,8 @@ TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
if (this->parent () != 0)
{
this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -153,24 +147,20 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
const TAO_EC_QOS_Info &qos_info
ACE_ENV_ARG_DECL)
{
- this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->init_rt_info ();
int matches = this->body_->add_dependencies (header,
qos_info
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
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
RtecScheduler::RT_Info_var info =
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 (),
info->entry_point.in ()));
@@ -180,7 +170,6 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
for (ChildrenIterator i = this->begin (); i != end; ++i)
{
(*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return 0;
}
@@ -189,14 +178,13 @@ void
TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
ACE_ENV_ARG_DECL)
{
- this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->init_rt_info ();
qos_info.rt_info = this->rt_info_;
}
void
-TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Sched_Filter::init_rt_info (void)
{
if (this->rt_info_computed_)
return;
@@ -214,7 +202,6 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
0, // threads
this->info_type_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if 0
ChildrenIterator end = this->end ();
@@ -224,17 +211,14 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
TAO_EC_QOS_Info child;
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
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecScheduler::RT_Info_var info =
this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
info->entry_point.in (),
this->name_.c_str ()));
@@ -250,11 +234,9 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecScheduler::RT_Info_var info =
this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
info->entry_point.in (),
this->name_.c_str ()));
@@ -267,11 +249,9 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecScheduler::RT_Info_var info =
this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
this->name_.c_str (),
info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 5645a6eac92..8e45b184174 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -91,7 +91,7 @@ private:
TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&);
/// Initialize our RT_Info handle and dependencies
- void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+ void init_rt_info (void);
/// Compute a new qos_info to push up.
void compute_qos_info (TAO_EC_QOS_Info& qos_info
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 833c19b2aac..02f778789dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -35,12 +35,10 @@ TAO_EC_Sched_Filter_Builder::build (
RtecScheduler::Scheduler_var scheduler =
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" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return this->recursive_build (supplier, qos, pos,
scheduler.in (),
@@ -66,11 +64,9 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
this->recursive_name (qos, npos,
scheduler, name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
RtecScheduler::handle_t rt_info =
scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
pos++; // Consume the designator
CORBA::ULong n = this->count_children (qos, pos);
@@ -83,7 +79,6 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
scheduler,
rt_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
TAO_EC_Sched_Filter *filter;
@@ -100,7 +95,6 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
// @@
- ACE_CHECK_RETURN (0);
return filter;
}
@@ -111,11 +105,9 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
this->recursive_name (qos, npos,
scheduler, name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
RtecScheduler::handle_t rt_info =
scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
pos++; // Consume the designator
CORBA::ULong n = this->count_children (qos, pos);
@@ -128,7 +120,6 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
scheduler,
rt_info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
TAO_EC_Sched_Filter *filter;
ACE_NEW_RETURN (filter,
@@ -145,7 +136,6 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
// @@
- ACE_CHECK_RETURN (0);
return filter;
}
@@ -165,7 +155,6 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
qos_info.rt_info =
scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Convert the time to the proper units....
RtecScheduler::Period_t period =
@@ -182,14 +171,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
1, // threads
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
scheduler->add_dependency (qos_info.rt_info,
parent_info,
1,
RtecBase::TWO_WAY_CALL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return new TAO_EC_Timeout_Filter (this->event_channel_,
supplier,
@@ -202,14 +189,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
RtecScheduler::RT_Info_var info =
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 () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
pos++;
TAO_EC_Sched_Filter *filter;
@@ -226,7 +211,6 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
TAO_EC_QOS_Info qos_info;
filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
// @@
- ACE_CHECK_RETURN (0);
return filter;
}
@@ -252,7 +236,6 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
scheduler,
child_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i == 0)
name += "(";
@@ -277,7 +260,6 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
scheduler,
child_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i == 0)
name += "(";
@@ -307,7 +289,6 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
RtecScheduler::RT_Info_var info =
scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
name = info->entry_point.in ();
name += "#rep";
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index fb555cf3e95..6856520575c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -24,14 +24,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
}
RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_SupplierAdmin::obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->obtain ();
}
PortableServer::POA_ptr
-TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_SupplierAdmin::_default_POA (void)
{
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 44e9edb8dc9..57e05628b48 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -55,11 +55,11 @@ public:
// = The RtecEventChannelAdmin::SupplierAdmin methods...
virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = The PortableServer::ServantBase methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
/// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 30de7bc3afc..9fa578fec95 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -101,7 +101,7 @@ public:
ACE_ENV_ARG_DECL) = 0;
/// The event channel is shutting down.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void shutdown (void) = 0;
/// The ProxyPushConsumer delegates on this class to actually send
/// the event.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index f6bcde8d4cf..ce47c645bbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -199,7 +199,6 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
else
{
dtask->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index a5b23525b1e..0ca2973e9a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -22,7 +22,7 @@ TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching ()
TAO_EC_Dispatching* dispatcher = this->event_channel_->dispatching ();
TAO_EC_TPC_Dispatching* tpcdispatcher =
dynamic_cast<TAO_EC_TPC_Dispatching*>(dispatcher);
- return tpcdispatcher;
+ return tpcdispatcher;
}
TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
@@ -40,16 +40,13 @@ TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- RtecEventComm::PushConsumer_var emulated_exceptions_suck =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushConsumer_var emulated_exceptions_suck =
+ this->_this ();
this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- BASECLASS::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ BASECLASS::disconnect_push_consumer ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
index 9fb7ff1dc0c..586d6218b5c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -35,7 +35,7 @@ public:
TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec);
virtual ~TAO_EC_TPC_ProxyPushConsumer (void);
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 756de632952..7f181e4a6df 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -21,7 +21,7 @@ TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
}
void
-TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_EC_TPC_debug_level > 0)
@@ -34,10 +34,8 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL
{
this->tpc_dispatching ()->remove_consumer (this->consumer_.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
- BASECLASS::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ BASECLASS::disconnect_push_supplier ();
if (TAO_EC_TPC_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this));
@@ -61,7 +59,6 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
RtecEventChannelAdmin::TypeError))
{
BASECLASS::connect_push_consumer (push_consumer, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_EC_TPC_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n",
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 3a6ad49db16..99e03d651ae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -29,13 +29,13 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_ProxyPushSupplier :
public:
/// Constructor
TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
-
+
/// Dtor
virtual ~TAO_EC_TPC_ProxyPushSupplier (void);
/*! These are overriden from the base class in order to maintain the
map in the dispatcher class. */
-
+
// = The RtecEventChannelAdmin::ProxyPushSupplier methods...
virtual void connect_push_consumer (
RtecEventComm::PushConsumer_ptr push_consumer,
@@ -45,10 +45,10 @@ public:
RtecEventChannelAdmin::AlreadyConnected,
RtecEventChannelAdmin::TypeError));
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
+
+private:
typedef TAO_EC_Default_ProxyPushSupplier BASECLASS;
TAO_EC_TPC_Dispatching* tpc_dispatching ();
};
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index d775c458a12..0d5332d3ed1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -11,8 +11,8 @@
#include "orbsvcs/Event/EC_Timeout_Filter.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Timeout_Filter,
+ACE_RCSID (Event,
+ EC_Timeout_Filter,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -89,7 +89,6 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
&& this->parent () != 0)
{
this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
return 0;
@@ -104,7 +103,6 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
&& this->parent () != 0)
{
this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 2b55f24a2d6..5657c13187b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -8,8 +8,8 @@
#include "orbsvcs/Event/EC_Timeout_Generator.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Event,
- EC_Timeout_Generator,
+ACE_RCSID (Event,
+ EC_Timeout_Generator,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -47,7 +47,6 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
filter->push_to_proxy (single_event,
qos_info
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 c5d3dc1b72c..e8fcab0a19d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -49,7 +49,7 @@ TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*
}
void
-TAO_EC_Trivial_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::shutdown (void)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 617bd87f6d7..b512b2539f9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -59,7 +59,7 @@ public:
ACE_ENV_ARG_DECL);
virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
ACE_ENV_ARG_DECL);
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
virtual void push (const RtecEventComm::EventSet& event,
TAO_EC_ProxyPushConsumer *consumer
ACE_ENV_ARG_DECL_NOT_USED);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index d52f1d869aa..28b08859ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -22,7 +22,6 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
if (this->can_match (event[0].header))
{
this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
return 0;
@@ -39,7 +38,6 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
if (this->can_match (event[0].header))
{
this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
return 0;
@@ -142,7 +140,6 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
return 0;
this->push (matched, qos_info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return 1;
}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 03d6f4a56b6..480c0bc0542 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -29,12 +29,10 @@ TAO_FT_ClientORBInitializer::post_init (
{
this->register_policy_factories (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->register_client_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
@@ -61,7 +59,6 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
policy_factory = temp_factory;
@@ -73,20 +70,17 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = FT::HEARTBEAT_POLICY;
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
/*
type = FT::HEARTBEAT_ENABLED_POLICY;
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*/
}
@@ -109,7 +103,6 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors (
info->add_client_request_interceptor (client_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 638639dfb10..57e0a9e6389 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -15,14 +15,14 @@ ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->request_duration_;
}
CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return FT::REQUEST_DURATION_POLICY;
@@ -42,7 +42,6 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
TAO_FT_Request_Duration_Policy (value),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
@@ -58,20 +57,19 @@ TAO_FT_Request_Duration_Policy::clone (void) const
}
CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Request_Duration_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_FT_Request_Duration_Policy* tmp = 0;
ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
void
-TAO_FT_Request_Duration_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -97,7 +95,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
/*****************************************************************/
FT::HeartbeatPolicyValue
-TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FT::HeartbeatPolicyValue val;
@@ -125,14 +123,13 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
value->heartbeat_timeout),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return FT::HEARTBEAT_POLICY;
@@ -140,14 +137,13 @@ TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_FT_Heart_Beat_Policy * tmp = 0;
ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
@@ -163,7 +159,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
}
void
-TAO_FT_Heart_Beat_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index a1bbf81174e..da7381e53f5 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -63,7 +63,7 @@ public:
virtual TAO_FT_Request_Duration_Policy *clone (void) const;
// = The FT::RequestDurationPolicy methods
- virtual TimeBase::TimeT request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+ virtual TimeBase::TimeT request_duration_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::PolicyType policy_type (
@@ -118,7 +118,7 @@ public:
virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
// = The FT::HeartBeatPolicy methods
- virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+ virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::PolicyType policy_type (
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 495f570e10f..f60feeafbab 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -48,14 +48,14 @@ namespace TAO
}
char *
- FT_ClientRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ FT_ClientRequest_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->name_);
}
void
- FT_ClientRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ FT_ClientRequest_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -79,8 +79,7 @@ namespace TAO
if (TAO_debug_level > 3)
{
CORBA::String_var op =
- ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->operation ();
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("TAO_FT (%P|%t) - %s called for %s\n"),
@@ -94,7 +93,6 @@ namespace TAO
tp =
ri->get_effective_component (IOP::TAG_FT_GROUP
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -105,11 +103,9 @@ namespace TAO
this->group_version_context (ri,
tp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->request_service_context (ri
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -146,7 +142,7 @@ namespace TAO
ACE_TRY
{
- status = ri->reply_status(ACE_ENV_SINGLE_ARG_PARAMETER);
+ status = ri->reply_status();
}
ACE_CATCHANY
{
@@ -191,8 +187,7 @@ namespace TAO
// @@ Will be used later.
// Do a check for policy in which this can be done..
PortableInterceptor::ReplyStatus rs =
- ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->reply_status ();
if (rs != PortableInterceptor::SYSTEM_EXCEPTION)
{
@@ -200,8 +195,7 @@ namespace TAO
}
CORBA::Any_var ex =
- ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->received_exception ();
TAO_OutputCDR cdr;
@@ -308,7 +302,6 @@ namespace TAO
ri->add_request_service_context (sc,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -317,7 +310,6 @@ namespace TAO
// ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
return;
}
@@ -336,7 +328,6 @@ namespace TAO
CORBA::Policy_var policy =
ri->get_request_policy (FT::REQUEST_DURATION_POLICY
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FT::FTRequestServiceContext ftrsc;
ftrsc.client_id =
@@ -364,7 +355,6 @@ namespace TAO
ftrsc.expiration_time =
this->request_expiration_time (policy.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
tao_ri->tao_ft_retention_id (ftrsc.retention_id);
tao_ri->tao_ft_expiration_time (ftrsc.expiration_time);
@@ -397,14 +387,12 @@ namespace TAO
ri->add_request_service_context (sc,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
// ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
return;
}
@@ -420,7 +408,6 @@ namespace TAO
{
p = FT::RequestDurationPolicy::_narrow (policy
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
TimeBase::TimeT t = 0;
@@ -428,8 +415,7 @@ namespace TAO
if (p.in ())
{
t =
- p->request_duration_policy_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ p->request_duration_policy_value ();
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 51f92c674d9..465b9f820b3 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -76,11 +76,11 @@ namespace TAO
FT_ClientRequest_Interceptor (void);
/// Canonical name of the interceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 280b95cab98..13500e5692a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -40,7 +40,6 @@ TAO_FT_Endpoint_Selector_Factory::get_selector (
ACE_NEW_THROW_EX (ft_endpoint_selector_,
TAO_FT_Invocation_Endpoint_Selector (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
}
}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 413bce96aaf..365df8487fc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -144,7 +144,6 @@ TAO_FT_IOGR_Property::get_primary (
CORBA::Object_var new_obj = temp_obj;
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Clean up in case of errors.
if (CORBA::is_nil (new_obj.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 3243d7ea5fd..bafea90d822 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -36,7 +36,6 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
this->select_primary (r,
val
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (retval)
return;
@@ -45,7 +44,6 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
this->select_secondary (r,
val
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (retval == false)
{
@@ -91,7 +89,6 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
bool retval =
this->check_profile_for_primary (tmp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
// Choose a non-primary
if (retval == true && tmp != 0)
@@ -101,7 +98,6 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
tmp,
max_wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
if (retval == true)
return true;
@@ -143,7 +139,6 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
bool retval =
this->check_profile_for_primary (tmp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
// Choose a non-primary
if (retval == false && tmp != 0)
@@ -153,7 +148,6 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
tmp,
max_wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
if (retval == true)
return true;
@@ -186,7 +180,6 @@ TAO_FT_Invocation_Endpoint_Selector::try_connect (
r->try_connect (&desc,
max_wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
// @@ Good place to handle timeouts.. We can omit timeouts and
// go ahead looking for other things... There are some small
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 3e2a732dd62..25938b59b8f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -32,15 +32,12 @@ TAO_FT_ORBInitializer::post_init (
{
this->register_policy_factories (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->register_server_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->register_client_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -64,7 +61,6 @@ TAO_FT_ORBInitializer::register_policy_factories (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
policy_factory = temp_factory;
@@ -76,19 +72,16 @@ TAO_FT_ORBInitializer::register_policy_factories (
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = FT::HEARTBEAT_POLICY;
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = FT::HEARTBEAT_ENABLED_POLICY;
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Transfer ownership of the policy factory to the registry.
(void) policy_factory._retn ();
@@ -112,7 +105,6 @@ TAO_FT_ORBInitializer::register_server_request_interceptors (
info->add_server_request_interceptor (server_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -134,7 +126,6 @@ TAO_FT_ORBInitializer::register_client_request_interceptors (
info->add_client_request_interceptor (client_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index c24aa921d17..03cd2cc560b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -12,14 +12,14 @@ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->request_duration_;
}
CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return FT::REQUEST_DURATION_POLICY;
@@ -39,7 +39,6 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
TAO_FT_Request_Duration_Policy (value),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
@@ -55,20 +54,19 @@ TAO_FT_Request_Duration_Policy::clone (void) const
}
CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Request_Duration_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_FT_Request_Duration_Policy* tmp;
ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
void
-TAO_FT_Request_Duration_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -96,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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FT::HeartbeatPolicyValue val;
@@ -124,14 +122,13 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
value->heartbeat_timeout),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return FT::HEARTBEAT_POLICY;
@@ -139,14 +136,13 @@ TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_FT_Heart_Beat_Policy * tmp;
ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
@@ -162,7 +158,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
}
void
-TAO_FT_Heart_Beat_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -213,13 +209,12 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
TAO_FT_Heart_Beat_Enabled_Policy (value),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return FT::HEARTBEAT_ENABLED_POLICY;
@@ -227,14 +222,13 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_FT_Heart_Beat_Enabled_Policy * tmp;
ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
@@ -251,7 +245,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
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 8fd5f3a1fc8..c90c098e4d4 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -61,7 +61,7 @@ public:
virtual TAO_FT_Request_Duration_Policy *clone (void) const;
// = The FT::RequestDurationPolicy methods
- virtual TimeBase::TimeT request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+ virtual TimeBase::TimeT request_duration_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::PolicyType policy_type (
@@ -116,7 +116,7 @@ public:
virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
// = The FT::HeartBeatPolicy methods
- virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+ virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::PolicyType policy_type (
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 77b99f3035a..aa4b3235ef8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -30,11 +30,9 @@ TAO_FT_ServerORBInitializer::post_init (
{
this->register_policy_factories (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->register_server_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -58,7 +56,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
policy_factory = temp_factory;
@@ -71,7 +68,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
info->register_policy_factory (type,
policy_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -93,7 +89,6 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors (
info->add_server_request_interceptor (server_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 25e079b7692..86a83d333ff 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -37,13 +37,12 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
TAO_FT_Heart_Beat_Enabled_Policy (value),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return FT::HEARTBEAT_ENABLED_POLICY;
@@ -51,14 +50,13 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_FT_Heart_Beat_Enabled_Policy * tmp;
ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return tmp;
}
@@ -74,7 +72,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
}
void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 64866cc36ed..d7e8cc96e36 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -29,14 +29,14 @@ namespace TAO
}
char *
- FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ FT_ServerRequest_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor");
}
void
- FT_ServerRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ FT_ServerRequest_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -54,11 +54,9 @@ namespace TAO
IOP::ServiceContext_var sc =
ri->get_request_service_context (IOP::FT_GROUP_VERSION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->check_iogr_version (sc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::BAD_PARAM, ex)
{
@@ -70,7 +68,6 @@ namespace TAO
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
@@ -83,15 +80,13 @@ namespace TAO
{
// Check for the group version service context
CORBA::String_var op =
- ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->operation ();
if (ACE_OS::strcmp (op.in (),
"tao_update_object_group") == 0)
{
this->update_iogr (ri
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Else the world is fine
@@ -188,8 +183,7 @@ namespace TAO
if (this->orb_.in () == 0)
{
CORBA::String_var orb_id =
- ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->orb_id ();
int argc = 0;
char **argv = 0;
@@ -199,12 +193,10 @@ namespace TAO
argv,
orb_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
Dynamic::ParameterList_var param =
- ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->arguments ();
// this is only for checking the tao_update_object_group operation
// which accepts three parameters, i.e.,an iogr as a string,
@@ -224,7 +216,6 @@ namespace TAO
this->orb_->string_to_object (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ This exception is a hack to let the RM know that we have
// received and updated the IOGR. We will add a special minor code
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 78c188d597d..e9926463d6f 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -69,10 +69,10 @@ namespace TAO
*/
//@{
/// Return the name of this ServerRequestinterceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 1cc5d2fd2de..2fbb222d641 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -29,14 +29,14 @@ FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void)
}
char *
-FTRT_ClientORB_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTRT_ClientORB_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->myname_);
}
void
-FTRT_ClientORB_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTRT_ClientORB_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -90,14 +90,12 @@ FTRT_ClientORB_Interceptor::send_request (
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
// Not much can be done anyway. Just keep quiet
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -114,13 +112,11 @@ FTRT_ClientORB_Interceptor::receive_reply (
service_context =
ri->get_reply_service_context(FTRT::FT_FORWARD
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY {
return;
}
ACE_ENDTRY;
- ACE_CHECK;
const char * buf =
@@ -134,7 +130,7 @@ FTRT_ClientORB_Interceptor::receive_reply (
if (cdr >> obj) {
// update the target
- CORBA::Object_var target = ri->target(ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Object_var target = ri->target();
target->_stubobj ()->base_profiles ( obj->_stubobj()->base_profiles() );
ACE_DEBUG((LM_DEBUG, "target object updated\n"));
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index 81512859796..7cbda5660e7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -47,10 +47,10 @@ public:
virtual ~FTRT_ClientORB_Interceptor ();
/// Canonical name of the interceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index adac1b323a4..c9f9acab060 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -66,12 +66,10 @@ namespace TAO_FTRT {
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
orb_initializer = temp_orb_initializer;
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 0bae38d051d..950a1fd3928 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -52,19 +52,15 @@ int AMI_Primary_Replication_Strategy::svc()
int argc = 0;
char** argv = 0;
orb_ = CORBA::ORB_init (argc, argv);
- ACE_TRY_CHECK;
root_poa_ = resolve_init<PortableServer::POA>(orb_.in(), "RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// create POAManager
- mgr_ = root_poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr_ = root_poa_->the_POAManager();
- mgr_->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr_->activate();
PortableServer::IdUniquenessPolicy_var id_uniqueness_policy =
root_poa_->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID
@@ -78,7 +74,6 @@ int AMI_Primary_Replication_Strategy::svc()
);
poa_ = create_persistent_poa(root_poa_, mgr_, "AMI_Update", policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
id_uniqueness_policy->destroy();
@@ -111,8 +106,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
bool success = false;
FTRT::TransactionDepth transaction_depth =
- Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Request_Context_Repository().get_transaction_depth();
const FtRtecEventChannelAdmin::EventChannelList& backups =
GroupInfoPublisher::instance()->backups();
@@ -130,7 +124,6 @@ AMI_Primary_Replication_Strategy::replicate_request(
Request_Context_Repository().set_transaction_depth(0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
for (size_t i = 0; i < num_backups; ++i) {
PortableServer::ObjectId oid;
@@ -188,13 +181,11 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
PortableServer::ObjectId_var oid =
root_poa_->activate_object(&add_member_handler ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO::Utils::Implicit_Deactivator deactivator(&add_member_handler);
CORBA::Object_var obj =
root_poa_->id_to_reference(oid.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
FTRT::AMI_ObjectGroupManagerHandler_var handler =
FTRT::AMI_ObjectGroupManagerHandler::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
@@ -205,7 +196,6 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
info,
object_group_ref_version
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
add_member_handler.add_member_excep(0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 50a4a5f4dff..0c9e1260537 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -27,10 +27,9 @@ Basic_Replication_Strategy::~Basic_Replication_Strategy()
}
void
-Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
+Basic_Replication_Strategy::check_validity(void)
{
- FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number();
TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_);
@@ -60,7 +59,6 @@ void twoway_set_update(FtRtecEventChannelAdmin::EventChannel_var successor,
do {
ACE_TRY {
successor->set_update(state ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH(CORBA::COMM_FAILURE, ex) {
if (ex.minor() == 6) finished = false;
@@ -68,7 +66,6 @@ void twoway_set_update(FtRtecEventChannelAdmin::EventChannel_var successor,
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
} while(!finished);
}
@@ -83,8 +80,7 @@ Basic_Replication_Strategy::replicate_request(
ACE_UNUSED_ARG(oid);
FTRT::TransactionDepth transaction_depth =
- Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Request_Context_Repository().get_transaction_depth();
GroupInfoPublisherBase * info_publisher = GroupInfoPublisher::instance();
FtRtecEventChannelAdmin::EventChannel_var successor = info_publisher->successor();
@@ -95,10 +91,8 @@ Basic_Replication_Strategy::replicate_request(
TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_);
Request_Context_Repository().set_sequence_number(sequence_num_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Request_Context_Repository().set_transaction_depth(transaction_depth-1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (transaction_depth > 1) {
twoway_set_update(successor, state ACE_ENV_ARG_PARAMETER);
@@ -129,14 +123,12 @@ Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
do {
ACE_TRY {
successor->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH(CORBA::COMM_FAILURE, ex) {
if (ex.minor() == 6) finished = false;
else ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
} while (!finished);
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
index 50b18dd95ee..e3aa138bdd1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -35,7 +35,7 @@ public:
Basic_Replication_Strategy(bool mt);
~Basic_Replication_Strategy();
- virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL);
+ virtual void check_validity(void);
virtual void replicate_request(const FTRT::State& state,
RollbackOperation rollback,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index 14ec7a5c533..10aba5e1554 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -29,19 +29,18 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void)
RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_FTEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" ));
- return obtain_proxy(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return obtain_proxy();
}
void
TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj)
{
ACE_TRY_NEW_ENV {
- obj->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ obj->disconnect_push_supplier();
}
ACE_CATCHALL {
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 042172fc555..dbaf815d55e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -61,7 +61,7 @@ public:
// = The RtecEventChannelAdmin::ConsumerAdmin methods...
virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index a2e2b7a29cd..fb8cc2f66e3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -56,13 +56,11 @@ void setup_object_group(TAO_FTEC_Event_Channel* es,
resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context,
FTRTEC::Identification_Service::instance()->name()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n"));
primary->join_group(member_list[0] ACE_ENV_ARG_PARAMETER);
}
- ACE_CHECK;
}
}
@@ -94,14 +92,12 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
Request_Context_Repository().init(orb_.in());
// get POAManager
- PortableServer::POAManager_var mgr = poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ PortableServer::POAManager_var mgr = poa_->the_POAManager();
TAO::Utils::PolicyList_Destroyer policy_list(2);
persistent_poa_ =
create_persistent_poa(poa_, mgr, "FTEC_Persistant_POA", policy_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
// Activate the Event channel implementation
@@ -129,12 +125,10 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
supplier_admin_object_id,
consumer_admin_object_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
FtRtecEventChannelAdmin::EventChannel_var result;
activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
setup_object_group(this,
@@ -177,17 +171,17 @@ void TAO_FTEC_Event_Channel::oneway_set_update (
RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_FTEC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return ec_impl_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return ec_impl_->for_consumers();
}
RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_FTEC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return ec_impl_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return ec_impl_->for_suppliers();
}
@@ -200,14 +194,13 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s ACE_ENV_ARG_DECL)
}
void
-TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (Fault_Detector::instance())
Fault_Detector::instance()->stop();
- ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl_->destroy ();
this->orb_->shutdown ();
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index 397aa0af43e..d2cb2269b98 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -64,14 +64,14 @@ public:
/// RtecEventChannelAdmin::EventChannel Interface
virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::Observer_Handle
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 0d85bbe8155..304d45891ba 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -25,7 +25,6 @@ void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
ec->consumer_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
@@ -33,7 +32,6 @@ void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
ec->supplier_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
@@ -45,21 +43,18 @@ void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
- ec->supplier_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ec->supplier_admin()->obtain();
- ACE_CHECK;
ACE_TRY {
consumer->connect_push_supplier(push_supplier, qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
ec->supplier_admin()->disconnect(consumer.in());
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
@@ -68,7 +63,6 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa= ec->supplier_poa();
- ACE_CHECK;
FtRtecEventChannelAdmin::Connect_push_supplier_param& param
= op.param.connect_supplier_param();
@@ -87,7 +81,6 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
param.qos
ACE_ENV_ARG_PARAMETER);
}
- ACE_CHECK;
}
void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
@@ -99,21 +92,18 @@ void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
- ec->consumer_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ec->consumer_admin()->obtain();
- ACE_CHECK;
ACE_TRY {
supplier->connect_push_consumer(push_consumer, qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
ec->consumer_admin()->disconnect(supplier.in());
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
@@ -122,7 +112,6 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa= ec->consumer_poa();
- ACE_CHECK;
FtRtecEventChannelAdmin::Connect_push_consumer_param& param
= op.param.connect_consumer_param();
@@ -140,7 +129,6 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
param.qos
ACE_ENV_ARG_PARAMETER);
}
- ACE_CHECK;
}
void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
@@ -148,7 +136,6 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa= ec->consumer_poa();
- ACE_CHECK;
TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id);
@@ -156,9 +143,7 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
if (proxy == NULL) // proxy not found
ACE_THROW(FTRT::InvalidUpdate());
- ACE_CHECK;
- proxy->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->disconnect_push_supplier();
}
void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
@@ -166,16 +151,13 @@ void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa= ec->supplier_poa();
- ACE_CHECK;
TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id);
if (proxy == NULL) // proxy not found
ACE_THROW(FTRT::InvalidUpdate());
- ACE_CHECK;
- proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->disconnect_push_consumer();
}
@@ -184,7 +166,6 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec,
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa= ec->consumer_poa();
- ACE_CHECK;
TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id);
@@ -192,9 +173,7 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec,
if (proxy == NULL) // proxy not found
ACE_THROW(FTRT::InvalidUpdate());
- ACE_CHECK;
- proxy->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->suspend_connection();
}
void resume_connection(TAO_FTEC_Event_Channel_Impl* ec,
@@ -207,9 +186,7 @@ void resume_connection(TAO_FTEC_Event_Channel_Impl* ec,
if (proxy == NULL) // proxy not found
ACE_THROW(FTRT::InvalidUpdate());
- ACE_CHECK;
- proxy->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->resume_connection();
}
@@ -262,28 +239,24 @@ TAO_FTEC_Event_Channel_Impl::activate_object (
{
iogr_maker_.init(orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- TAO_EC_Event_Channel_Base::activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_EC_Event_Channel_Base::activate();
supplier_admin()->activate(supplier_admin_oid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_admin()->activate(consumer_admin_oid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// = The RtecEventChannelAdmin::EventChannel methods...
/// The default implementation is:
-/// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+/// this->consumer_admin ()->_this ();
RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_FTEC_Event_Channel_Impl::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel_Impl::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::Object_var obj = consumer_admin()->reference(ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Object_var obj = consumer_admin()->reference();
obj = IOGR_Maker::instance()->forge_iogr(obj.in()
ACE_ENV_ARG_PARAMETER);
return RtecEventChannelAdmin::ConsumerAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
@@ -291,12 +264,12 @@ ACE_THROW_SPEC ((CORBA::SystemException))
/// The default implementation is:
-/// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+/// this->supplier_admin ()->_this ();
RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_FTEC_Event_Channel_Impl::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel_Impl::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::Object_var obj = supplier_admin()->reference(ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Object_var obj = supplier_admin()->reference();
obj = IOGR_Maker::instance()->forge_iogr(obj.in()
ACE_ENV_ARG_PARAMETER);
return RtecEventChannelAdmin::SupplierAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
@@ -311,8 +284,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
)
{
CORBA::Any_var any
- = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ = Request_Context_Repository().get_cached_result();
FtRtecEventChannelAdmin::ObjectId *oid;
@@ -337,7 +309,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
return object_id._retn();
}
@@ -351,8 +322,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
)
{
CORBA::Any_var any
- = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ = Request_Context_Repository().get_cached_result();
FtRtecEventChannelAdmin::ObjectId *oid;
@@ -376,7 +346,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
return object_id._retn();
@@ -395,9 +364,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier (
if (proxy == NULL) // proxy not found
return;
- ACE_CHECK;
- proxy->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->disconnect_push_supplier();
}
void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer (
@@ -413,9 +380,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer (
if (proxy == NULL) // proxy not found
return;
- ACE_CHECK;
- proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->disconnect_push_consumer();
}
void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
@@ -431,9 +396,7 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
if (proxy == NULL) // proxy not found
ACE_THROW(FtRtecEventComm::InvalidObjectID());
- ACE_CHECK;
- proxy->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->suspend_connection();
}
@@ -450,9 +413,7 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier (
if (proxy == NULL) // proxy not found
ACE_THROW(FtRtecEventComm::InvalidObjectID());
- ACE_CHECK;
- proxy->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy->resume_connection();
}
void TAO_FTEC_Event_Channel_Impl::push (
@@ -479,9 +440,7 @@ void TAO_FTEC_Event_Channel_Impl::get_state (
{
FtEventServiceInterceptor::instance()->get_state(state.cached_operation_results);
this->supplier_admin()->get_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_admin()->get_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -496,9 +455,7 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
FtEventServiceInterceptor::instance()->set_state(state.cached_operation_results);
this->supplier_admin()->set_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_admin()->set_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -506,7 +463,7 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate))
{
- FTRTEC::Replication_Service::instance()->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER);
+ FTRTEC::Replication_Service::instance()->check_validity();
if (!Request_Context_Repository().is_executed_request()) {
Safe_InputCDR cdr((const char*)s.get_buffer(), s.length());
@@ -517,7 +474,6 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
}
(update_table[op->param._d()])(this, *op ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -545,7 +501,6 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAd
const PortableServer::Servant servant = poa->id_to_servant(
reinterpret_cast<const PortableServer::ObjectId&> (id)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj =
dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr> (servant);
@@ -566,7 +521,6 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd
const PortableServer::Servant servant = poa->id_to_servant(
reinterpret_cast<const PortableServer::ObjectId&> (id)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr obj =
dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr> (servant);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index ba6c2e1bc0d..7f7226ca87c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -50,12 +50,12 @@ public:
// = The RtecEventChannelAdmin::EventChannel methods...
virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void get_state (FtRtecEventChannelAdmin::EventChannelState & s
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 80c7ba30a06..b5cd7784f55 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -85,11 +85,10 @@ void TAO_FTEC_Group_Manager::create_group (
GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
GroupInfoPublisherBase::Info_ptr info (
- publisher->setup_info(impl_->info_list,
+ publisher->setup_info(impl_->info_list,
impl_->my_position,
object_group_ref_version
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
publisher->update_info(info);
@@ -109,7 +108,6 @@ void TAO_FTEC_Group_Manager::create_group (
if (!CORBA::is_nil(successor.in())) {
successor->create_group(info_list, object_group_ref_version
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -146,11 +144,10 @@ void TAO_FTEC_Group_Manager::add_member (
GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
GroupInfoPublisherBase::Info_ptr group_info (
- publisher->setup_info(new_impl->info_list,
+ publisher->setup_info(new_impl->info_list,
new_impl->my_position,
object_group_ref_version
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
int last_one = (impl_->my_position == impl_->info_list.length()-1);
@@ -178,13 +175,11 @@ void TAO_FTEC_Group_Manager::add_member (
new_impl->my_position,
object_group_ref_version
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
ACE_AUTO_PTR_RESET(group_info, group_info1.release(), GroupInfoPublisherBase::Info);
last_one = true;
}
ACE_ENDTRY;
- ACE_CHECK;
}
if (last_one)
@@ -240,11 +235,9 @@ void TAO_FTEC_Group_Manager::add_member (
TAO_FTRTEC::Log(2, "Setting state\n");
info.ior->set_state(s ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
info.ior->create_group(new_impl->info_list,
object_group_ref_version
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_FTRTEC::Log(2, "After create_group\n");
}
@@ -296,11 +289,10 @@ void TAO_FTEC_Group_Manager::remove_member (
GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
GroupInfoPublisherBase::Info_ptr info (
- publisher->setup_info(impl_->info_list,
+ publisher->setup_info(impl_->info_list,
impl_->my_position,
object_group_ref_version
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
publisher->update_info(info);
FtRtecEventChannelAdmin::EventChannel_var successor =
@@ -312,7 +304,6 @@ void TAO_FTEC_Group_Manager::remove_member (
successor->remove_member(crashed_location,
object_group_ref_version
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 410377e8a80..cf88341d153 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -29,7 +29,6 @@ FTEC_ORBInitializer::post_init (
{
Request_Context_Repository().allocate_slots(info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableInterceptor::ClientRequestInterceptor_var client_interceptor;
PortableInterceptor::ClientRequestInterceptor_ptr ctmp;
@@ -37,13 +36,11 @@ FTEC_ORBInitializer::post_init (
ACE_NEW_THROW_EX(ctmp,
TAO_Set_Update_Interceptor,
CORBA::NO_MEMORY());
- ACE_CHECK;
client_interceptor = ctmp;
info->add_client_request_interceptor (client_interceptor.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var server_interceptor;
PortableInterceptor::ServerRequestInterceptor_ptr stmp;
@@ -55,7 +52,6 @@ FTEC_ORBInitializer::post_init (
info->add_server_request_interceptor (server_interceptor.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_NEW_THROW_EX(stmp,
FtEventServiceInterceptor,
CORBA::NO_MEMORY());
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 3f489f9540f..fdb274cb34c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -37,12 +37,9 @@ TAO_FTEC_ProxyPushConsumer::activate (
{
result = RtecEventChannelAdmin::ProxyPushConsumer::_nil();
ACE_TRY {
- object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ object_id_ = Request_Context_Repository().get_object_id();
+ PortableServer::POA_var poa = _default_POA();
activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -71,7 +68,6 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
update.param.connect_supplier_param(param);
Inherited::connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY {
FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
@@ -80,17 +76,15 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
svc->replicate_request(update,
&FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
- this->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect_push_consumer();
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
-void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (Request_Context_Repository().is_executed_request())
@@ -99,14 +93,12 @@ void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DE
update.object_id = id();
update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_CONSUMER);
- Inherited::disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Inherited::disconnect_push_consumer();
FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 518e4f73eb0..205fdf5fd7d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -46,7 +46,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecEventChannelAdmin::AlreadyConnected));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
const FtRtecEventChannelAdmin::ObjectId& id() const;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 62fad4ef9d7..61b80fd1439 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -38,12 +38,9 @@ TAO_FTEC_ProxyPushSupplier::activate (
result =
RtecEventChannelAdmin::ProxyPushSupplier::_nil();
ACE_TRY {
- object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ object_id_ = Request_Context_Repository().get_object_id();
+ PortableServer::POA_var poa = _default_POA();
activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -72,7 +69,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
update.param.connect_consumer_param(param);
Inherited::connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY {
FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
@@ -82,7 +78,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
svc->replicate_request(update,
&FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
}
@@ -90,7 +85,7 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
}
-void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (Request_Context_Repository().is_executed_request())
@@ -100,18 +95,16 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DE
update.object_id = id();
update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_SUPPLIER);
- Inherited::disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Inherited::disconnect_push_supplier();
FTRTEC::Replication_Service *svc = FTRTEC::Replication_Service::instance();
ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (Request_Context_Repository().is_executed_request())
@@ -121,8 +114,7 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
update.object_id = id();
update.param._d(FtRtecEventChannelAdmin::SUSPEND_CONNECTION);
- Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Inherited::suspend_connection();
ACE_TRY
{
@@ -132,16 +124,15 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
svc->replicate_request(update,
&FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
- this->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->resume_connection();
ACE_RE_THROW;
}
ACE_ENDTRY;
}
-void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (Request_Context_Repository().is_executed_request())
@@ -152,8 +143,7 @@ void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
update.object_id = id();
update.param._d(FtRtecEventChannelAdmin::RESUME_CONNECTION);
- Inherited::resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Inherited::resume_connection();
ACE_TRY {
FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
@@ -163,10 +153,9 @@ void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
svc->replicate_request(update,
&FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
- this->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->suspend_connection();
ACE_RE_THROW;
}
ACE_ENDTRY;
@@ -195,7 +184,7 @@ void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyP
state.parameter.info().qos
ACE_ENV_ARG_PARAMETER);
if (state.suspended)
- Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
+ Inherited::suspend_connection();
}
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index 34c38f96400..67ac4929f26 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -46,11 +46,11 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
RtecEventChannelAdmin::AlreadyConnected,
RtecEventChannelAdmin::TypeError));
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void suspend_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void resume_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException));
const FtRtecEventChannelAdmin::ObjectId& id() const;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index 74a666746cc..ffc32da67d3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -27,18 +27,17 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin()
RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_FTEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_SupplierAdmin::obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return obtain_proxy(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return obtain_proxy();
}
void
TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj)
{
ACE_TRY_NEW_ENV {
- obj->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ obj->disconnect_push_consumer();
}
ACE_CATCHALL
{
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index 814061c0263..cd1e66b26ac 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -67,7 +67,7 @@ public:
// = The RtecEventChannelAdmin::SupplierAdmin methods...
virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index 5fb7d08ad06..f05e8c534a8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -27,23 +27,22 @@ FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
ACE_ENV_ARG_DECL)
{
poa_->activate_object_with_id(
- reinterpret_cast<const PortableServer::ObjectId&> (oid),
+ reinterpret_cast<const PortableServer::ObjectId&> (oid),
servant_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
object_id_ = oid;
}
const FtRtecEventComm::ObjectId&
-FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+FT_ProxyAdmin_Base::object_id(void) const
{
return object_id_;
}
CORBA::Object_var
-FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const
+FT_ProxyAdmin_Base::reference(void) const
{
return poa_->servant_to_reference(servant_
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index 2c639c0ce6f..cc0eca54ce0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -33,10 +33,10 @@ public:
void activate(const FtRtecEventComm::ObjectId& oid
ACE_ENV_ARG_DECL);
- const FtRtecEventComm::ObjectId& object_id(ACE_ENV_SINGLE_ARG_DECL) const;
+ const FtRtecEventComm::ObjectId& object_id(void) const;
/// Returns an CORBA object reference when the servant is activated
- CORBA::Object_var reference(ACE_ENV_SINGLE_ARG_DECL) const;
+ CORBA::Object_var reference(void) const;
protected:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index 188bdcab7e8..303724cf69d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -26,8 +26,7 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
ACE_ENV_ARG_PARAMETER);
ProxyInterface_var result
- = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ = admin_->obtain();
FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
ACE_TRY {
@@ -36,23 +35,20 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
svc->replicate_request(op,
Proxy::rollback_obtain
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
admin_->disconnect(result.in());
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
template <class EC_PROXY_ADMIN, class Proxy,
class ProxyInterface, class State>
typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr
-FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_ENV_SINGLE_ARG_DECL)
+FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
{
- CORBA::Any_var any = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ CORBA::Any_var any = Request_Context_Repository().get_cached_result();
CORBA::Object_var obj;
if (any >>= CORBA::Any::to_object(obj))
@@ -61,7 +57,6 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E
FtRtecEventChannelAdmin::ObjectId oid;
Request_Context_Repository().generate_object_id(oid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
FtRtecEventChannelAdmin::Operation update;
@@ -69,23 +64,19 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E
update.param._d(EC_PROXY_ADMIN::OBTAIN_ID);
ProxyInterface_var result
- = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ = admin_->obtain();
ACE_TRY {
FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
obj = IOGR_Maker::instance()->forge_iogr(result.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
svc->replicate_request(update,
Proxy::rollback_obtain
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
admin_->disconnect(result.in());
@@ -105,7 +96,6 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::get_state(
{
typename EC_PROXY_ADMIN::StateWorker worker(state.proxies);
admin_->for_each(&worker ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
template <class EC_PROXY_ADMIN, class Proxy,
@@ -121,26 +111,21 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state(
Request_Context_Repository().set_object_id(proxy_state.object_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ProxyInterface_var
- proxy_ior = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ proxy_ior = admin_->obtain();
typedef typename Proxy::Skeleton Skeleton;
const void *temp = &proxy_state.object_id;
const PortableServer::ObjectId *oid =
reinterpret_cast<const PortableServer::ObjectId *> (temp);
- const PortableServer::Servant servant =
+ const PortableServer::Servant servant =
poa_->id_to_servant (*oid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Skeleton skeleton = dynamic_cast<Skeleton> (servant);
- ACE_CHECK;
static_cast<Proxy*> (skeleton)->set_state(proxy_state
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index 92e2bf0ad6d..f574107851f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -33,7 +33,7 @@ public:
FT_ProxyAdmin(EC_PROXY_ADMIN* admin,
PortableServer::POA_var poa);
- ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ ProxyInterface_ptr obtain_proxy (void);
/// this is used for updating the state
void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index ee750df8f22..5495a55f324 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -22,38 +22,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri
ACE_ENV_ARG_DECL)
{
- CORBA::String_var orb_id = ri->orb_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
+ CORBA::String_var orb_id = ri->orb_id();
int argc =0;
char** argv =0;
CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, orb_id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
PortableServer::POA_var poa =
resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
PortableInterceptor::AdapterName_var adaptor_name =
- ri->adapter_name(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
+ ri->adapter_name();
for (size_t i = 1; i < adaptor_name->length(); ++i) {
poa = poa->find_POA((*adaptor_name)[i] , false
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
}
CORBA::OctetSeq_var oid =
- ri->object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
+ ri->object_id();
CORBA::Object_var obj =
poa->id_to_reference(oid.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
return obj._retn();
}
@@ -63,11 +56,9 @@ CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri
{
CORBA::Object_var target =
get_target(ri ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
TAO::ObjectKey_var key =
- target->_key(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
+ target->_key();
CORBA::Object_var iogr =
GroupInfoPublisher::instance()->group_reference();
@@ -75,7 +66,6 @@ CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri
CORBA::Object_var forward =
IOGR_Maker::instance()->ior_replace_key(iogr.in(), key.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
return forward._retn();
}
@@ -89,13 +79,13 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor()
{
}
-char * ForwardCtrlServerInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+char * ForwardCtrlServerInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup("ForwardCtrlServerInterceptor");
}
-void ForwardCtrlServerInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void ForwardCtrlServerInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -109,14 +99,12 @@ void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerR
IOP::ServiceContext_var service_context =
ri->get_request_service_context(IOP::FT_GROUP_VERSION
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY {
// not an FT call , continue to process the request
return;
}
ACE_ENDTRY;
- ACE_CHECK;
GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
if (!publisher->is_primary()) {
@@ -169,7 +157,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
ACE_TRY_EX(block1)
{
- if (!ri->response_expected(ACE_ENV_SINGLE_ARG_PARAMETER))
+ if (!ri->response_expected())
return;
ACE_TRY_CHECK_EX(block1);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index d53dc682b0e..9690d1ffc67 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -28,10 +28,10 @@ public:
ForwardCtrlServerInterceptor();
~ForwardCtrlServerInterceptor();
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 779396ce1ee..7caca5d3fbf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -85,7 +85,6 @@ retrieve_ft_request_context(
ACE_ENV_ARG_DECL)
{
service_context = ri->get_request_service_context(IOP::FT_REQUEST ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const char * buf =
reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -115,7 +114,6 @@ get_transaction_depth_context(
ACE_TRY {
service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::BAD_PARAM, ex)
{
@@ -152,7 +150,6 @@ get_sequence_number_context(
IOP::ServiceContext_var service_context;
service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
const char * buf =
reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -193,14 +190,14 @@ FtEventServiceInterceptor::instance()
}
char *
-FtEventServiceInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FtEventServiceInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("FtEventServiceInterceptor");
}
void
-FtEventServiceInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FtEventServiceInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -221,8 +218,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
if (ACE_OS::strcmp(operation.in(), "push") == 0) {
TAO_FTRTEC::Log(3, "Received push command\n");
return;
@@ -295,7 +291,6 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt
service_context,
ft_request_service_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::BAD_PARAM, ex) {
return;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 09a28a81257..80beac8a655 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -54,10 +54,10 @@ public:
~FtEventServiceInterceptor();
static FtEventServiceInterceptor* instance();
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 63d7801689e..165ea3115a0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -87,12 +87,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
CORBA::Object_var obj =
IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
result->iogr =
::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ACE_DEBUG((LM_DEBUG, "In setup_info\n"));
//log_obj_endpoints(result->iogr.in());
@@ -109,12 +107,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
obj = IOGR_Maker::instance()->merge_iors(iors
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
result->successor =
FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
/*
else {
@@ -137,7 +133,6 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
ACE_ENV_ARG_PARAMETER);
//CORBA::PolicyList_var pols;
//result->backups[i]->_validate_connection (pols.out ());
- ACE_CHECK_RETURN(0);
}
return result.release();
}
@@ -157,7 +152,6 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
ACE_TRY_NEW_ENV {
naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(),
info->iogr.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHALL {
/// there's nothing we can do if the naming service is down
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index e64501e5e18..1c9a6e40988 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -64,7 +64,6 @@ IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list,
{
/// generate a new IOGR if the object group changes.
CORBA::Object_var obj = merge_iors(list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
FT::TagFTGroupTaggedComponent ft_tag_component(ft_tag_component_);
/// the generated IOGR should use a new object_group_ref_version
@@ -72,7 +71,6 @@ IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list,
set_tag_components(obj.in(), list[0], ft_tag_component
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
return obj._retn();
}
@@ -93,11 +91,10 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
FtRtecEventChannelAdmin::EventChannel_var successor
= GroupInfoPublisher::instance()->successor();
if (! CORBA::is_nil(successor.in())) {
- TAO::ObjectKey_var newkey = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER);
+ TAO::ObjectKey_var newkey = obj->_key();
CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil());
if (CORBA::is_nil( new_base.in() ))
return CORBA::Object::_nil();
@@ -109,7 +106,6 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
TAO_Stub *stub = orb_core->create_stub (CORBA::string_dup(obj->_stubobj ()->type_id.in ()), // give the id string
base_profiles
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Make the stub memory allocation exception safe for the duration
// of this method.
@@ -129,7 +125,6 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
merged =
iorm_->add_profiles(obj, temp_obj
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
else
merged = CORBA::Object::_duplicate(obj);
@@ -137,7 +132,6 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
set_tag_components(merged.in(), obj, ft_tag_component_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil ());
return merged._retn();
}
@@ -155,8 +149,7 @@ IOGR_Maker::ior_replace_key(CORBA::Object_ptr obj,
ACE_CDR::consolidate(&mb, out_cdr.begin());
- TAO::ObjectKey_var old_key = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(CORBA::Object::_nil ());
+ TAO::ObjectKey_var old_key = obj->_key();
replace_key(mb.base(), mb.end(),
old_key.in(), key);
@@ -242,7 +235,7 @@ IOGR_Maker::get_ref_version() const
void
IOGR_Maker::set_tag_components(
- CORBA::Object_ptr merged,
+ CORBA::Object_ptr merged,
CORBA::Object_ptr primary,
FT::TagFTGroupTaggedComponent& ft_tag_component
ACE_ENV_ARG_DECL)
@@ -253,11 +246,9 @@ IOGR_Maker::set_tag_components(
prop.remove_primary_tag(merged
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
iorm_->set_primary (&prop, merged, primary
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Set the property
iorm_->set_property (&prop,
merged
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index fbb8c4166a4..d6a5a0ac5a4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -26,7 +26,7 @@ ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *
{
}
-void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void ObjectGroupManagerHandler::create_group (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -40,7 +40,7 @@ ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *
}
void
-ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::add_member (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (--num_backups_ ==0)
@@ -52,11 +52,11 @@ ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->add_member(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->add_member();
}
void
-ObjectGroupManagerHandler::set_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::set_state (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8a3938a6c65..bdff8796543 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -31,21 +31,21 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void create_group (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void create_group (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void add_member (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void add_member (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void set_state (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void set_state (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 753cd359248..d6ff22f60fe 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -87,12 +87,10 @@ namespace FTRTEC
ACE_NEW_THROW_EX (temp_orb_initializer,
FTEC_ORBInitializer,
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
orb_initializer = temp_orb_initializer;
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -120,9 +118,9 @@ namespace FTRTEC
}
}
- void Replication_Service::check_validity(ACE_ENV_SINGLE_ARG_DECL)
+ void Replication_Service::check_validity(void)
{
- replication_strategy->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER);
+ replication_strategy->check_validity();
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index e1deca2f103..b6763393a01 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -45,7 +45,7 @@ namespace FTRTEC
/**
* Used for checking if the incoming replication message is out of sequence.
*/
- void check_validity(ACE_ENV_SINGLE_ARG_DECL);
+ void check_validity(void);
typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
(const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index f7cc5f524f7..db6c4497c52 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -21,7 +21,7 @@ Replication_Strategy::~Replication_Strategy()
void
-Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Replication_Strategy::check_validity(void)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 8c661ee0ee8..289cd2a337b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -37,7 +37,7 @@ public:
* used for basic replication strategy. It throws FTRT::OutOfSequence when the
* incoming request is not valid.
*/
- virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL);
+ virtual void check_validity(void);
typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
(const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index f04af729152..2ba591d172e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -30,11 +30,11 @@ void
Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
ACE_ENV_ARG_DECL)
{
- object_id_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- cached_result_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- seq_num_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ft_request_service_context_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- transaction_depth_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
+ object_id_slot = info->allocate_slot_id();
+ cached_result_slot = info->allocate_slot_id();
+ seq_num_slot = info->allocate_slot_id();
+ ft_request_service_context_slot = info->allocate_slot_id();
+ transaction_depth_slot = info->allocate_slot_id();
}
void
@@ -51,7 +51,6 @@ void Request_Context_Repository::generate_object_id(
UUID::create(oid.get_buffer());
set_object_id(oid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -63,14 +62,12 @@ Request_Context_Repository::set_object_id(
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Any a;
a <<= object_id;
pic->set_slot(object_id_slot, a
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*/
*oid = object_id;
}
@@ -95,17 +92,15 @@ get_object_id(CORBA::Any_var a
FtRtecEventChannelAdmin::ObjectId_var
-Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_object_id(void)
{
/*
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var());
CORBA::Any_var a = pic->get_slot(object_id_slot
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var());
return ::get_object_id(a
ACE_ENV_ARG_PARAMETER);
@@ -124,7 +119,6 @@ Request_Context_Repository::get_object_id(
{
CORBA::Any_var a = ri->get_slot(object_id_slot
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var());
return ::get_object_id(a
ACE_ENV_ARG_PARAMETER);
@@ -142,27 +136,23 @@ Request_Context_Repository::set_cached_result(
}
CORBA::Any_ptr
-Request_Context_Repository::get_cached_result(ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_cached_result(void)
{
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
CORBA::Any_var a = pic->get_slot(cached_result_slot
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
return a._retn();
}
bool Request_Context_Repository::is_executed_request()
{
ACE_TRY_NEW_ENV {
- CORBA::Any_var any = get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var any = get_cached_result();
CORBA::TypeCode_var type = any->type();
- CORBA::TCKind const kind = type->kind(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::TCKind const kind = type->kind();
return kind != CORBA::tk_null;
}
ACE_CATCHALL {
@@ -192,7 +182,6 @@ Request_Context_Repository::set_sequence_number(
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Any a;
@@ -203,14 +192,12 @@ Request_Context_Repository::set_sequence_number(
FTRT::SequenceNumber
-Request_Context_Repository::get_sequence_number(ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_sequence_number(void)
{
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
CORBA::Any_var a = pic->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
FTRT::SequenceNumber result = 0;
a >>= result;
return result;
@@ -222,7 +209,6 @@ Request_Context_Repository::get_sequence_number(
ACE_ENV_ARG_DECL)
{
CORBA::Any_var a = ri->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
FTRT::SequenceNumber result = 0;
a >>= result;
return result;
@@ -259,7 +245,6 @@ Request_Context_Repository::set_transaction_depth(
a <<= depth;
ri->set_slot(transaction_depth_slot,a
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -270,13 +255,11 @@ Request_Context_Repository::set_transaction_depth(
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Any a;
a <<= depth;
pic->set_slot(transaction_depth_slot,a
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -287,7 +270,6 @@ Request_Context_Repository::get_transaction_depth(
{
CORBA::Any_var a = ri->get_slot(transaction_depth_slot
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
FTRT::TransactionDepth result=0;
a >>= result;
return result;
@@ -301,11 +283,9 @@ Request_Context_Repository::get_transaction_depth(
PortableInterceptor::Current_var pic =
resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
CORBA::Any_var a = pic->get_slot(transaction_depth_slot
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
FTRT::TransactionDepth result=0;
a >>= result;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 542f58937ea..ed33ceecfb7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -62,7 +62,7 @@ public:
ACE_ENV_ARG_DECL);
void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id
ACE_ENV_ARG_DECL);
- FtRtecEventChannelAdmin::ObjectId_var get_object_id(ACE_ENV_SINGLE_ARG_DECL);
+ FtRtecEventChannelAdmin::ObjectId_var get_object_id(void);
FtRtecEventChannelAdmin::ObjectId_var
get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri
ACE_ENV_ARG_DECL);
@@ -71,7 +71,7 @@ public:
const CORBA::Any& result
ACE_ENV_ARG_DECL);
- CORBA::Any_ptr get_cached_result(ACE_ENV_SINGLE_ARG_DECL);
+ CORBA::Any_ptr get_cached_result(void);
bool is_executed_request();
void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri,
@@ -83,7 +83,7 @@ public:
FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri
ACE_ENV_ARG_DECL);
- FTRT::SequenceNumber get_sequence_number(ACE_ENV_SINGLE_ARG_DECL);
+ FTRT::SequenceNumber get_sequence_number(void);
void set_ft_request_service_context(
PortableInterceptor::ServerRequestInfo_ptr ri,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 58e96befd06..6f8af93e08b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -21,14 +21,14 @@ TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void)
}
char *
-TAO_Set_Update_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Set_Update_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->myname_);
}
void
-TAO_Set_Update_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Set_Update_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -49,14 +49,12 @@ TAO_Set_Update_Interceptor::send_request (
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var operation = ri->operation ();
if (strcmp(operation.in(), "set_update")==0 ||
strcmp(operation.in(), "oneway_set_update") ==0) {
CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
IOP::ServiceContext* sc;
@@ -64,7 +62,6 @@ TAO_Set_Update_Interceptor::send_request (
return;
ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
FTRT::TransactionDepth transaction_depth =
Request_Context_Repository().get_transaction_depth(ri ACE_ENV_ARG_PARAMETER);
@@ -98,7 +95,6 @@ TAO_Set_Update_Interceptor::send_request (
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
cdr.reset();
}
@@ -134,7 +130,6 @@ TAO_Set_Update_Interceptor::send_request (
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index c164c238281..c6ea6c68675 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -47,11 +47,11 @@ public:
virtual ~TAO_Set_Update_Interceptor ();
// dtor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Canonical name of the interceptor.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index fadeb16f0e0..f8f9a9fd3c9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -47,11 +47,9 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_
resolve_init<PortableServer::Current>(strategy_->orb(),
"POACurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::ObjectId_var object_id =
- current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ current->get_object_id();
Update_Manager* mgr;
int id;
@@ -87,7 +85,6 @@ void UpdateableHandler::set_update_excep (
ACE_DEBUG((LM_DEBUG, "Received Exception from"));
ACE_TRY {
excep_holder->raise_exception();
- ACE_TRY_CHECK;
}
ACE_CATCHANY {
ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A corba exception\n");
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index fe5cd5dbe41..e35181a00b2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -18,30 +18,24 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
PortableServer::LifespanPolicy_var lifespan =
root_poa->create_lifespan_policy(PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(result);
// create a USER_ID IdAssignmentPolicy object
PortableServer::IdAssignmentPolicy_var assign =
root_poa->create_id_assignment_policy(PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(result);
// create PolicyList.
size_t orig_len = policy_list.length();
policy_list.length(orig_len+2);
- ACE_CHECK_RETURN(result);
policy_list[orig_len+0]=
PortableServer::LifespanPolicy::_duplicate(lifespan.in());
- ACE_CHECK_RETURN(result);
policy_list[orig_len+1]=
PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
- ACE_CHECK_RETURN(result);
// create the child POA
result = root_poa->create_POA(name, mgr.in(), policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(result);
return result;
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index afbbaf3d051..91b875b8542 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -24,7 +24,7 @@ public:
~FTEC_Gateway_ConsumerAdmin();
// = The RtecEventChannelAdmin::ConsumerAdmin methods...
virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
FTEC_Gateway_Impl* impl_;
};
@@ -37,7 +37,7 @@ public:
~FTEC_Gateway_SupplierAdmin();
// = The RtecEventChannelAdmin::SupplierAdmin methods...
virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
FTEC_Gateway_Impl* impl_;
};
@@ -56,11 +56,11 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
RtecEventChannelAdmin::AlreadyConnected,
RtecEventChannelAdmin::TypeError));
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void suspend_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void resume_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException));
FTEC_Gateway_Impl* impl_;
};
@@ -82,7 +82,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecEventChannelAdmin::AlreadyConnected));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
FTEC_Gateway_Impl* impl_;
@@ -93,7 +93,7 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler
public:
PushConsumerHandler();
~PushConsumerHandler();
- virtual void push (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void push (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void push_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
@@ -107,12 +107,12 @@ class Interceptor_Destoryer : public TAO_ORB_Core
{
public:
inline static void execute(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) {
- static_cast<Interceptor_Destoryer*> (orb->orb_core())->do_it(ACE_ENV_SINGLE_ARG_PARAMETER);
+ static_cast<Interceptor_Destoryer*> (orb->orb_core())->do_it();
}
private:
Interceptor_Destoryer();
- inline void do_it(ACE_ENV_SINGLE_ARG_DECL) {
- destroy_interceptors(ACE_ENV_SINGLE_ARG_PARAMETER);
+ inline void do_it(void) {
+ destroy_interceptors();
};
};
@@ -168,40 +168,33 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
char** argv = 0;
impl_->orb = CORBA::ORB_init(argc, argv, "FTEC_GatewayORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
Interceptor_Destoryer::execute(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
poa = resolve_init<PortableServer::POA>(impl_->orb.in(), "RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
- mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ mgr = poa->the_POAManager();
- mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
+ mgr->activate();
}
else {
poa = PortableServer::POA::_duplicate(root_poa);
- mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
+ mgr = poa->the_POAManager();
}
- ACE_CHECK_RETURN(0);
PortableServer::IdUniquenessPolicy_var id_uniqueness_policy =
poa->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
PortableServer::LifespanPolicy_var lifespan =
poa->create_lifespan_policy(PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
// create a USER_ID IdAssignmentPolicy object
PortableServer::IdAssignmentPolicy_var assign =
poa->create_id_assignment_policy(PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
CORBA::PolicyList policy_list;
policy_list.length(3);
@@ -215,7 +208,6 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
impl_->poa = poa->create_POA("gateway_poa", mgr.in(), policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
id_uniqueness_policy->destroy();
lifespan->destroy();
@@ -228,40 +220,37 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
RtecEventChannelAdmin::EventChannel_var gateway;
activate_object_with_id(gateway.out(), impl_->poa.in(), this, oid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
++oid[9];
activate_object_with_id(impl_->consumer_admin.out(),
impl_->poa.in(),
&impl_->consumer_admin_servant,
oid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
++oid[9];
activate_object_with_id(impl_->supplier_admin.out(),
impl_->poa.in(),
&impl_->supplier_admin_servant,
oid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
return gateway._retn();
}
//= The RtecEventChannelAdmin::EventChannel methods
RtecEventChannelAdmin::ConsumerAdmin_ptr
-FTEC_Gateway::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTEC_Gateway::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in());
}
RtecEventChannelAdmin::SupplierAdmin_ptr
-FTEC_Gateway::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTEC_Gateway::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n"));
return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in());
}
-void FTEC_Gateway::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void FTEC_Gateway::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
impl_->ftec->destroy();
@@ -294,12 +283,10 @@ void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consu
{
PortableServer::ObjectId_var object_id =
impl_->poa->reference_to_id(proxy_consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
FtRtecEventComm::ObjectId** result;
memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
impl_->ftec->push(**result, data ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -315,7 +302,7 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin()
}
RtecEventChannelAdmin::ProxyPushSupplier_ptr
-FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -346,7 +333,7 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin()
// = The RtecEventChannelAdmin::SupplierAdmin methods...
RtecEventChannelAdmin::ProxyPushConsumer_ptr
-FTEC_Gateway_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
@@ -371,11 +358,9 @@ get_remote_oid_ptr(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
resolve_init<PortableServer::Current>(orb,
"POACurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
PortableServer::ObjectId_var object_id =
- current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ current->get_object_id();
FtRtecEventComm::ObjectId** result;
memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
@@ -405,39 +390,31 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
impl_->ftec->disconnect_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
delete *oid_ptr;
delete oid_ptr;
}
-void FTEC_Gateway_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
impl_->ftec->suspend_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-void FTEC_Gateway_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushSupplier::resume_connection (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
impl_->ftec->resume_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
/// FTEC_Gateway_ProxyPushConsumer
@@ -459,12 +436,10 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data
ACE_THROW_SPEC ((CORBA::SystemException))
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
/*
if (CORBA::is_nil(impl_->push_handler.in())) {
- impl_->push_handler = impl_->push_handler_servant._this(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl_->push_handler = impl_->push_handler_servant._this();
}
impl_->ftec->sendc_push (impl_->push_handler.in(),
@@ -472,7 +447,6 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data
data ACE_ENV_ARG_PARAMETER);
*/
impl_->ftec->push(**oid_ptr, data ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
@@ -483,18 +457,14 @@ void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
RtecEventChannelAdmin::AlreadyConnected))
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
*oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
impl_->ftec->disconnect_push_consumer(**oid_ptr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
delete *oid_ptr;
delete oid_ptr;
}
@@ -507,7 +477,7 @@ PushConsumerHandler::~PushConsumerHandler()
{
}
-void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void PushConsumerHandler::push (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index 3db7660c7ad..df9227ed69c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -35,18 +35,18 @@ namespace TAO_FTRTEC
ACE_ENV_ARG_DECL);
RtecEventChannelAdmin::EventChannel_ptr
- _this(ACE_ENV_SINGLE_ARG_DECL);
+ _this(void);
//= The RtecEventChannelAdmin::EventChannel methods
virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC((CORBA::SystemException));
virtual RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void destroy (void)
ACE_THROW_SPEC((CORBA::SystemException));
virtual RtecEventChannelAdmin::Observer_Handle
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
index 4a4869aece4..9e1661f75ff 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO_FTRTEC {
ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
- FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL)
+ FTEC_Gateway::_this(void)
{
PortableServer::POA_var poa = _default_POA();
return activate(poa.in() ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
index 9913cc8c8c9..286cf36e21a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
@@ -28,12 +28,10 @@ activate_object_with_id (T * &result,
poa->activate_object_with_id(id,
servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var object =
poa->id_to_reference(id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
index c489912d527..6fb74c86407 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
@@ -26,7 +26,6 @@ resolve_init (CORBA::ORB_ptr orb,
{
CORBA::Object_var obj;
obj = orb->resolve_initial_references(id ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ref = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
}
@@ -59,7 +58,6 @@ resolve (CosNaming::NamingContext_ptr context,
{
CORBA::Object_var obj;
obj = context->resolve(id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(T::_nil());
ACE_ASSERT(!CORBA::is_nil(obj.in()));
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index bb17e23bb3b..b41499fce78 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -190,9 +190,9 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *,
this->active_connect_strategy_->synch_options (timeout,
synch_options);
- // The code used to set the timeout to zero, with the intent of
+ // The code used to set the timeout to zero, with the intent of
// polling the reactor for connection completion. However, the side-effect
- // was to cause the connection to timeout immediately.
+ // was to cause the connection to timeout immediately.
// This is where we need to set the ACE::HTBP::Stream to the connection
// handler.
@@ -347,7 +347,7 @@ TAO::HTIOP::Connector::create_profile (TAO_InputCDR& cdr)
* @brief Create a profile with a given endpoint.
*/
TAO_Profile *
-TAO::HTIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO::HTIOP::Connector::make_profile (void)
{
// The endpoint should be of the form:
// N.n@host:port/object_key
@@ -362,7 +362,6 @@ TAO::HTIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return profile;
}
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index 62e06d6a988..eccbb782a3d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -107,7 +107,7 @@ namespace TAO
/// More TAO_Connector methods, please check the documentation on
/// Transport_Connector.h
- virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Profile *make_profile (void);
/// Cancel the passed cvs handler from the connector
/// Its not clear what it means to cancel in HTIOP, since there's no
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 63d4a82db22..1276d226fd6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -285,7 +285,7 @@ TAO::HTIOP::Profile::add_endpoint (TAO::HTIOP::Endpoint *endp)
}
char *
-TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::HTIOP::Profile::to_string (void)
{
CORBA::String_var key;
TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index 938666a6bfc..a72dd921998 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -88,7 +88,7 @@ namespace TAO
* This is used to create url-style reference. Only one
* endpoint is included into the string.
*/
- virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+ virtual char * to_string (void);
/**
* Endpoints are transmitted using TAO-proprietory tagged component.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 9c7831e7387..af5245eff74 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
-ACE_RCSID (IFRService,
- AbstractInterfaceDef_i,
+ACE_RCSID (IFRService,
+ AbstractInterfaceDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,7 +25,7 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void)
}
CORBA::DefinitionKind
-TAO_AbstractInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AbstractInterfaceDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_AbstractInterface;
@@ -38,8 +38,7 @@ TAO_AbstractInterfaceDef_i::is_a (const char *interface_id
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->is_a_i (interface_id
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 308a637d9ac..247f58687fd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -26,26 +26,25 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void)
}
CORBA::DefinitionKind
-TAO_AliasDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AliasDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Alias;
}
CORBA::TypeCode_ptr
-TAO_AliasDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -71,8 +70,7 @@ TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
}
- CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::TypeCode_var tc = impl->type_i ();
return this->repo_->tc_factory ()->create_alias_tc (id.c_str (),
name.c_str (),
@@ -81,19 +79,18 @@ TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::IDLType_ptr
-TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::original_type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->original_type_def_i ();
}
CORBA::IDLType_ptr
-TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::original_type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString original_type;
@@ -105,7 +102,6 @@ TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (original_type,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -118,8 +114,7 @@ TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->original_type_def_i (original_type_def
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 70022598977..a22b674c61e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -24,31 +24,29 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void)
}
CORBA::DefinitionKind
-TAO_ArrayDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Array;
}
void
-TAO_ArrayDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Only if it is (w)string, fixed, array or sequence.
- this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_element_type ();
ACE_TString name;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -61,27 +59,24 @@ TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::TypeCode_var element_typecode =
- this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->element_type_i ();
- CORBA::ULong length = this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::ULong length = this->length_i ();
return this->repo_->tc_factory ()->create_array_tc (
length,
@@ -91,19 +86,18 @@ TAO_ArrayDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::ULong
-TAO_ArrayDef_i::length (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::length (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->length_i ();
}
CORBA::ULong
-TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::length_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int length = 0;
@@ -121,8 +115,7 @@ TAO_ArrayDef_i::length (CORBA::ULong length
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->length_i (length
ACE_ENV_ARG_PARAMETER);
@@ -139,19 +132,18 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length
}
CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->element_type_i ();
}
CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -162,23 +154,22 @@ TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (element_path,
this->repo_);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_ArrayDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->element_type_def_i ();
}
CORBA::IDLType_ptr
-TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -190,7 +181,6 @@ TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (element_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -203,8 +193,7 @@ TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->element_type_def_i (element_type_def
ACE_ENV_ARG_PARAMETER);
@@ -215,8 +204,7 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_element_type ();
char *new_element_path =
TAO_IFR_Service_Utils::reference_to_path (element_type_def);
@@ -266,8 +254,7 @@ TAO_ArrayDef_i::destroy_element_type (
TAO_IDLType_i *impl = this->repo_->select_idltype (def_kind);
impl->section_key (element_key);
- impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->destroy_i ();
break;
}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 0d9ce3b6a42..d4f2e919d8f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -28,33 +28,31 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
}
CORBA::DefinitionKind
-TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Attribute;
}
CORBA::Contained::Description *
-TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Contained::Description *desc_ptr = 0;
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
@@ -67,26 +65,24 @@ TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->make_description (*ad
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval->value <<= ad;
return retval._retn ();
}
CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString type_path;
@@ -98,23 +94,22 @@ TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (type_path,
this->repo_);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_def_i ();
}
CORBA::IDLType_ptr
-TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString type_path;
@@ -126,11 +121,9 @@ TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (type_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return retval._retn ();
}
@@ -142,8 +135,7 @@ TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->type_def_i (type_def
ACE_ENV_ARG_PARAMETER);
@@ -163,19 +155,18 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def
}
CORBA::AttributeMode
-TAO_AttributeDef_i::mode (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::mode (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ATTR_NORMAL);
+ this->update_key ();
- return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->mode_i ();
}
CORBA::AttributeMode
-TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::mode_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int mode = 0;
@@ -193,8 +184,7 @@ TAO_AttributeDef_i::mode (CORBA::AttributeMode mode
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->mode_i (mode
ACE_ENV_ARG_PARAMETER);
@@ -217,11 +207,9 @@ TAO_AttributeDef_i::make_description (
)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ad.name = this->name_i ();
- ad.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ad.id = this->id_i ();
ACE_TString container_id;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -230,18 +218,15 @@ TAO_AttributeDef_i::make_description (
ad.defined_in = container_id.c_str ();
- ad.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ad.version = this->version_i ();
- ad.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ad.type = this->type_i ();
- ad.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ad.mode = this->mode_i ();
}
CORBA::ExceptionDefSeq *
-TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::get_exceptions (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -292,7 +277,6 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (get_ed_seq,
CORBA::ExceptionDefSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
get_ed_seq->length (size);
CORBA::ExceptionDefSeq_var retval = get_ed_seq;
@@ -307,18 +291,16 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
}
CORBA::ExceptionDefSeq *
-TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::put_exceptions (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -369,7 +351,6 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (put_ed_seq,
CORBA::ExceptionDefSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
put_ed_seq->length (size);
CORBA::ExceptionDefSeq_var retval = put_ed_seq;
@@ -384,11 +365,9 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 43e5f4b3ffa..2584f31ab1b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -40,8 +40,7 @@ TAO_ComponentContainer_i::create_component (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+ this->update_key ();
return this->create_component_i (id,
name,
@@ -78,7 +77,6 @@ TAO_ComponentContainer_i::create_component_i (
"defns"
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
if (! CORBA::is_nil (base_component))
{
@@ -99,7 +97,6 @@ TAO_ComponentContainer_i::create_component_i (
this->repo_,
CORBA::dk_Component
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
// Store the id for this - that's what ComponentDescription takes.
ACE_TString base_id;
@@ -148,7 +145,6 @@ TAO_ComponentContainer_i::create_component_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -169,8 +165,7 @@ TAO_ComponentContainer_i::create_home (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
+ this->update_key ();
return this->create_home_i (id,
name,
@@ -211,7 +206,6 @@ TAO_ComponentContainer_i::create_home_i (
"defns"
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
char *base_path = 0;
@@ -277,7 +271,6 @@ TAO_ComponentContainer_i::create_home_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
return CORBA::ComponentIR::HomeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -301,8 +294,7 @@ TAO_ComponentContainer_i::create_event (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+ this->update_key ();
return this->create_event_i (id,
name,
@@ -349,7 +341,6 @@ TAO_ComponentContainer_i::create_event_i (
"defns"
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
this->repo_->config ()->set_integer_value (new_key,
"is_custom",
@@ -382,7 +373,6 @@ TAO_ComponentContainer_i::create_event_i (
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
ACE_TString base_value_id;
this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -553,7 +543,6 @@ TAO_ComponentContainer_i::create_event_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
return CORBA::ComponentIR::EventDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index eb42f8bb52b..d15e0b0986c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -83,26 +83,25 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void)
}
CORBA::DefinitionKind
-TAO_ComponentDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ComponentDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Component;
}
void
-TAO_ComponentDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our special subsections first, then call destroy_i
@@ -114,7 +113,6 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_UsesDef_i>::destroy_special (
"uses",
@@ -122,7 +120,6 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_EmitsDef_i>::destroy_special (
"emits",
@@ -130,7 +127,6 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_PublishesDef_i>::destroy_special (
"publishes",
@@ -138,7 +134,6 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>::destroy_special (
"consumes",
@@ -146,25 +141,23 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
- this->TAO_ExtInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_ExtInterfaceDef_i::destroy_i ();
}
CORBA::Contained::Description *
-TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ComponentIR::ComponentDescription cd;
@@ -175,7 +168,6 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
ACE_TString holder;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -275,17 +267,14 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
impl.section_key (attr_key);
impl.fill_description (cd.attributes[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
- cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ cd.type = this->type_i ();
CORBA::Contained::Description *cont_desc_ptr = 0;
ACE_NEW_THROW_EX (cont_desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = cont_desc_ptr;
cont_desc_ptr->kind = CORBA::dk_Component;
@@ -295,19 +284,18 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -328,19 +316,18 @@ TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::supported_interfaces (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->supported_interfaces_i ();
}
CORBA::InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::supported_interfaces_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::InterfaceDefSeq *seq = 0;
@@ -378,11 +365,9 @@ TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::InterfaceDef::_narrow (tmp.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -398,8 +383,7 @@ TAO_ComponentDef_i::supported_interfaces (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->supported_interfaces_i (supported_interfaces
ACE_ENV_ARG_PARAMETER);
@@ -447,7 +431,6 @@ TAO_ComponentDef_i::supported_interfaces_i (
this->repo_,
this->def_kind ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
this->repo_->config ()->set_string_value (supported_key,
@@ -457,19 +440,18 @@ TAO_ComponentDef_i::supported_interfaces_i (
}
CORBA::ComponentIR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::base_component (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+ this->update_key ();
- return this->base_component_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->base_component_i ();
}
CORBA::ComponentIR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::base_component_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString base_id;
@@ -485,7 +467,6 @@ TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -500,8 +481,7 @@ TAO_ComponentDef_i::base_component (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->base_component_i (base_component
ACE_ENV_ARG_PARAMETER);
@@ -538,7 +518,6 @@ TAO_ComponentDef_i::base_component_i (
this->repo_,
CORBA::dk_Component
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->repo_->config ()->set_string_value (
this->section_key_,
@@ -559,8 +538,7 @@ TAO_ComponentDef_i::create_provides (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ());
+ this->update_key ();
return this->create_provides_i (id,
name,
@@ -605,8 +583,7 @@ TAO_ComponentDef_i::create_uses (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::UsesDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::UsesDef::_nil ());
+ this->update_key ();
return this->create_uses_i (id,
name,
@@ -650,8 +627,7 @@ TAO_ComponentDef_i::create_emits (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EmitsDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EmitsDef::_nil ());
+ this->update_key ();
return this->create_emits_i (id,
name,
@@ -693,8 +669,7 @@ TAO_ComponentDef_i::create_publishes (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::PublishesDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::PublishesDef::_nil ());
+ this->update_key ();
return this->create_publishes_i (id,
name,
@@ -736,8 +711,7 @@ TAO_ComponentDef_i::create_consumes (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ());
+ this->update_key ();
return this->create_consumes_i (id,
name,
@@ -780,7 +754,6 @@ TAO_ComponentDef_i::name_clash (const char *name)
TAO_IFR_Service_Utils::repo_,
CORBA::dk_Component
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index f0efb71adb1..4b071e5cb43 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -14,8 +14,8 @@
#include "orbsvcs/IFRService/ProvidesDef_i.h"
#include "orbsvcs/IFRService/UsesDef_i.h"
-ACE_RCSID (IFRService,
- ComponentRepository_i,
+ACE_RCSID (IFRService,
+ ComponentRepository_i,
"$Id$")
@@ -28,8 +28,8 @@ TAO_ComponentRepository_i::TAO_ComponentRepository_i (
)
: TAO_IRObject_i (0),
TAO_Container_i (0),
- TAO_Repository_i (orb,
- poa,
+ TAO_Repository_i (orb,
+ poa,
config),
TAO_ComponentContainer_i (0)
{
@@ -44,11 +44,10 @@ TAO_ComponentRepository_i::create_servants_and_poas (
ACE_ENV_SINGLE_ARG_DECL
)
{
- int status =
+ int status =
this->TAO_Repository_i::create_servants_and_poas (
ACE_ENV_SINGLE_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -60,43 +59,37 @@ TAO_ComponentRepository_i::create_servants_and_poas (
// ID Assignment Policy.
policies[0] =
- this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+ this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Lifespan Policy.
policies[1] =
- this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+ this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Request Processing Policy.
policies[2] =
this->root_poa_->create_request_processing_policy (
- PortableServer::USE_DEFAULT_SERVANT
+ PortableServer::USE_DEFAULT_SERVANT
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
// Servant Retention Policy.
policies[3] =
this->root_poa_->create_servant_retention_policy (
- PortableServer::NON_RETAIN
+ PortableServer::NON_RETAIN
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
// Id Uniqueness Policy.
policies[4] =
this->root_poa_->create_id_uniqueness_policy (
- PortableServer::MULTIPLE_ID
+ PortableServer::MULTIPLE_ID
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->root_poa_->the_POAManager ();
#define GEN_IR_OBJECT(name) \
this-> name ## _poa_ = \
@@ -104,7 +97,7 @@ TAO_ComponentRepository_i::create_servants_and_poas (
poa_manager.in (), \
policies \
ACE_ENV_ARG_PARAMETER); \
- ACE_CHECK_RETURN (-1); \
+\
TAO_ ## name ## _i * name ## _impl = 0; \
ACE_NEW_RETURN (name ## _impl, \
TAO_ ## name ## _i (this), \
@@ -121,7 +114,6 @@ TAO_ComponentRepository_i::create_servants_and_poas (
); \
this-> name ## _poa_->set_servant (this-> name ## _servant_ \
ACE_ENV_ARG_PARAMETER); \
- ACE_CHECK_RETURN (-1);
CONCRETE_IR_OBJECT_TYPES
@@ -133,8 +125,7 @@ TAO_ComponentRepository_i::create_servants_and_poas (
for (CORBA::ULong i = 0; i < length; ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ policy->destroy ();
}
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index 7690ee20edc..8b126b100f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -71,7 +71,7 @@ public:
virtual ~TAO_ComponentRepository_i (void);
// Destructor.
- virtual int create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int create_servants_and_poas (void);
// We create a default servant servant for each IR Object
// type and its corresponding POA.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 3ca04650d04..dbd11811b6f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -31,46 +31,41 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void)
}
CORBA::DefinitionKind
-TAO_ConstantDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConstantDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Constant;
}
CORBA::Contained::Description *
-TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Contained::Description *desc_ptr = 0;
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval->kind = this->def_kind ();
CORBA::ConstantDescription cd;
- cd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ cd.name = this->name_i ();
- cd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ cd.id = this->id_i ();
ACE_TString container_id;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -78,14 +73,11 @@ TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
container_id);
cd.defined_in = container_id.c_str ();
- cd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ cd.version = this->version_i ();
- cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ cd.type = this->type_i ();
- CORBA::Any_var val = this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CORBA::Any_var val = this->value_i ();
cd.value = val.in ();
@@ -94,19 +86,18 @@ TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString type_path;
@@ -117,23 +108,22 @@ TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (type_path,
this->repo_);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_ConstantDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_def_i ();
}
CORBA::IDLType_ptr
-TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString type_path;
@@ -145,7 +135,6 @@ TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (type_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -158,8 +147,7 @@ TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->type_def_i (type_def
ACE_ENV_ARG_PARAMETER);
@@ -178,23 +166,21 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def
}
CORBA::Any *
-TAO_ConstantDef_i::value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->value_i ();
}
CORBA::Any *
-TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::value_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::TypeCode_var tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CORBA::TypeCode_var tc = this->type_i ();
void *ref = 0;
size_t length = 0;
@@ -218,14 +204,12 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (retval,
CORBA::Any,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
TAO::Unknown_IDL_Type *impl = 0;
ACE_NEW_THROW_EX (impl,
TAO::Unknown_IDL_Type (tc.in (),
in_cdr),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
retval->replace (impl);
safety.release ();
@@ -239,8 +223,7 @@ TAO_ConstantDef_i::value (const CORBA::Any &value
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->value_i (value
ACE_ENV_ARG_PARAMETER);
@@ -252,15 +235,13 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::TypeCode_var my_tc =
- this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->type_i ();
CORBA::TypeCode_var val_tc = value.type ();
CORBA::Boolean const equal_tc =
my_tc.in ()->equal (val_tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!equal_tc)
{
@@ -285,8 +266,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
mb = in.steal_contents ();
}
- CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = val_tc->kind ();
switch (kind)
{
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index 0b6b8311b7e..ce389958510 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -5,8 +5,8 @@
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ConsumesDef_i.h"
-ACE_RCSID (IFRService,
- ConsumesDef_i,
+ACE_RCSID (IFRService,
+ ConsumesDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,7 +25,7 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
}
CORBA::DefinitionKind
-TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConsumesDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Consumes;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index b61b34ea4a1..b9e2dd81c08 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -28,19 +28,18 @@ TAO_Contained_i::~TAO_Contained_i (void)
}
void
-TAO_Contained_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -96,19 +95,18 @@ TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
char *
-TAO_Contained_i::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->id_i ();
}
char *
-TAO_Contained_i::id_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::id_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString retval;
@@ -126,8 +124,7 @@ TAO_Contained_i::id (const char *id
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->id_i (id
ACE_ENV_ARG_PARAMETER);
@@ -180,19 +177,18 @@ TAO_Contained_i::id_i (const char *id
}
char *
-TAO_Contained_i::name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->name_i ();
}
char *
-TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::name_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString retval;
@@ -204,19 +200,18 @@ TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
char *
-TAO_Contained_i::version (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::version (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->version_i ();
}
char *
-TAO_Contained_i::version_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::version_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString retval;
@@ -234,8 +229,7 @@ TAO_Contained_i::name (const char *name
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->name_i (name
ACE_ENV_ARG_PARAMETER);
@@ -249,7 +243,6 @@ TAO_Contained_i::name_i (const char *name
// Check if name already exists in this container.
CORBA::Boolean exists = this->name_exists (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (exists)
{
@@ -286,8 +279,7 @@ TAO_Contained_i::version (const char *version
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->version_i (version
ACE_ENV_ARG_PARAMETER);
@@ -304,19 +296,18 @@ TAO_Contained_i::version_i (const char *version
}
CORBA::Container_ptr
-TAO_Contained_i::defined_in (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::defined_in (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Container::_nil ());
+ this->update_key ();
- return this->defined_in_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->defined_in_i ();
}
CORBA::Container_ptr
-TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::defined_in_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString container_id;
@@ -339,29 +330,26 @@ TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (container_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Container::_nil ());
CORBA::Container_var retval = CORBA::Container::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Container::_nil ());
return retval._retn ();
}
char *
-TAO_Contained_i::absolute_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::absolute_name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->absolute_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->absolute_name_i ();
}
char *
-TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::absolute_name_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString absolute_name;
@@ -373,7 +361,7 @@ TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::Repository_ptr
-TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::containing_repository (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->repo_->repo_objref ();
@@ -408,8 +396,7 @@ TAO_Contained_i::move (CORBA::Container_ptr new_container,
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->move_i (new_container,
new_name,
@@ -569,11 +556,9 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
}
CORBA::DefinitionKind my_dk =
- this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->def_kind ();
- CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var id = this->id_i ();
// If an exception is thrown, this must be restored.
ACE_TString my_path;
@@ -593,8 +578,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
as_contained.section_key (container_key);
CORBA::String_var container_id =
- as_contained.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ as_contained.id_i ();
ACE_TString new_id (container_id.in ());
new_id =
@@ -614,8 +598,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::EnumMemberSeq_var members =
- impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.members_i ();
if (container_dk == CORBA::dk_Struct
|| container_dk == CORBA::dk_Union
@@ -625,7 +608,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
my_path.c_str (),
new_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
CORBA::EnumDef_var new_defn =
@@ -634,7 +616,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_version,
members.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TString new_path =
TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -648,8 +629,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::IDLType_var otype =
- impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.original_type_def_i ();
CORBA::AliasDef_var new_defn =
container_impl.create_alias_i (new_id.c_str (),
@@ -657,7 +637,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_version,
otype.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TString new_path =
TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -671,7 +650,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_name,
new_version
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
case CORBA::dk_ValueBox:
@@ -680,8 +658,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::IDLType_var otype =
- impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.original_type_def_i ();
CORBA::ValueBoxDef_var new_defn =
container_impl.create_value_box_i (new_id.c_str (),
@@ -689,7 +666,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_version,
otype.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TString new_path =
TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -703,8 +679,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::StructMemberSeq_var members =
- impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.members_i ();
if (container_dk == CORBA::dk_Struct
|| container_dk == CORBA::dk_Union
@@ -714,7 +689,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
my_path.c_str (),
new_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
CORBA::StructDef_var new_defn =
@@ -723,7 +697,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_version,
members.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TString new_path =
TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -740,12 +713,10 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::IDLType_var disc_type =
- impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.discriminator_type_def_i ();
CORBA::UnionMemberSeq_var members =
- impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.members_i ();
if (container_dk == CORBA::dk_Struct
|| container_dk == CORBA::dk_Union
@@ -755,7 +726,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
my_path.c_str (),
new_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
CORBA::UnionDef_var new_defn =
@@ -765,7 +735,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
disc_type.in (),
members.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TString new_path =
TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -783,7 +752,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_name,
new_version
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->move_contents (new_defn.in ()
ACE_ENV_ARG_PARAMETER);
@@ -796,8 +764,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::StructMemberSeq_var members =
- impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.members_i ();
CORBA::ExceptionDef_var new_defn =
container_impl.create_exception_i (new_id.c_str (),
@@ -805,7 +772,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_version,
members.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->move_contents (new_defn.in ()
ACE_ENV_ARG_PARAMETER);
@@ -818,8 +784,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::InterfaceDefSeq_var bases =
- impl.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.base_interfaces_i ();
CORBA::InterfaceDef_var new_defn =
container_impl.create_interface_i (new_id.c_str (),
@@ -827,7 +792,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
new_version,
bases.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TString new_path =
TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -844,11 +808,9 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::IDLType_var type_def =
- impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.type_def_i ();
- CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var value = impl.value_i ();
container_impl.create_constant_i (new_id.c_str (),
new_name,
@@ -856,7 +818,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
type_def.in (),
value.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
case CORBA::dk_Attribute:
@@ -865,12 +826,10 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::IDLType_var type_def =
- impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.type_def_i ();
CORBA::AttributeMode mode =
- impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.mode_i ();
if (container_dk == CORBA::dk_Interface)
{
@@ -883,7 +842,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
type_def.in (),
mode
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
else if (container_dk == CORBA::dk_Value)
@@ -897,7 +855,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
type_def.in (),
mode
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
else
@@ -912,24 +869,19 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
impl.section_key (this->section_key_);
CORBA::IDLType_var result =
- impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.result_def_i ();
CORBA::OperationMode mode =
- impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.mode_i ();
CORBA::ParDescriptionSeq_var params =
- impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.params_i ();
CORBA::ExceptionDefSeq_var exceptions =
- impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.exceptions_i ();
CORBA::ContextIdSeq_var contexts =
- impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl.contexts_i ();
if (container_dk == CORBA::dk_Interface)
{
@@ -945,7 +897,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
exceptions.in (),
contexts.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
else if (container_dk == CORBA::dk_Value)
@@ -962,7 +913,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
exceptions.in (),
contexts.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
else
@@ -999,7 +949,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
if (cleanup)
{
@@ -1156,13 +1105,11 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
version.c_str (),
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
- CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::DefinitionKind kind = this->def_kind ();
// Specific to InterfaceDef_i and ValueDef_i
if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
@@ -1207,7 +1154,6 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
version.c_str (),
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -1250,7 +1196,6 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
version.c_str (),
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index b729699e35e..ad18fe17342 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -35,19 +35,18 @@ TAO_Container_i::~TAO_Container_i (void)
}
void
-TAO_Container_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Container_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Container_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
int index = 0;
@@ -96,8 +95,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->repo_);
CORBA::DefinitionKind def_kind =
- impl->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->def_kind ();
switch (def_kind)
{
@@ -109,8 +107,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
case CORBA::dk_Fixed:
case CORBA::dk_Array:
case CORBA::dk_Sequence:
- impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->destroy_i ();
break;
default:
// No other types can be defined in this section of the struct.
@@ -162,8 +159,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_Contained_i *impl = this->repo_->select_contained (def_kind);
impl->section_key (defn_key);
- impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->destroy_i ();
}
// Restore our original section key, in case this method was
@@ -183,8 +179,7 @@ TAO_Container_i::lookup (const char *search_name
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Contained::_nil ());
+ this->update_key ();
return this->lookup_i (search_name
ACE_ENV_ARG_PARAMETER);
@@ -399,7 +394,6 @@ TAO_Container_i::lookup_i (const char *search_name
TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Contained::_nil ());
return CORBA::Contained::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -413,8 +407,7 @@ TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->contents_i (limit_type,
exclude_inherited
@@ -431,7 +424,6 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
ACE_NEW_THROW_EX (contents,
CORBA::ContainedSeq,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::ContainedSeq_var retval = contents;
retval->length (0);
@@ -507,8 +499,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
// Base interfaces
- CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CORBA::DefinitionKind def_kind = this->def_kind ();
if (def_kind == CORBA::dk_Interface)
{
@@ -524,7 +515,6 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
limit_type,
exclude_inherited
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -544,12 +534,10 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
next_path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Contained_var next_cont =
CORBA::Contained::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[j] = next_cont._retn ();
}
@@ -567,8 +555,7 @@ TAO_Container_i::lookup_name (const char *search_name,
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->lookup_name_i (search_name,
levels_to_search,
@@ -602,7 +589,6 @@ TAO_Container_i::lookup_name_i (const char *search_name,
ACE_NEW_THROW_EX (holder,
CORBA::ContainedSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::ContainedSeq_var retval = holder;
retval->length (size);
@@ -620,12 +606,10 @@ TAO_Container_i::lookup_name_i (const char *search_name,
next_path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Contained_var next_cont =
CORBA::Contained::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = next_cont._retn ();
}
@@ -642,8 +626,7 @@ TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->describe_contents_i (limit_type,
exclude_inherited,
@@ -661,7 +644,6 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
CORBA::ContainedSeq_var contents = this->contents_i (limit_type,
exclude_inherited
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::ULong length = contents->length ();
CORBA::ULong ret_len = 0;
@@ -681,7 +663,6 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
ACE_NEW_THROW_EX (desc_seq,
CORBA::Container::DescriptionSeq (ret_len),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
desc_seq->length (ret_len);
CORBA::Container::DescriptionSeq_var retval = desc_seq;
@@ -700,8 +681,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
impl = TAO_IFR_Service_Utils::path_to_contained (contained_path,
this->repo_);
- desc = impl->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ desc = impl->describe_i ();
retval[i].contained_object = CORBA::Contained::_duplicate (contents[i]);
@@ -721,8 +701,7 @@ TAO_Container_i::create_module (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ModuleDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
+ this->update_key ();
return this->create_module_i (id,
name,
@@ -753,7 +732,6 @@ TAO_Container_i::create_module_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
// Create the object reference.
CORBA::Object_var obj =
@@ -761,7 +739,6 @@ TAO_Container_i::create_module_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
return CORBA::ComponentIR::ModuleDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -778,8 +755,7 @@ TAO_Container_i::create_constant (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ConstantDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+ this->update_key ();
return this->create_constant_i (id,
name,
@@ -812,7 +788,6 @@ TAO_Container_i::create_constant_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
// Get the path to our type and store it.
char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -842,8 +817,7 @@ TAO_Container_i::create_constant_i (const char *id,
CORBA::TypeCode_var val_tc = value.type ();
- CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+ CORBA::TCKind kind = val_tc->kind ();
switch (kind)
{
@@ -875,7 +849,6 @@ TAO_Container_i::create_constant_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
return CORBA::ConstantDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -891,8 +864,7 @@ TAO_Container_i::create_struct (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::StructDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+ this->update_key ();
return this->create_struct_i (id,
name,
@@ -923,7 +895,6 @@ TAO_Container_i::create_struct_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
// Open a section for the struct's members.
ACE_Configuration_Section_Key refs_key;
@@ -962,8 +933,7 @@ TAO_Container_i::create_struct_i (const char *id,
}
CORBA::DefinitionKind def_kind =
- this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+ this->def_kind ();
if (def_kind == CORBA::dk_Struct
|| def_kind == CORBA::dk_Union
@@ -979,7 +949,6 @@ TAO_Container_i::create_struct_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
return CORBA::StructDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -996,8 +965,7 @@ TAO_Container_i::create_union (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::UnionDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+ this->update_key ();
return this->create_union_i (id,
name,
@@ -1030,7 +998,6 @@ TAO_Container_i::create_union_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
// Add a field to hold the path to the discriminator type.
char *disc_path =
@@ -1082,8 +1049,7 @@ TAO_Container_i::create_union_i (const char *id,
}
CORBA::DefinitionKind def_kind =
- this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+ this->def_kind ();
if (def_kind == CORBA::dk_Struct
|| def_kind == CORBA::dk_Union
@@ -1099,7 +1065,6 @@ TAO_Container_i::create_union_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
return CORBA::UnionDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1115,8 +1080,7 @@ TAO_Container_i::create_enum (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::EnumDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+ this->update_key ();
return this->create_enum_i (id,
name,
@@ -1147,7 +1111,6 @@ TAO_Container_i::create_enum_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
// Store the member count of the enum.
CORBA::ULong count = members.length ();
@@ -1172,8 +1135,7 @@ TAO_Container_i::create_enum_i (const char *id,
}
CORBA::DefinitionKind def_kind =
- this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+ this->def_kind ();
if (def_kind == CORBA::dk_Struct
|| def_kind == CORBA::dk_Union
@@ -1189,7 +1151,6 @@ TAO_Container_i::create_enum_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
return CORBA::EnumDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1205,8 +1166,7 @@ TAO_Container_i::create_alias (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::AliasDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
+ this->update_key ();
return this->create_alias_i (id,
name,
@@ -1237,7 +1197,6 @@ TAO_Container_i::create_alias_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
// Get the path to our original type and store it.
char *unalias_path =
@@ -1253,7 +1212,6 @@ TAO_Container_i::create_alias_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
return CORBA::AliasDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1269,8 +1227,7 @@ TAO_Container_i::create_interface (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+ this->update_key ();
return this->create_interface_i (id,
name,
@@ -1301,7 +1258,6 @@ TAO_Container_i::create_interface_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
CORBA::ULong length = base_interfaces.length ();
@@ -1335,7 +1291,6 @@ TAO_Container_i::create_interface_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
return CORBA::InterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1359,8 +1314,7 @@ TAO_Container_i::create_value (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+ this->update_key ();
return this->create_value_i (id,
name,
@@ -1406,7 +1360,6 @@ TAO_Container_i::create_value_i (
abstract_base_values,
supported_interfaces
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
TAO_IFR_Generic_Utils<CORBA::InitializerSeq>::set_initializers (
initializers,
@@ -1420,7 +1373,6 @@ TAO_Container_i::create_value_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
return CORBA::ValueDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1436,8 +1388,7 @@ TAO_Container_i::create_value_box (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueBoxDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
+ this->update_key ();
return this->create_value_box_i (id,
name,
@@ -1468,7 +1419,6 @@ TAO_Container_i::create_value_box_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
// Get the path to our original type and store it.
char *boxed_path =
@@ -1484,7 +1434,6 @@ TAO_Container_i::create_value_box_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
return CORBA::ValueBoxDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1500,8 +1449,7 @@ TAO_Container_i::create_exception (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExceptionDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
+ this->update_key ();
return this->create_exception_i (id,
name,
@@ -1532,7 +1480,6 @@ TAO_Container_i::create_exception_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
ACE_Configuration_Section_Key refs_key;
this->repo_->config ()->open_section (new_key,
@@ -1575,7 +1522,6 @@ TAO_Container_i::create_exception_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
return CORBA::ExceptionDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1590,8 +1536,7 @@ TAO_Container_i::create_native (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::NativeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
+ this->update_key ();
return this->create_native_i (id,
name,
@@ -1620,7 +1565,6 @@ TAO_Container_i::create_native_i (const char *id,
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
// Create the object reference.
CORBA::Object_var obj =
@@ -1628,7 +1572,6 @@ TAO_Container_i::create_native_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
return CORBA::NativeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1646,8 +1589,7 @@ TAO_Container_i::create_abstract_interface (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::AbstractInterfaceDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
+ this->update_key ();
return this->create_abstract_interface_i (id,
name,
@@ -1680,7 +1622,6 @@ TAO_Container_i::create_abstract_interface_i (
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
CORBA::ULong length = base_interfaces.length ();
@@ -1714,7 +1655,6 @@ TAO_Container_i::create_abstract_interface_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
return CORBA::AbstractInterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1732,8 +1672,7 @@ TAO_Container_i::create_local_interface (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::LocalInterfaceDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
+ this->update_key ();
return this->create_local_interface_i (id,
name,
@@ -1766,7 +1705,6 @@ TAO_Container_i::create_local_interface_i (
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
CORBA::ULong length = base_interfaces.length ();
@@ -1800,7 +1738,6 @@ TAO_Container_i::create_local_interface_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
return CORBA::LocalInterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -1824,8 +1761,7 @@ TAO_Container_i::create_ext_value (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtValueDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtValueDef::_nil ());
+ this->update_key ();
return this->create_ext_value_i (id,
name,
@@ -1871,7 +1807,6 @@ TAO_Container_i::create_ext_value_i (
abstract_base_values,
supported_interfaces
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtValueDef::_nil ());
/// This does not handle the initializer exceptions, so we do that below.
TAO_IFR_Generic_Utils<CORBA::ExtInitializerSeq>::set_initializers (
@@ -1914,7 +1849,6 @@ TAO_Container_i::create_ext_value_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtValueDef::_nil ());
return CORBA::ExtValueDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -2021,13 +1955,11 @@ TAO_Container_i::lookup_name_recursive (
limit_type,
exclude_inherited
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
- CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::DefinitionKind kind = this->def_kind ();
if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
{
@@ -2262,8 +2194,7 @@ TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
{
CORBA::TypeCode_var tc = value.type ();
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = tc->kind ();
u_int result = 0;
int default_label = 0;
@@ -2511,7 +2442,6 @@ TAO_Container_i::create_value_common (
version,
"defns"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (path);
this->repo_->config ()->set_integer_value (new_key,
"is_custom",
@@ -2543,7 +2473,6 @@ TAO_Container_i::create_value_common (
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (path);
ACE_TString base_value_id;
this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -2593,7 +2522,6 @@ TAO_Container_i::create_value_common (
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (path);
this->repo_->config ()->get_string_value (
TAO_IFR_Service_Utils::tmp_key_,
@@ -2664,7 +2592,6 @@ TAO_Container_i::create_value_common (
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (path);
this->repo_->config ()->get_string_value (
TAO_IFR_Service_Utils::tmp_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index 0cbe4a4093d..c31ea85374a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/EmitsDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
-ACE_RCSID (IFRService,
- EmitsDef_i,
+ACE_RCSID (IFRService,
+ EmitsDef_i,
"$Id$")
@@ -22,7 +22,7 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
}
CORBA::DefinitionKind
-TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EmitsDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Emits;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 5273788b6de..8639e5f0452 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -26,26 +26,25 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
}
CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Enum;
}
CORBA::TypeCode_ptr
-TAO_EnumDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -58,8 +57,7 @@ TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
"name",
name);
- CORBA::EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::EnumMemberSeq_var members = this->members_i ();
return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
name.c_str (),
@@ -68,19 +66,18 @@ TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->members_i ();
}
CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int count = 0;
@@ -92,7 +89,6 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (retval,
CORBA::EnumMemberSeq (count),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
retval->length (count);
@@ -123,8 +119,7 @@ TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->members_i (members
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index cd62666f25d..98b414b8970 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/EventDef_i.h"
-ACE_RCSID (IFRService,
- EventDef_i,
+ACE_RCSID (IFRService,
+ EventDef_i,
"$Id$")
@@ -25,49 +25,47 @@ TAO_EventDef_i::~TAO_EventDef_i (void)
}
CORBA::DefinitionKind
-TAO_EventDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EventDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Event;
}
void
-TAO_EventDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_EventDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// An event type is a restriction of a value type, not an extension.
- this->TAO_ExtValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_ExtValueDef_i::destroy_i ();
}
CORBA::Contained::Description *
-TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_EventDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_ValueDef_i::describe_i ();
}
CORBA::Boolean
@@ -77,8 +75,7 @@ TAO_EventDef_i::is_a (const char *event_id
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->is_a_i (event_id
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index f3d1a44a8f4..dcfb8875214 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -33,10 +33,9 @@ TAO_EventPortDef_i::event (
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+ this->update_key ();
- return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_i ();
}
CORBA::ComponentIR::EventDef_ptr
@@ -51,7 +50,6 @@ TAO_EventPortDef_i::event_i (
holder);
CORBA::Contained_var obj = this->repo_->lookup_id (holder.fast_rep ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
return CORBA::ComponentIR::EventDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -66,8 +64,7 @@ TAO_EventPortDef_i::event (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->event_i (event
ACE_ENV_ARG_PARAMETER);
@@ -116,8 +113,7 @@ TAO_EventPortDef_i::is_a (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->is_a_i (event_id
ACE_ENV_ARG_PARAMETER);
@@ -149,19 +145,18 @@ TAO_EventPortDef_i::is_a_i (
}
CORBA::Contained::Description *
-TAO_EventPortDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventPortDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_EventPortDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventPortDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ComponentIR::EventPortDescription epd;
@@ -172,7 +167,6 @@ TAO_EventPortDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
ACE_TString holder;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -191,7 +185,7 @@ TAO_EventPortDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::DefinitionKind
-TAO_EventPortDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EventPortDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_none;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 33b7c9eee99..b675d2cd2da 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -27,71 +27,63 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
}
CORBA::DefinitionKind
-TAO_ExceptionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ExceptionDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Exception;
}
void
-TAO_ExceptionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_ExceptionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our members.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
// Destroy ourself.
- TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Contained_i::destroy_i ();
}
CORBA::Contained::Description *
-TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Contained::Description *desc_ptr = 0;
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval->kind = this->def_kind ();
CORBA::ExceptionDescription ed;
- ed.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ed.name = this->name_i ();
- ed.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ed.id = this->id_i ();
ACE_TString container_id;
@@ -101,11 +93,9 @@ TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
ed.defined_in = container_id.c_str ();
- ed.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ed.version = this->version_i ();
- ed.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ed.type = this->type_i ();
retval->value <<= ed;
@@ -113,19 +103,18 @@ TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -139,8 +128,7 @@ TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
name);
CORBA::StructMemberSeq_var members =
- this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->members_i ();
return this->repo_->tc_factory ()->create_exception_tc (
id.c_str (),
@@ -151,19 +139,18 @@ TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::StructMemberSeq *
-TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::members (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->members_i ();
}
CORBA::StructMemberSeq *
-TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::members_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -232,7 +219,6 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (members,
CORBA::StructMemberSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
members->length (size);
@@ -258,11 +244,9 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->repo_->config ()->expand_path (this->repo_->root_key (),
path,
@@ -272,8 +256,7 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
impl = TAO_IFR_Service_Utils::path_to_idltype (path,
this->repo_);
- retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval[k].type = impl->type_i ();
}
return retval._retn ();
@@ -286,8 +269,7 @@ TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->members_i (members
ACE_ENV_ARG_PARAMETER);
@@ -299,8 +281,7 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our old members, both refs and defns.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
CORBA::ULong count = members.length ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 82ffce83d05..7daca75390d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
-ACE_RCSID (IFRService,
- ExtAbstractInterfaceDef_i,
+ACE_RCSID (IFRService,
+ ExtAbstractInterfaceDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -29,15 +29,14 @@ TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void)
// Just call the base class version, this is here only to
// disambiguate multiple inheritance.
void
-TAO_ExtAbstractInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExtAbstractInterfaceDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- TAO_AbstractInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ TAO_AbstractInterfaceDef_i::destroy_i ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 62405fe8393..4e9a697156c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -34,10 +34,9 @@ TAO_ExtAttributeDef_i::get_exceptions (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->get_exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->get_exceptions_i ();
}
CORBA::ExcDescriptionSeq *
@@ -55,7 +54,6 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
this->fill_exceptions (*retval,
"get_excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return safe_retval._retn ();
}
@@ -69,8 +67,7 @@ TAO_ExtAttributeDef_i::get_exceptions (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->get_exceptions_i (get_exceptions
ACE_ENV_ARG_PARAMETER);
@@ -95,10 +92,9 @@ TAO_ExtAttributeDef_i::set_exceptions (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->set_exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->set_exceptions_i ();
}
CORBA::ExcDescriptionSeq *
@@ -116,7 +112,6 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
this->fill_exceptions (*retval,
"put_excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return safe_retval._retn ();
}
@@ -130,8 +125,7 @@ TAO_ExtAttributeDef_i::set_exceptions (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->set_exceptions_i (set_exceptions
ACE_ENV_ARG_PARAMETER);
@@ -156,10 +150,9 @@ TAO_ExtAttributeDef_i::describe_attribute (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_attribute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_attribute_i ();
}
CORBA::ExtAttributeDescription *
@@ -176,7 +169,6 @@ TAO_ExtAttributeDef_i::describe_attribute_i (
this->fill_description (*retval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return safe_retval._retn ();
}
@@ -188,11 +180,9 @@ TAO_ExtAttributeDef_i::fill_description (
)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- desc.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.name = this->name_i ();
- desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.id = this->id_i ();
ACE_TString holder;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -200,19 +190,15 @@ TAO_ExtAttributeDef_i::fill_description (
holder);
desc.defined_in = holder.fast_rep ();
- desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.id = this->id_i ();
- desc.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.type = this->type_i ();
- desc.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.mode = this->mode_i ();
this->fill_exceptions (desc.get_exceptions,
"get_excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->fill_exceptions (desc.put_exceptions,
"put_excepts"
@@ -267,8 +253,7 @@ TAO_ExtAttributeDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
TAO_ExceptionDef_i impl (this->repo_);
impl.section_key (except_key);
- exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ exceptions[i].type = impl.type_i ();
this->repo_->config ()->get_string_value (except_key,
"container_id",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index 3b802bcb762..f857c37adb0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
-ACE_RCSID (IFRService,
- ExtLocalInterfaceDef_i,
+ACE_RCSID (IFRService,
+ ExtLocalInterfaceDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -29,15 +29,14 @@ TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void)
// Just call the base class version, this is here only to
// disambiguate multiple inheritance.
void
-TAO_ExtLocalInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExtLocalInterfaceDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- TAO_LocalInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ TAO_LocalInterfaceDef_i::destroy_i ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 410fd91c7d9..7440c04bb54 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -36,10 +36,9 @@ TAO_ExtValueDef_i::ext_initializers (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->ext_initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ext_initializers_i ();
}
CORBA::ExtInitializerSeq *
@@ -124,26 +123,22 @@ TAO_ExtValueDef_i::ext_initializers_i (
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
retval[i].members[j].type =
- impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ impl->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i].members[j].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
this->fill_exceptions (retval[i].exceptions,
initializer_key,
"excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
@@ -158,8 +153,7 @@ TAO_ExtValueDef_i::ext_initializers (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->ext_initializers_i (ext_initializers
ACE_ENV_ARG_PARAMETER);
@@ -219,10 +213,9 @@ TAO_ExtValueDef_i::describe_ext_value (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_ext_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_ext_value_i ();
}
CORBA::ExtValueDef::ExtFullValueDescription *
@@ -319,16 +312,14 @@ TAO_ExtValueDef_i::describe_ext_value_i (
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->operations[i].result =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
this->repo_->config ()->get_integer_value (op_key,
"mode",
val);
fv_desc->operations[i].mode = static_cast<CORBA::OperationMode> (val);
CORBA::TCKind kind =
- fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ fv_desc->operations[i].result->kind ();
if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
&& kind != CORBA::tk_void)
@@ -382,8 +373,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->operations[i].parameters[j].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (
@@ -391,12 +381,10 @@ TAO_ExtValueDef_i::describe_ext_value_i (
this->repo_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
fv_desc->operations[i].parameters[j].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->repo_->config ()->get_integer_value (param_key,
"mode",
@@ -461,8 +449,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
TAO_ExceptionDef_i impl (this->repo_);
impl.section_key (except_def_key);
fv_desc->operations[i].exceptions[j].type =
- impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ impl.type_i ();
}
}
}
@@ -520,8 +507,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->attributes[i].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
this->repo_->config ()->expand_path (this->repo_->root_key (),
holder,
@@ -537,14 +523,12 @@ TAO_ExtValueDef_i::describe_ext_value_i (
attr_key,
"get_excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->fill_exceptions (fv_desc->attributes[i].put_exceptions,
attr_key,
"put_excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -605,19 +589,16 @@ TAO_ExtValueDef_i::describe_ext_value_i (
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->members[i].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
fv_desc->members[i].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -689,8 +670,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->initializers[i].members[j].type =
- impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ impl->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (
@@ -698,12 +678,10 @@ TAO_ExtValueDef_i::describe_ext_value_i (
this->repo_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
fv_desc->initializers[i].members[j].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -711,7 +689,6 @@ TAO_ExtValueDef_i::describe_ext_value_i (
initializer_key,
"excepts"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -737,8 +714,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
"base_value",
holder);
fv_desc->base_value = holder.fast_rep ();
- fv_desc->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ fv_desc->type = this->type_i ();
return retval._retn ();
}
@@ -758,8 +734,7 @@ TAO_ExtValueDef_i::create_ext_attribute (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+ this->update_key ();
return this->create_ext_attribute_i (id,
name,
@@ -800,7 +775,6 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
version,
"attrs"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
// Store the path to the attribute's type definition.
char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -828,12 +802,10 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
CORBA::ExtAttributeDef_var retval =
CORBA::ExtAttributeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
return retval._retn ();
}
@@ -887,8 +859,7 @@ TAO_ExtValueDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
TAO_ExceptionDef_i impl (this->repo_);
impl.section_key (except_key);
- exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ exceptions[i].type = impl.type_i ();
this->repo_->config ()->get_string_value (except_key,
"container_id",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index f1fd5ae8157..af181277e96 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FactoryDef_i.h"
-ACE_RCSID (IFRService,
- FactoryDef_i,
+ACE_RCSID (IFRService,
+ FactoryDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -23,7 +23,7 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
}
CORBA::DefinitionKind
-TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FactoryDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Factory;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index 6fffd784ad3..8cd8f91422f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FinderDef_i.h"
-ACE_RCSID (IFRService,
- FinderDef_i,
+ACE_RCSID (IFRService,
+ FinderDef_i,
"$Id$")
@@ -22,7 +22,7 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void)
}
CORBA::DefinitionKind
-TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FinderDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Finder;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index f8fdc472f04..3fe8ee9ff97 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FixedDef_i.h"
-ACE_RCSID (IFRService,
- FixedDef_i,
+ACE_RCSID (IFRService,
+ FixedDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -20,45 +20,43 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void)
}
CORBA::DefinitionKind
-TAO_FixedDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Fixed;
}
void
-TAO_FixedDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_FixedDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// TODO
}
CORBA::TypeCode_ptr
-TAO_FixedDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// TODO
@@ -66,15 +64,14 @@ TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::UShort
-TAO_FixedDef_i::digits (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::digits (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->digits_i ();
}
CORBA::UShort
@@ -92,8 +89,7 @@ TAO_FixedDef_i::digits (CORBA::UShort digits
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->digits_i (digits
ACE_ENV_ARG_PARAMETER);
@@ -108,19 +104,18 @@ TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
}
CORBA::Short
-TAO_FixedDef_i::scale (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::scale (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->scale_i ();
}
CORBA::Short
-TAO_FixedDef_i::scale_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::scale_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// TODO
@@ -134,8 +129,7 @@ TAO_FixedDef_i::scale (CORBA::Short scale
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->scale_i (scale
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 4e8a1741f56..e9f723aeb15 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -36,26 +36,25 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void)
}
CORBA::DefinitionKind
-TAO_HomeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_HomeDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Home;
}
void
-TAO_HomeDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our special subsections first, then call destroy_i
@@ -67,7 +66,6 @@ TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_FinderDef_i>::destroy_special (
"finders",
@@ -75,25 +73,23 @@ TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
- this->TAO_ExtInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_ExtInterfaceDef_i::destroy_i ();
}
CORBA::Contained::Description *
-TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ComponentIR::HomeDescription home_desc;
@@ -103,7 +99,6 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->repo_,
this->section_key_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_TString holder;
int status =
@@ -145,29 +140,24 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
impl.section_key (tmp_key);
impl.fill_value_description (home_desc.primary_key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
this->fill_op_desc_seq (this->section_key_,
home_desc.factories,
"factories"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->fill_op_desc_seq (this->section_key_,
home_desc.finders,
"finders"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->fill_op_desc_seq (this->section_key_,
home_desc.operations,
"ops"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
- home_desc.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ home_desc.type = this->type_i ();
CORBA::Contained::Description *retval = 0;
ACE_NEW_RETURN (retval,
@@ -180,19 +170,18 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_HomeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -211,19 +200,18 @@ TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::ComponentIR::HomeDef_ptr
-TAO_HomeDef_i::base_home (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::base_home (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
+ this->update_key ();
- return this->base_home_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->base_home_i ();
}
CORBA::ComponentIR::HomeDef_ptr
-TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::base_home_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString path;
@@ -241,7 +229,6 @@ TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
return CORBA::ComponentIR::HomeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -256,8 +243,7 @@ TAO_HomeDef_i::base_home (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->base_home_i (base_home
ACE_ENV_ARG_PARAMETER);
@@ -284,10 +270,9 @@ TAO_HomeDef_i::supported_interfaces (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->supported_interfaces_i ();
}
CORBA::InterfaceDefSeq *
@@ -332,11 +317,9 @@ TAO_HomeDef_i::supported_interfaces_i (
obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
safe_retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return safe_retval._retn ();
@@ -351,8 +334,7 @@ TAO_HomeDef_i::supported_interfaces (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->supported_interfaces_i (supported_interfaces
ACE_ENV_ARG_PARAMETER);
@@ -397,19 +379,18 @@ TAO_HomeDef_i::supported_interfaces_i (
}
CORBA::ComponentIR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::managed_component (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+ this->update_key ();
- return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->managed_component_i ();
}
CORBA::ComponentIR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::managed_component_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString path;
@@ -420,7 +401,6 @@ TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -435,8 +415,7 @@ TAO_HomeDef_i::managed_component (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->managed_component_i (managed_component
ACE_ENV_ARG_PARAMETER);
@@ -456,19 +435,18 @@ TAO_HomeDef_i::managed_component_i (
}
CORBA::ValueDef_ptr
-TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::primary_key (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+ this->update_key ();
- return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->primary_key_i ();
}
CORBA::ValueDef_ptr
-TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::primary_key_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString path;
@@ -486,7 +464,6 @@ TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
return CORBA::ValueDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -501,8 +478,7 @@ TAO_HomeDef_i::primary_key (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->primary_key_i (primary_key
ACE_ENV_ARG_PARAMETER);
@@ -539,8 +515,7 @@ TAO_HomeDef_i::create_factory (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
+ this->update_key ();
return this->create_factory_i (id,
name,
@@ -569,7 +544,6 @@ TAO_HomeDef_i::create_factory_i (
params,
exceptions
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
return CORBA::ComponentIR::FactoryDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -586,8 +560,7 @@ TAO_HomeDef_i::create_finder (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
+ this->update_key ();
return this->create_finder_i (id,
name,
@@ -616,7 +589,6 @@ TAO_HomeDef_i::create_finder_i (
params,
exceptions
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
return CORBA::ComponentIR::FinderDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -648,7 +620,6 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
version,
sub_section
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Set the 'result' field with the path of our managed component.
ACE_TString managed_path;
@@ -785,7 +756,6 @@ TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
ods[i],
stringified
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -807,7 +777,6 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
op_key
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
ACE_TString result_path;
this->repo_->config ()->get_string_value (key,
@@ -816,13 +785,11 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
TAO_IDLType_i *result =
TAO_IFR_Service_Utils::path_to_idltype (result_path,
this->repo_);
- od.result = result->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.result = result->type_i ();
TAO_OperationDef_i impl (this->repo_);
impl.section_key (op_key);
- od.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.mode = impl.mode_i ();
TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>::fill_string_seq (
"contexts",
@@ -835,7 +802,6 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
od.parameters,
"params"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->fill_exc_desc_seq (op_key,
od.exceptions,
@@ -876,7 +842,6 @@ TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
pds[i],
stringified
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -901,18 +866,15 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
holder);
TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
- pd.type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ pd.type = impl->type_i ();
CORBA::Object_var obj =
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
pd.type_def = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong val;
this->repo_->config ()->get_integer_value (param_key,
@@ -954,7 +916,6 @@ TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
eds[i],
stringified
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -987,7 +948,7 @@ TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
TAO_ExceptionDef_i impl (this->repo_);
impl.section_key (except_def_key);
- ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ed.type = impl.type_i ();
}
void
@@ -1023,7 +984,6 @@ TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
eads[i],
stringified
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -1045,14 +1005,12 @@ TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
attr_key
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_AttributeDef_i impl (this->repo_);
impl.section_key (attr_key);
- ead.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ead.type = impl.type_i ();
- ead.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ead.mode = impl.mode_i ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index 3395db49bd8..d773e2b55ad 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -26,7 +26,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_codegen.cpp:603
#ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASES_CPP_
@@ -89,13 +89,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::DefinitionKind>
: public
@@ -107,13 +107,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
#define _CORBA_CONTAINED__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Contained>
: public
@@ -127,13 +127,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_)
#define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Contained::Description>
: public
@@ -145,13 +145,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
#define _CORBA_REPOSITORY__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Repository>
: public
@@ -165,13 +165,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
#define _CORBA_CONTAINER__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Container>
: public
@@ -185,13 +185,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_)
#define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Container::DescriptionSeq>
: public
@@ -203,13 +203,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_MODULEDEF__SARG_TRAITS_)
#define _CORBA_MODULEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ModuleDef>
: public
@@ -223,13 +223,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_)
#define _CORBA_CONSTANTDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ConstantDef>
: public
@@ -243,13 +243,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
#define _CORBA_IDLTYPE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::IDLType>
: public
@@ -263,13 +263,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_)
#define _CORBA_STRUCTDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::StructDef>
: public
@@ -283,13 +283,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_UNIONDEF__SARG_TRAITS_)
#define _CORBA_UNIONDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::UnionDef>
: public
@@ -303,13 +303,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ENUMDEF__SARG_TRAITS_)
#define _CORBA_ENUMDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::EnumDef>
: public
@@ -323,13 +323,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ALIASDEF__SARG_TRAITS_)
#define _CORBA_ALIASDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AliasDef>
: public
@@ -343,13 +343,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
#define _CORBA_INTERFACEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDef>
: public
@@ -363,13 +363,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -381,13 +381,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_)
#define _CORBA_EXCEPTIONDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExceptionDef>
: public
@@ -401,13 +401,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_)
#define _CORBA_NATIVEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::NativeDef>
: public
@@ -421,13 +421,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
#define _CORBA_VALUEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDef>
: public
@@ -441,13 +441,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDefSeq>
: public
@@ -459,13 +459,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_)
#define _CORBA_VALUEBOXDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueBoxDef>
: public
@@ -479,13 +479,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_)
#define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AbstractInterfaceDef>
: public
@@ -499,13 +499,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_)
#define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AbstractInterfaceDefSeq>
: public
@@ -517,13 +517,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_)
#define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::LocalInterfaceDef>
: public
@@ -537,13 +537,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_)
#define _CORBA_EXTVALUEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtValueDef>
: public
@@ -557,13 +557,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_)
#define _CORBA_CONTAINEDSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ContainedSeq>
: public
@@ -575,13 +575,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::StructMemberSeq>
: public
@@ -593,13 +593,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InitializerSeq>
: public
@@ -611,13 +611,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtInitializerSeq>
: public
@@ -629,13 +629,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::UnionMemberSeq>
: public
@@ -647,13 +647,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::EnumMemberSeq>
: public
@@ -688,13 +688,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::DefinitionKind>
: public
@@ -706,13 +706,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
#define _CORBA_CONTAINED__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Contained>
: public
@@ -727,13 +727,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Contained::Description>
: public
@@ -745,13 +745,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
#define _CORBA_REPOSITORY__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Repository>
: public
@@ -766,13 +766,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
#define _CORBA_CONTAINER__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Container>
: public
@@ -787,13 +787,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Container::DescriptionSeq>
: public
@@ -805,13 +805,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
#define _CORBA_MODULEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ModuleDef>
: public
@@ -826,13 +826,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
#define _CORBA_CONSTANTDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ConstantDef>
: public
@@ -847,13 +847,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
#define _CORBA_IDLTYPE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::IDLType>
: public
@@ -868,13 +868,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
#define _CORBA_STRUCTDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::StructDef>
: public
@@ -889,13 +889,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
#define _CORBA_UNIONDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::UnionDef>
: public
@@ -910,13 +910,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
#define _CORBA_ENUMDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::EnumDef>
: public
@@ -931,13 +931,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
#define _CORBA_ALIASDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AliasDef>
: public
@@ -952,13 +952,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
#define _CORBA_INTERFACEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDef>
: public
@@ -973,13 +973,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -991,13 +991,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExceptionDef>
: public
@@ -1012,13 +1012,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
#define _CORBA_NATIVEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::NativeDef>
: public
@@ -1033,13 +1033,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
#define _CORBA_VALUEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDef>
: public
@@ -1054,13 +1054,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDefSeq>
: public
@@ -1072,13 +1072,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
#define _CORBA_VALUEBOXDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueBoxDef>
: public
@@ -1093,13 +1093,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AbstractInterfaceDef>
: public
@@ -1114,13 +1114,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
: public
@@ -1132,13 +1132,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::LocalInterfaceDef>
: public
@@ -1153,13 +1153,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
#define _CORBA_EXTVALUEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtValueDef>
: public
@@ -1174,13 +1174,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ContainedSeq>
: public
@@ -1192,13 +1192,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::StructMemberSeq>
: public
@@ -1210,13 +1210,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InitializerSeq>
: public
@@ -1228,13 +1228,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtInitializerSeq>
: public
@@ -1246,13 +1246,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::UnionMemberSeq>
: public
@@ -1264,13 +1264,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::EnumMemberSeq>
: public
@@ -1418,9 +1418,9 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_IRObject_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -1430,7 +1430,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::IRObject::IRObject (void)
@@ -1449,11 +1449,11 @@ POA_CORBA::IRObject::~IRObject (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_def_kind_IRObject
: public TAO::Upcall_Command
{
@@ -1467,20 +1467,19 @@ POA_CORBA::IRObject::~IRObject (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::DefinitionKind> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->def_kind (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IRObject * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1489,7 +1488,7 @@ POA_CORBA::IRObject::~IRObject (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::IRObject::_get_def_kind_skel (
@@ -1503,16 +1502,16 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
@@ -1520,7 +1519,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1532,14 +1531,13 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class destroy_IRObject
: public TAO::Upcall_Command
{
@@ -1549,21 +1547,20 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
: servant_ (servant)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
this->servant_->destroy (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IRObject * const servant_;
};
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::IRObject::destroy_skel (
@@ -1577,22 +1574,22 @@ void POA_CORBA::IRObject::destroy_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
destroy_IRObject command (
impl);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1604,19 +1601,18 @@ void POA_CORBA::IRObject::destroy_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_IRObject_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1630,27 +1626,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IRObject * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1660,7 +1655,7 @@ namespace POA_CORBA
void POA_CORBA::IRObject::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1670,26 +1665,26 @@ void POA_CORBA::IRObject::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
-
+
_is_a_IRObject_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1701,14 +1696,13 @@ void POA_CORBA::IRObject::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_IRObject_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1722,20 +1716,19 @@ void POA_CORBA::IRObject::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IRObject * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1745,7 +1738,7 @@ void POA_CORBA::IRObject::_is_a_skel (
void POA_CORBA::IRObject::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1755,24 +1748,24 @@ void POA_CORBA::IRObject::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
-
+
_non_existent_IRObject_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1784,14 +1777,13 @@ void POA_CORBA::IRObject::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_IRObject_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1805,20 +1797,19 @@ void POA_CORBA::IRObject::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IRObject * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1828,7 +1819,7 @@ void POA_CORBA::IRObject::_non_existent_skel (
void POA_CORBA::IRObject::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1838,24 +1829,24 @@ void POA_CORBA::IRObject::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
-
+
_repository_id_IRObject_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1867,14 +1858,13 @@ void POA_CORBA::IRObject::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::IRObject::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -1884,41 +1874,40 @@ void POA_CORBA::IRObject::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_IRObject_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1932,20 +1921,19 @@ void POA_CORBA::IRObject::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IRObject * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1955,7 +1943,7 @@ void POA_CORBA::IRObject::_interface_skel (
void POA_CORBA::IRObject::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1965,24 +1953,24 @@ void POA_CORBA::IRObject::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IRObject * const impl =
static_cast<POA_CORBA::IRObject *> (servant);
-
+
_get_component_IRObject_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1994,7 +1982,6 @@ void POA_CORBA::IRObject::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::IRObject::_is_a (
@@ -2039,26 +2026,25 @@ void POA_CORBA::IRObject::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::IRObject *
-POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IRObject::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::IRObject STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2173,9 +2159,9 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14,
- 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 21,
+ -9, -2, -12, -2, 4, 5, -1, 50, 8, -45, 11, -1, -46, 14,
+ 15, 16, -1, 17, 18, -1, 19, -6, -2, 20, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 21,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2224,9 +2210,9 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Contained_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -2236,7 +2222,7 @@ CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::Contained::Contained (void)
@@ -2256,11 +2242,11 @@ POA_CORBA::Contained::~Contained (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_id_Contained
: public TAO::Upcall_Command
{
@@ -2274,20 +2260,19 @@ POA_CORBA::Contained::~Contained (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2296,7 +2281,7 @@ POA_CORBA::Contained::~Contained (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_get_id_skel (
@@ -2310,16 +2295,16 @@ void POA_CORBA::Contained::_get_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2327,7 +2312,7 @@ void POA_CORBA::Contained::_get_id_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2339,14 +2324,13 @@ void POA_CORBA::Contained::_get_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_id_Contained
: public TAO::Upcall_Command
{
@@ -2360,21 +2344,20 @@ void POA_CORBA::Contained::_get_id_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->id (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2383,7 +2366,7 @@ void POA_CORBA::Contained::_get_id_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_set_id_skel (
@@ -2397,18 +2380,18 @@ void POA_CORBA::Contained::_set_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2416,7 +2399,7 @@ void POA_CORBA::Contained::_set_id_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2428,14 +2411,13 @@ void POA_CORBA::Contained::_set_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_name_Contained
: public TAO::Upcall_Command
{
@@ -2449,20 +2431,19 @@ void POA_CORBA::Contained::_set_id_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Identifier>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->name (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2471,7 +2452,7 @@ void POA_CORBA::Contained::_set_id_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_get_name_skel (
@@ -2485,16 +2466,16 @@ void POA_CORBA::Contained::_get_name_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2502,7 +2483,7 @@ void POA_CORBA::Contained::_get_name_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2514,14 +2495,13 @@ void POA_CORBA::Contained::_get_name_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_name_Contained
: public TAO::Upcall_Command
{
@@ -2535,21 +2515,20 @@ void POA_CORBA::Contained::_get_name_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->name (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2558,7 +2537,7 @@ void POA_CORBA::Contained::_get_name_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_set_name_skel (
@@ -2572,18 +2551,18 @@ void POA_CORBA::Contained::_set_name_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_name
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2591,7 +2570,7 @@ void POA_CORBA::Contained::_set_name_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2603,14 +2582,13 @@ void POA_CORBA::Contained::_set_name_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_version_Contained
: public TAO::Upcall_Command
{
@@ -2624,20 +2602,19 @@ void POA_CORBA::Contained::_set_name_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->version (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2646,7 +2623,7 @@ void POA_CORBA::Contained::_set_name_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_get_version_skel (
@@ -2660,16 +2637,16 @@ void POA_CORBA::Contained::_get_version_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2677,7 +2654,7 @@ void POA_CORBA::Contained::_get_version_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2689,14 +2666,13 @@ void POA_CORBA::Contained::_get_version_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_version_Contained
: public TAO::Upcall_Command
{
@@ -2710,21 +2686,20 @@ void POA_CORBA::Contained::_get_version_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->version (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2733,7 +2708,7 @@ void POA_CORBA::Contained::_get_version_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_set_version_skel (
@@ -2747,18 +2722,18 @@ void POA_CORBA::Contained::_set_version_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_version
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2766,7 +2741,7 @@ void POA_CORBA::Contained::_set_version_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2778,14 +2753,13 @@ void POA_CORBA::Contained::_set_version_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_defined_in_Contained
: public TAO::Upcall_Command
{
@@ -2799,20 +2773,19 @@ void POA_CORBA::Contained::_set_version_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Container>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Container> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->defined_in (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2821,7 +2794,7 @@ void POA_CORBA::Contained::_set_version_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_get_defined_in_skel (
@@ -2835,16 +2808,16 @@ void POA_CORBA::Contained::_get_defined_in_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Container>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2852,7 +2825,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2864,14 +2837,13 @@ void POA_CORBA::Contained::_get_defined_in_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_absolute_name_Contained
: public TAO::Upcall_Command
{
@@ -2885,20 +2857,19 @@ void POA_CORBA::Contained::_get_defined_in_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ScopedName>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ScopedName> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->absolute_name (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2907,7 +2878,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_get_absolute_name_skel (
@@ -2921,16 +2892,16 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ScopedName>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -2938,7 +2909,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2950,14 +2921,13 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_containing_repository_Contained
: public TAO::Upcall_Command
{
@@ -2971,20 +2941,19 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Repository>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Repository> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->containing_repository (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2993,7 +2962,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::_get_containing_repository_skel (
@@ -3007,16 +2976,16 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Repository>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -3024,7 +2993,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3036,14 +3005,13 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_Contained
: public TAO::Upcall_Command
{
@@ -3057,20 +3025,19 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Contained::Description> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->describe (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3079,7 +3046,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::describe_skel (
@@ -3093,16 +3060,16 @@ void POA_CORBA::Contained::describe_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -3110,7 +3077,7 @@ void POA_CORBA::Contained::describe_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3122,14 +3089,13 @@ void POA_CORBA::Contained::describe_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class move_Contained
: public TAO::Upcall_Command
{
@@ -3143,35 +3109,34 @@ void POA_CORBA::Contained::describe_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Container>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Container> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
this->servant_->move (
arg_1
, arg_2
, arg_3
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3180,7 +3145,7 @@ void POA_CORBA::Contained::describe_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Contained::move_skel (
@@ -3194,12 +3159,12 @@ void POA_CORBA::Contained::move_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -3207,9 +3172,9 @@ void POA_CORBA::Contained::move_skel (
&_tao_new_name,
&_tao_new_version
};
-
+
static size_t const nargs = 4;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
@@ -3217,7 +3182,7 @@ void POA_CORBA::Contained::move_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3229,19 +3194,18 @@ void POA_CORBA::Contained::move_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_Contained_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3255,27 +3219,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3285,7 +3248,7 @@ namespace POA_CORBA
void POA_CORBA::Contained::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3295,26 +3258,26 @@ void POA_CORBA::Contained::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
-
+
_is_a_Contained_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3326,14 +3289,13 @@ void POA_CORBA::Contained::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_Contained_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3347,20 +3309,19 @@ void POA_CORBA::Contained::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3370,7 +3331,7 @@ void POA_CORBA::Contained::_is_a_skel (
void POA_CORBA::Contained::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3380,24 +3341,24 @@ void POA_CORBA::Contained::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
-
+
_non_existent_Contained_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3409,14 +3370,13 @@ void POA_CORBA::Contained::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_Contained_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3430,20 +3390,19 @@ void POA_CORBA::Contained::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3453,7 +3412,7 @@ void POA_CORBA::Contained::_non_existent_skel (
void POA_CORBA::Contained::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3463,24 +3422,24 @@ void POA_CORBA::Contained::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
-
+
_repository_id_Contained_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3492,14 +3451,13 @@ void POA_CORBA::Contained::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::Contained::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -3509,41 +3467,40 @@ void POA_CORBA::Contained::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_Contained_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3557,20 +3514,19 @@ void POA_CORBA::Contained::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Contained * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3580,7 +3536,7 @@ void POA_CORBA::Contained::_interface_skel (
void POA_CORBA::Contained::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3590,24 +3546,24 @@ void POA_CORBA::Contained::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Contained * const impl =
static_cast<POA_CORBA::Contained *> (servant);
-
+
_get_component_Contained_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3619,7 +3575,6 @@ void POA_CORBA::Contained::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::Contained::_is_a (
@@ -3668,26 +3623,25 @@ void POA_CORBA::Contained::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::Contained *
-POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Contained::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::Contained STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3809,9 +3763,9 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, -1, 6, 7, -1, -10, -2, 8, 9, -44,
- -12, -2, -42, 14, 15, -1, 16, 17, 18, 19, -1, 20, 21, 22,
- -1, -1, 23, 24, 25, 26, 27, 28, -1, -1, 29, -1, 30,
+ -1, -1, -1, -1, -1, -1, 6, 7, -1, -10, -2, 8, 9, -44,
+ -12, -2, -42, 14, 15, -1, 16, 17, 18, 19, -1, 20, 21, 22,
+ -1, -1, 23, 24, 25, 26, 27, 28, -1, -1, 29, -1, 30,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3860,9 +3814,9 @@ CORBA__TAO_Container_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Container_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -3872,7 +3826,7 @@ CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_Container_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::Container::Container (void)
@@ -3892,11 +3846,11 @@ POA_CORBA::Container::~Container (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class lookup_Container
: public TAO::Upcall_Command
{
@@ -3910,27 +3864,26 @@ POA_CORBA::Container::~Container (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Contained> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ScopedName> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->lookup (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3939,7 +3892,7 @@ POA_CORBA::Container::~Container (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::lookup_skel (
@@ -3953,18 +3906,18 @@ void POA_CORBA::Container::lookup_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_search_name
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -3972,7 +3925,7 @@ void POA_CORBA::Container::lookup_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3984,14 +3937,13 @@ void POA_CORBA::Container::lookup_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class contents_Container
: public TAO::Upcall_Command
{
@@ -4005,34 +3957,33 @@ void POA_CORBA::Container::lookup_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
2);
-
+
retval =
this->servant_->contents (
arg_1
, arg_2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4041,7 +3992,7 @@ void POA_CORBA::Container::lookup_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::contents_skel (
@@ -4055,20 +4006,20 @@ void POA_CORBA::Container::contents_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_limit_type,
&_tao_exclude_inherited
};
-
+
static size_t const nargs = 3;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4076,7 +4027,7 @@ void POA_CORBA::Container::contents_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4088,14 +4039,13 @@ void POA_CORBA::Container::contents_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class lookup_name_Container
: public TAO::Upcall_Command
{
@@ -4109,38 +4059,38 @@ void POA_CORBA::Container::contents_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Long> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->lookup_name (
arg_1
@@ -4148,9 +4098,8 @@ void POA_CORBA::Container::contents_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4159,7 +4108,7 @@ void POA_CORBA::Container::contents_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::lookup_name_skel (
@@ -4173,13 +4122,13 @@ void POA_CORBA::Container::lookup_name_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name;
TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search;
TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4188,9 +4137,9 @@ void POA_CORBA::Container::lookup_name_skel (
&_tao_limit_type,
&_tao_exclude_inherited
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4198,7 +4147,7 @@ void POA_CORBA::Container::lookup_name_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4210,14 +4159,13 @@ void POA_CORBA::Container::lookup_name_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_contents_Container
: public TAO::Upcall_Command
{
@@ -4231,41 +4179,40 @@ void POA_CORBA::Container::lookup_name_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Container::DescriptionSeq> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::Long> (
this->operation_details_,
this->args_,
3);
-
+
retval =
this->servant_->describe_contents (
arg_1
, arg_2
, arg_3
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4274,7 +4221,7 @@ void POA_CORBA::Container::lookup_name_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::describe_contents_skel (
@@ -4288,12 +4235,12 @@ void POA_CORBA::Container::describe_contents_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val retval;
TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4301,9 +4248,9 @@ void POA_CORBA::Container::describe_contents_skel (
&_tao_exclude_inherited,
&_tao_max_returned_objs
};
-
+
static size_t const nargs = 4;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4311,7 +4258,7 @@ void POA_CORBA::Container::describe_contents_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4323,14 +4270,13 @@ void POA_CORBA::Container::describe_contents_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_module_Container
: public TAO::Upcall_Command
{
@@ -4344,41 +4290,40 @@ void POA_CORBA::Container::describe_contents_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ModuleDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
retval =
this->servant_->create_module (
arg_1
, arg_2
, arg_3
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4387,7 +4332,7 @@ void POA_CORBA::Container::describe_contents_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_module_skel (
@@ -4401,12 +4346,12 @@ void POA_CORBA::Container::create_module_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4414,9 +4359,9 @@ void POA_CORBA::Container::create_module_skel (
&_tao_name,
&_tao_version
};
-
+
static size_t const nargs = 4;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4424,7 +4369,7 @@ void POA_CORBA::Container::create_module_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4436,14 +4381,13 @@ void POA_CORBA::Container::create_module_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_constant_Container
: public TAO::Upcall_Command
{
@@ -4457,44 +4401,44 @@ void POA_CORBA::Container::create_module_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ConstantDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::Any>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::Any> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_constant (
arg_1
@@ -4503,9 +4447,8 @@ void POA_CORBA::Container::create_module_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4514,7 +4457,7 @@ void POA_CORBA::Container::create_module_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_constant_skel (
@@ -4528,14 +4471,14 @@ void POA_CORBA::Container::create_constant_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4545,9 +4488,9 @@ void POA_CORBA::Container::create_constant_skel (
&_tao_type,
&_tao_value
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4555,7 +4498,7 @@ void POA_CORBA::Container::create_constant_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4567,14 +4510,13 @@ void POA_CORBA::Container::create_constant_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_struct_Container
: public TAO::Upcall_Command
{
@@ -4588,38 +4530,38 @@ void POA_CORBA::Container::create_constant_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::StructDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::StructDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_struct (
arg_1
@@ -4627,9 +4569,8 @@ void POA_CORBA::Container::create_constant_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4638,7 +4579,7 @@ void POA_CORBA::Container::create_constant_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_struct_skel (
@@ -4652,13 +4593,13 @@ void POA_CORBA::Container::create_struct_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::StructDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4667,9 +4608,9 @@ void POA_CORBA::Container::create_struct_skel (
&_tao_version,
&_tao_members
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4677,7 +4618,7 @@ void POA_CORBA::Container::create_struct_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4689,14 +4630,13 @@ void POA_CORBA::Container::create_struct_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_union_Container
: public TAO::Upcall_Command
{
@@ -4710,44 +4650,44 @@ void POA_CORBA::Container::create_struct_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::UnionDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::UnionDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_union (
arg_1
@@ -4756,9 +4696,8 @@ void POA_CORBA::Container::create_struct_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4767,7 +4706,7 @@ void POA_CORBA::Container::create_struct_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_union_skel (
@@ -4781,14 +4720,14 @@ void POA_CORBA::Container::create_union_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::UnionDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type;
TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4798,9 +4737,9 @@ void POA_CORBA::Container::create_union_skel (
&_tao_discriminator_type,
&_tao_members
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4808,7 +4747,7 @@ void POA_CORBA::Container::create_union_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4820,14 +4759,13 @@ void POA_CORBA::Container::create_union_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_enum_Container
: public TAO::Upcall_Command
{
@@ -4841,38 +4779,38 @@ void POA_CORBA::Container::create_union_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::EnumDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::EnumDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_enum (
arg_1
@@ -4880,9 +4818,8 @@ void POA_CORBA::Container::create_union_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4891,7 +4828,7 @@ void POA_CORBA::Container::create_union_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_enum_skel (
@@ -4905,13 +4842,13 @@ void POA_CORBA::Container::create_enum_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::EnumDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4920,9 +4857,9 @@ void POA_CORBA::Container::create_enum_skel (
&_tao_version,
&_tao_members
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -4930,7 +4867,7 @@ void POA_CORBA::Container::create_enum_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4942,14 +4879,13 @@ void POA_CORBA::Container::create_enum_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_alias_Container
: public TAO::Upcall_Command
{
@@ -4963,38 +4899,38 @@ void POA_CORBA::Container::create_enum_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::AliasDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::AliasDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_alias (
arg_1
@@ -5002,9 +4938,8 @@ void POA_CORBA::Container::create_enum_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5013,7 +4948,7 @@ void POA_CORBA::Container::create_enum_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_alias_skel (
@@ -5027,13 +4962,13 @@ void POA_CORBA::Container::create_alias_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::AliasDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5042,9 +4977,9 @@ void POA_CORBA::Container::create_alias_skel (
&_tao_version,
&_tao_original_type
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5052,7 +4987,7 @@ void POA_CORBA::Container::create_alias_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5064,14 +4999,13 @@ void POA_CORBA::Container::create_alias_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_interface_Container
: public TAO::Upcall_Command
{
@@ -5085,38 +5019,38 @@ void POA_CORBA::Container::create_alias_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_interface (
arg_1
@@ -5124,9 +5058,8 @@ void POA_CORBA::Container::create_alias_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5135,7 +5068,7 @@ void POA_CORBA::Container::create_alias_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_interface_skel (
@@ -5149,13 +5082,13 @@ void POA_CORBA::Container::create_interface_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5164,9 +5097,9 @@ void POA_CORBA::Container::create_interface_skel (
&_tao_version,
&_tao_base_interfaces
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5174,7 +5107,7 @@ void POA_CORBA::Container::create_interface_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5186,14 +5119,13 @@ void POA_CORBA::Container::create_interface_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_value_Container
: public TAO::Upcall_Command
{
@@ -5207,74 +5139,74 @@ void POA_CORBA::Container::create_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
7);
-
+
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
this->operation_details_,
this->args_,
8);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
9);
-
+
TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_10 =
TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq> (
this->operation_details_,
this->args_,
10);
-
+
retval =
this->servant_->create_value (
arg_1
@@ -5288,9 +5220,8 @@ void POA_CORBA::Container::create_interface_skel (
, arg_9
, arg_10
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5299,7 +5230,7 @@ void POA_CORBA::Container::create_interface_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_value_skel (
@@ -5313,7 +5244,7 @@ void POA_CORBA::Container::create_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -5325,7 +5256,7 @@ void POA_CORBA::Container::create_value_skel (
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5340,9 +5271,9 @@ void POA_CORBA::Container::create_value_skel (
&_tao_supported_interfaces,
&_tao_initializers
};
-
+
static size_t const nargs = 11;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5350,7 +5281,7 @@ void POA_CORBA::Container::create_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5362,14 +5293,13 @@ void POA_CORBA::Container::create_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_value_box_Container
: public TAO::Upcall_Command
{
@@ -5383,38 +5313,38 @@ void POA_CORBA::Container::create_value_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueBoxDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_value_box (
arg_1
@@ -5422,9 +5352,8 @@ void POA_CORBA::Container::create_value_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5433,7 +5362,7 @@ void POA_CORBA::Container::create_value_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_value_box_skel (
@@ -5447,13 +5376,13 @@ void POA_CORBA::Container::create_value_box_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5462,9 +5391,9 @@ void POA_CORBA::Container::create_value_box_skel (
&_tao_version,
&_tao_original_type_def
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5472,7 +5401,7 @@ void POA_CORBA::Container::create_value_box_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5484,14 +5413,13 @@ void POA_CORBA::Container::create_value_box_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_exception_Container
: public TAO::Upcall_Command
{
@@ -5505,38 +5433,38 @@ void POA_CORBA::Container::create_value_box_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_exception (
arg_1
@@ -5544,9 +5472,8 @@ void POA_CORBA::Container::create_value_box_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5555,7 +5482,7 @@ void POA_CORBA::Container::create_value_box_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_exception_skel (
@@ -5569,13 +5496,13 @@ void POA_CORBA::Container::create_exception_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5584,9 +5511,9 @@ void POA_CORBA::Container::create_exception_skel (
&_tao_version,
&_tao_members
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5594,7 +5521,7 @@ void POA_CORBA::Container::create_exception_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5606,14 +5533,13 @@ void POA_CORBA::Container::create_exception_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_native_Container
: public TAO::Upcall_Command
{
@@ -5627,41 +5553,40 @@ void POA_CORBA::Container::create_exception_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::NativeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::NativeDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
retval =
this->servant_->create_native (
arg_1
, arg_2
, arg_3
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5670,7 +5595,7 @@ void POA_CORBA::Container::create_exception_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_native_skel (
@@ -5684,12 +5609,12 @@ void POA_CORBA::Container::create_native_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::NativeDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5697,9 +5622,9 @@ void POA_CORBA::Container::create_native_skel (
&_tao_name,
&_tao_version
};
-
+
static size_t const nargs = 4;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5707,7 +5632,7 @@ void POA_CORBA::Container::create_native_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5719,14 +5644,13 @@ void POA_CORBA::Container::create_native_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_abstract_interface_Container
: public TAO::Upcall_Command
{
@@ -5740,38 +5664,38 @@ void POA_CORBA::Container::create_native_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::AbstractInterfaceDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::AbstractInterfaceDefSeq> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_abstract_interface (
arg_1
@@ -5779,9 +5703,8 @@ void POA_CORBA::Container::create_native_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5790,7 +5713,7 @@ void POA_CORBA::Container::create_native_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_abstract_interface_skel (
@@ -5804,13 +5727,13 @@ void POA_CORBA::Container::create_abstract_interface_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5819,9 +5742,9 @@ void POA_CORBA::Container::create_abstract_interface_skel (
&_tao_version,
&_tao_base_interfaces
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5829,7 +5752,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5841,14 +5764,13 @@ void POA_CORBA::Container::create_abstract_interface_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_local_interface_Container
: public TAO::Upcall_Command
{
@@ -5862,38 +5784,38 @@ void POA_CORBA::Container::create_abstract_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::LocalInterfaceDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_local_interface (
arg_1
@@ -5901,9 +5823,8 @@ void POA_CORBA::Container::create_abstract_interface_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5912,7 +5833,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_local_interface_skel (
@@ -5926,13 +5847,13 @@ void POA_CORBA::Container::create_local_interface_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5941,9 +5862,9 @@ void POA_CORBA::Container::create_local_interface_skel (
&_tao_version,
&_tao_base_interfaces
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -5951,7 +5872,7 @@ void POA_CORBA::Container::create_local_interface_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5963,14 +5884,13 @@ void POA_CORBA::Container::create_local_interface_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_ext_value_Container
: public TAO::Upcall_Command
{
@@ -5984,74 +5904,74 @@ void POA_CORBA::Container::create_local_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
7);
-
+
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
this->operation_details_,
this->args_,
8);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
9);
-
+
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq> (
this->operation_details_,
this->args_,
10);
-
+
retval =
this->servant_->create_ext_value (
arg_1
@@ -6065,9 +5985,8 @@ void POA_CORBA::Container::create_local_interface_skel (
, arg_9
, arg_10
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6076,7 +5995,7 @@ void POA_CORBA::Container::create_local_interface_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Container::create_ext_value_skel (
@@ -6090,7 +6009,7 @@ void POA_CORBA::Container::create_ext_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -6102,7 +6021,7 @@ void POA_CORBA::Container::create_ext_value_skel (
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -6117,9 +6036,9 @@ void POA_CORBA::Container::create_ext_value_skel (
&_tao_supported_interfaces,
&_tao_initializers
};
-
+
static size_t const nargs = 11;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
@@ -6127,7 +6046,7 @@ void POA_CORBA::Container::create_ext_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6139,19 +6058,18 @@ void POA_CORBA::Container::create_ext_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6165,27 +6083,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6195,7 +6112,7 @@ namespace POA_CORBA
void POA_CORBA::Container::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6205,26 +6122,26 @@ void POA_CORBA::Container::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
-
+
_is_a_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6236,14 +6153,13 @@ void POA_CORBA::Container::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6257,20 +6173,19 @@ void POA_CORBA::Container::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6280,7 +6195,7 @@ void POA_CORBA::Container::_is_a_skel (
void POA_CORBA::Container::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6290,24 +6205,24 @@ void POA_CORBA::Container::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
-
+
_non_existent_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6319,14 +6234,13 @@ void POA_CORBA::Container::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6340,20 +6254,19 @@ void POA_CORBA::Container::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6363,7 +6276,7 @@ void POA_CORBA::Container::_non_existent_skel (
void POA_CORBA::Container::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6373,24 +6286,24 @@ void POA_CORBA::Container::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
-
+
_repository_id_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6402,14 +6315,13 @@ void POA_CORBA::Container::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::Container::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -6419,41 +6331,40 @@ void POA_CORBA::Container::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6467,20 +6378,19 @@ void POA_CORBA::Container::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6490,7 +6400,7 @@ void POA_CORBA::Container::_interface_skel (
void POA_CORBA::Container::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6500,24 +6410,24 @@ void POA_CORBA::Container::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Container * const impl =
static_cast<POA_CORBA::Container *> (servant);
-
+
_get_component_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6529,7 +6439,6 @@ void POA_CORBA::Container::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::Container::_is_a (
@@ -6578,26 +6487,25 @@ void POA_CORBA::Container::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::Container *
-POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Container::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::Container STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6733,9 +6641,9 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_IDLType_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -6745,7 +6653,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::IDLType::IDLType (void)
@@ -6765,11 +6673,11 @@ POA_CORBA::IDLType::~IDLType (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_IDLType
: public TAO::Upcall_Command
{
@@ -6783,20 +6691,19 @@ POA_CORBA::IDLType::~IDLType (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IDLType * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6805,7 +6712,7 @@ POA_CORBA::IDLType::~IDLType (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::IDLType::_get_type_skel (
@@ -6819,16 +6726,16 @@ void POA_CORBA::IDLType::_get_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IDLType * const impl =
static_cast<POA_CORBA::IDLType *> (servant);
@@ -6836,7 +6743,7 @@ void POA_CORBA::IDLType::_get_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6848,19 +6755,18 @@ void POA_CORBA::IDLType::_get_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_IDLType_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6874,27 +6780,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IDLType * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6904,7 +6809,7 @@ namespace POA_CORBA
void POA_CORBA::IDLType::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6914,26 +6819,26 @@ void POA_CORBA::IDLType::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::IDLType * const impl =
static_cast<POA_CORBA::IDLType *> (servant);
-
+
_is_a_IDLType_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6945,14 +6850,13 @@ void POA_CORBA::IDLType::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_IDLType_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6966,20 +6870,19 @@ void POA_CORBA::IDLType::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IDLType * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6989,7 +6892,7 @@ void POA_CORBA::IDLType::_is_a_skel (
void POA_CORBA::IDLType::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6999,24 +6902,24 @@ void POA_CORBA::IDLType::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IDLType * const impl =
static_cast<POA_CORBA::IDLType *> (servant);
-
+
_non_existent_IDLType_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7028,14 +6931,13 @@ void POA_CORBA::IDLType::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_IDLType_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7049,20 +6951,19 @@ void POA_CORBA::IDLType::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IDLType * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7072,7 +6973,7 @@ void POA_CORBA::IDLType::_non_existent_skel (
void POA_CORBA::IDLType::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7082,24 +6983,24 @@ void POA_CORBA::IDLType::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IDLType * const impl =
static_cast<POA_CORBA::IDLType *> (servant);
-
+
_repository_id_IDLType_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7111,14 +7012,13 @@ void POA_CORBA::IDLType::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::IDLType::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7128,41 +7028,40 @@ void POA_CORBA::IDLType::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::IDLType * const impl =
static_cast<POA_CORBA::IDLType *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_IDLType_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7176,20 +7075,19 @@ void POA_CORBA::IDLType::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::IDLType * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7199,7 +7097,7 @@ void POA_CORBA::IDLType::_interface_skel (
void POA_CORBA::IDLType::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7209,24 +7107,24 @@ void POA_CORBA::IDLType::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::IDLType * const impl =
static_cast<POA_CORBA::IDLType *> (servant);
-
+
_get_component_IDLType_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7238,7 +7136,6 @@ void POA_CORBA::IDLType::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::IDLType::_is_a (
@@ -7287,26 +7184,25 @@ void POA_CORBA::IDLType::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::IDLType *
-POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IDLType::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::IDLType STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7422,9 +7318,9 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -9, -3, -13, -2, 4, 5, -1, 50, 8, -45, 12, -1, -46, 15,
- 16, 17, -1, 18, 19, -1, 20, -6, -2, 21, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 22,
+ -9, -3, -13, -2, 4, 5, -1, 50, 8, -45, 12, -1, -46, 15,
+ 16, 17, -1, 18, 19, -1, 20, -6, -2, 21, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 22,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7473,9 +7369,9 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -7485,7 +7381,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::TypedefDef::TypedefDef (void)
@@ -7507,16 +7403,16 @@ POA_CORBA::TypedefDef::~TypedefDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_TypedefDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7530,27 +7426,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::TypedefDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7560,7 +7455,7 @@ namespace POA_CORBA
void POA_CORBA::TypedefDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7570,26 +7465,26 @@ void POA_CORBA::TypedefDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::TypedefDef * const impl =
static_cast<POA_CORBA::TypedefDef *> (servant);
-
+
_is_a_TypedefDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7601,14 +7496,13 @@ void POA_CORBA::TypedefDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_TypedefDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7622,20 +7516,19 @@ void POA_CORBA::TypedefDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::TypedefDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7645,7 +7538,7 @@ void POA_CORBA::TypedefDef::_is_a_skel (
void POA_CORBA::TypedefDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7655,24 +7548,24 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::TypedefDef * const impl =
static_cast<POA_CORBA::TypedefDef *> (servant);
-
+
_non_existent_TypedefDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7684,14 +7577,13 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_TypedefDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7705,20 +7597,19 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::TypedefDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7728,7 +7619,7 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
void POA_CORBA::TypedefDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7738,24 +7629,24 @@ void POA_CORBA::TypedefDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::TypedefDef * const impl =
static_cast<POA_CORBA::TypedefDef *> (servant);
-
+
_repository_id_TypedefDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7767,14 +7658,13 @@ void POA_CORBA::TypedefDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::TypedefDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7784,41 +7674,40 @@ void POA_CORBA::TypedefDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::TypedefDef * const impl =
static_cast<POA_CORBA::TypedefDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_TypedefDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7832,20 +7721,19 @@ void POA_CORBA::TypedefDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::TypedefDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7855,7 +7743,7 @@ void POA_CORBA::TypedefDef::_interface_skel (
void POA_CORBA::TypedefDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7865,24 +7753,24 @@ void POA_CORBA::TypedefDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::TypedefDef * const impl =
static_cast<POA_CORBA::TypedefDef *> (servant);
-
+
_get_component_TypedefDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7894,7 +7782,6 @@ void POA_CORBA::TypedefDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
@@ -7951,26 +7838,25 @@ void POA_CORBA::TypedefDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::TypedefDef *
-POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::TypedefDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::TypedefDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
index 9a0772db14d..4745ffc2eee 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::IRObject_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -95,7 +95,7 @@ POA_CORBA::IRObject_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -113,17 +113,17 @@ POA_CORBA::IRObject_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IRObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IRObject_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->IRObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->IRObject::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -139,7 +139,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -208,7 +208,7 @@ POA_CORBA::Contained_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -220,7 +220,7 @@ POA_CORBA::Contained_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -238,17 +238,17 @@ POA_CORBA::Contained_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Contained_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Contained_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->Contained::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->Contained::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -264,7 +264,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -280,7 +280,7 @@ void POA_CORBA::Contained_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -296,7 +296,7 @@ char * POA_CORBA::Contained_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -314,7 +314,7 @@ void POA_CORBA::Contained_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -330,7 +330,7 @@ char * POA_CORBA::Contained_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -348,7 +348,7 @@ void POA_CORBA::Contained_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -364,7 +364,7 @@ char * POA_CORBA::Contained_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -382,7 +382,7 @@ void POA_CORBA::Contained_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -398,7 +398,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -414,7 +414,7 @@ char * POA_CORBA::Contained_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -430,7 +430,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -446,7 +446,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -521,7 +521,7 @@ POA_CORBA::Container_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -533,7 +533,7 @@ POA_CORBA::Container_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -551,17 +551,17 @@ POA_CORBA::Container_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Container_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->Container::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -577,7 +577,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -593,7 +593,7 @@ void POA_CORBA::Container_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -611,7 +611,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -631,7 +631,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -655,7 +655,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -677,7 +677,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -699,7 +699,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -725,7 +725,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -749,7 +749,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -775,7 +775,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -799,7 +799,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -823,7 +823,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -847,7 +847,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -883,7 +883,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -907,7 +907,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -931,7 +931,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -953,7 +953,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -977,7 +977,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1001,7 +1001,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1090,7 +1090,7 @@ POA_CORBA::IDLType_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1102,7 +1102,7 @@ POA_CORBA::IDLType_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1120,17 +1120,17 @@ POA_CORBA::IDLType_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IDLType_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IDLType_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->IDLType::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->IDLType::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1146,7 +1146,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1162,7 +1162,7 @@ void POA_CORBA::IDLType_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1231,7 +1231,7 @@ POA_CORBA::TypedefDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1243,7 +1243,7 @@ POA_CORBA::TypedefDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1261,17 +1261,17 @@ POA_CORBA::TypedefDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::TypedefDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::TypedefDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->TypedefDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->TypedefDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1287,7 +1287,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1303,7 +1303,7 @@ void POA_CORBA::TypedefDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1319,7 +1319,7 @@ char * POA_CORBA::TypedefDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1337,7 +1337,7 @@ void POA_CORBA::TypedefDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1353,7 +1353,7 @@ char * POA_CORBA::TypedefDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1371,7 +1371,7 @@ void POA_CORBA::TypedefDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1387,7 +1387,7 @@ char * POA_CORBA::TypedefDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1405,7 +1405,7 @@ void POA_CORBA::TypedefDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1421,7 +1421,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1437,7 +1437,7 @@ char * POA_CORBA::TypedefDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1453,7 +1453,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1469,7 +1469,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1491,7 +1491,7 @@ void POA_CORBA::TypedefDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 119645a9727..4c43a0e7327 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -26,7 +26,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_codegen.cpp:603
#ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASICS_CPP_
@@ -89,13 +89,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::DefinitionKind>
: public
@@ -107,13 +107,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
#define _CORBA_CONTAINED__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Contained>
: public
@@ -127,13 +127,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
#define _CORBA_REPOSITORY__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Repository>
: public
@@ -147,13 +147,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
#define _CORBA_CONTAINER__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Container>
: public
@@ -167,13 +167,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
#define _CORBA_IDLTYPE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::IDLType>
: public
@@ -187,13 +187,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -205,13 +205,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::StructMemberSeq>
: public
@@ -223,13 +223,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_)
#define _CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExcDescriptionSeq>
: public
@@ -241,13 +241,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::UnionMemberSeq>
: public
@@ -259,13 +259,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::EnumMemberSeq>
: public
@@ -277,13 +277,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_)
#define _CORBA_PRIMITIVEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::PrimitiveDef>
: public
@@ -297,13 +297,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_STRINGDEF__SARG_TRAITS_)
#define _CORBA_STRINGDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::StringDef>
: public
@@ -317,13 +317,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_)
#define _CORBA_SEQUENCEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::SequenceDef>
: public
@@ -337,13 +337,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_)
#define _CORBA_ARRAYDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ArrayDef>
: public
@@ -357,13 +357,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_)
#define _CORBA_WSTRINGDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::WstringDef>
: public
@@ -377,13 +377,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_)
#define _CORBA_FIXEDDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::FixedDef>
: public
@@ -397,13 +397,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_)
#define _CORBA_PRIMITIVEKIND__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::PrimitiveKind>
: public
@@ -415,13 +415,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExceptionDefSeq>
: public
@@ -433,13 +433,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AttributeMode>
: public
@@ -451,13 +451,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AttributeDef>
: public
@@ -471,13 +471,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_)
#define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtAttributeDescription>
: public
@@ -489,13 +489,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtAttributeDef>
: public
@@ -509,13 +509,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
#define _CORBA_OPERATIONMODE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::OperationMode>
: public
@@ -527,13 +527,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ParDescriptionSeq>
: public
@@ -545,13 +545,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ContextIdSeq>
: public
@@ -563,13 +563,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
#define _CORBA_OPERATIONDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::OperationDef>
: public
@@ -583,13 +583,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_)
#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
: public
@@ -601,13 +601,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_)
#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
: public
@@ -642,13 +642,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::DefinitionKind>
: public
@@ -660,13 +660,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
#define _CORBA_CONTAINED__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Contained>
: public
@@ -681,13 +681,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
#define _CORBA_REPOSITORY__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Repository>
: public
@@ -702,13 +702,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
#define _CORBA_CONTAINER__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Container>
: public
@@ -723,13 +723,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
#define _CORBA_IDLTYPE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::IDLType>
: public
@@ -744,13 +744,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -762,13 +762,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::StructMemberSeq>
: public
@@ -780,13 +780,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_)
#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExcDescriptionSeq>
: public
@@ -798,13 +798,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::UnionMemberSeq>
: public
@@ -816,13 +816,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::EnumMemberSeq>
: public
@@ -834,13 +834,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_)
#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::PrimitiveDef>
: public
@@ -855,13 +855,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_)
#define _CORBA_STRINGDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::StringDef>
: public
@@ -876,13 +876,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_)
#define _CORBA_SEQUENCEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::SequenceDef>
: public
@@ -897,13 +897,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_)
#define _CORBA_ARRAYDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ArrayDef>
: public
@@ -918,13 +918,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_)
#define _CORBA_WSTRINGDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::WstringDef>
: public
@@ -939,13 +939,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_)
#define _CORBA_FIXEDDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::FixedDef>
: public
@@ -960,13 +960,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_)
#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::PrimitiveKind>
: public
@@ -978,13 +978,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExceptionDefSeq>
: public
@@ -996,13 +996,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AttributeMode>
: public
@@ -1014,13 +1014,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AttributeDef>
: public
@@ -1035,13 +1035,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_)
#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtAttributeDescription>
: public
@@ -1053,13 +1053,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtAttributeDef>
: public
@@ -1074,13 +1074,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
#define _CORBA_OPERATIONMODE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::OperationMode>
: public
@@ -1092,13 +1092,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ParDescriptionSeq>
: public
@@ -1110,13 +1110,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ContextIdSeq>
: public
@@ -1128,13 +1128,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
#define _CORBA_OPERATIONDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::OperationDef>
: public
@@ -1149,13 +1149,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_)
#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
: public
@@ -1167,13 +1167,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_)
#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
: public
@@ -1317,11 +1317,11 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 13,
- 14, 15, 16, -19, -2, -22, -2, 17, 18, -63, -1, 21, -64, 24,
- -1, 25, -1, 26, 27, 28, 29, 30, 31, 32, 33, -1, 34, 35,
- 36, 37, 38, 39, -1, 40, -1, -1, -1, 41, 42, -1, -1, -1,
- -1, 43,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 13,
+ 14, 15, 16, -19, -2, -22, -2, 17, 18, -63, -1, 21, -64, 24,
+ -1, 25, -1, 26, 27, 28, 29, 30, 31, 32, 33, -1, 34, 35,
+ 36, 37, 38, 39, -1, 40, -1, -1, -1, 41, 42, -1, -1, -1,
+ -1, 43,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1370,9 +1370,9 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_Repository_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -1382,7 +1382,7 @@ CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::Repository::Repository (void)
@@ -1403,11 +1403,11 @@ POA_CORBA::Repository::~Repository (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class lookup_id_Repository
: public TAO::Upcall_Command
{
@@ -1421,27 +1421,26 @@ POA_CORBA::Repository::~Repository (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Contained> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->lookup_id (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1450,7 +1449,7 @@ POA_CORBA::Repository::~Repository (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::lookup_id_skel (
@@ -1464,18 +1463,18 @@ void POA_CORBA::Repository::lookup_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_search_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_search_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -1483,7 +1482,7 @@ void POA_CORBA::Repository::lookup_id_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1495,14 +1494,13 @@ void POA_CORBA::Repository::lookup_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class get_canonical_typecode_Repository
: public TAO::Upcall_Command
{
@@ -1516,27 +1514,26 @@ void POA_CORBA::Repository::lookup_id_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->get_canonical_typecode (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1545,7 +1542,7 @@ void POA_CORBA::Repository::lookup_id_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::get_canonical_typecode_skel (
@@ -1559,18 +1556,18 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_tc
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -1578,7 +1575,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1590,14 +1587,13 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class get_primitive_Repository
: public TAO::Upcall_Command
{
@@ -1611,27 +1607,26 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::PrimitiveKind> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->get_primitive (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1640,7 +1635,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::get_primitive_skel (
@@ -1654,18 +1649,18 @@ void POA_CORBA::Repository::get_primitive_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_val _tao_kind;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_kind
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -1673,7 +1668,7 @@ void POA_CORBA::Repository::get_primitive_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1685,14 +1680,13 @@ void POA_CORBA::Repository::get_primitive_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_string_Repository
: public TAO::Upcall_Command
{
@@ -1706,27 +1700,26 @@ void POA_CORBA::Repository::get_primitive_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::StringDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::StringDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->create_string (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1735,7 +1728,7 @@ void POA_CORBA::Repository::get_primitive_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::create_string_skel (
@@ -1749,18 +1742,18 @@ void POA_CORBA::Repository::create_string_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::StringDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_bound
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -1768,7 +1761,7 @@ void POA_CORBA::Repository::create_string_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1780,14 +1773,13 @@ void POA_CORBA::Repository::create_string_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_wstring_Repository
: public TAO::Upcall_Command
{
@@ -1801,27 +1793,26 @@ void POA_CORBA::Repository::create_string_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::WstringDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::WstringDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->create_wstring (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1830,7 +1821,7 @@ void POA_CORBA::Repository::create_string_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::create_wstring_skel (
@@ -1844,18 +1835,18 @@ void POA_CORBA::Repository::create_wstring_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::WstringDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_bound
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -1863,7 +1854,7 @@ void POA_CORBA::Repository::create_wstring_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1875,14 +1866,13 @@ void POA_CORBA::Repository::create_wstring_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_sequence_Repository
: public TAO::Upcall_Command
{
@@ -1896,34 +1886,33 @@ void POA_CORBA::Repository::create_wstring_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::SequenceDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
2);
-
+
retval =
this->servant_->create_sequence (
arg_1
, arg_2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1932,7 +1921,7 @@ void POA_CORBA::Repository::create_wstring_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::create_sequence_skel (
@@ -1946,20 +1935,20 @@ void POA_CORBA::Repository::create_sequence_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_bound,
&_tao_element_type
};
-
+
static size_t const nargs = 3;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -1967,7 +1956,7 @@ void POA_CORBA::Repository::create_sequence_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1979,14 +1968,13 @@ void POA_CORBA::Repository::create_sequence_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_array_Repository
: public TAO::Upcall_Command
{
@@ -2000,34 +1988,33 @@ void POA_CORBA::Repository::create_sequence_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ArrayDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
2);
-
+
retval =
this->servant_->create_array (
arg_1
, arg_2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2036,7 +2023,7 @@ void POA_CORBA::Repository::create_sequence_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::create_array_skel (
@@ -2050,20 +2037,20 @@ void POA_CORBA::Repository::create_array_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_length,
&_tao_element_type
};
-
+
static size_t const nargs = 3;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -2071,7 +2058,7 @@ void POA_CORBA::Repository::create_array_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2083,14 +2070,13 @@ void POA_CORBA::Repository::create_array_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_fixed_Repository
: public TAO::Upcall_Command
{
@@ -2104,34 +2090,33 @@ void POA_CORBA::Repository::create_array_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::FixedDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::FixedDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::UShort> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Short>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Short> (
this->operation_details_,
this->args_,
2);
-
+
retval =
this->servant_->create_fixed (
arg_1
, arg_2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2140,7 +2125,7 @@ void POA_CORBA::Repository::create_array_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::Repository::create_fixed_skel (
@@ -2154,20 +2139,20 @@ void POA_CORBA::Repository::create_fixed_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::FixedDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_digits,
&_tao_scale
};
-
+
static size_t const nargs = 3;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
@@ -2175,7 +2160,7 @@ void POA_CORBA::Repository::create_fixed_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2187,19 +2172,18 @@ void POA_CORBA::Repository::create_fixed_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2213,27 +2197,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2243,7 +2226,7 @@ namespace POA_CORBA
void POA_CORBA::Repository::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2253,26 +2236,26 @@ void POA_CORBA::Repository::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
-
+
_is_a_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2284,14 +2267,13 @@ void POA_CORBA::Repository::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2305,20 +2287,19 @@ void POA_CORBA::Repository::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2328,7 +2309,7 @@ void POA_CORBA::Repository::_is_a_skel (
void POA_CORBA::Repository::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2338,24 +2319,24 @@ void POA_CORBA::Repository::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
-
+
_non_existent_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2367,14 +2348,13 @@ void POA_CORBA::Repository::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2388,20 +2368,19 @@ void POA_CORBA::Repository::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2411,7 +2390,7 @@ void POA_CORBA::Repository::_non_existent_skel (
void POA_CORBA::Repository::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2421,24 +2400,24 @@ void POA_CORBA::Repository::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
-
+
_repository_id_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2450,14 +2429,13 @@ void POA_CORBA::Repository::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::Repository::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -2467,41 +2445,40 @@ void POA_CORBA::Repository::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2515,20 +2492,19 @@ void POA_CORBA::Repository::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2538,7 +2514,7 @@ void POA_CORBA::Repository::_interface_skel (
void POA_CORBA::Repository::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2548,24 +2524,24 @@ void POA_CORBA::Repository::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::Repository * const impl =
static_cast<POA_CORBA::Repository *> (servant);
-
+
_get_component_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2577,7 +2553,6 @@ void POA_CORBA::Repository::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::Repository::_is_a (
@@ -2630,26 +2605,25 @@ void POA_CORBA::Repository::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::Repository *
-POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Repository::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::Repository STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2782,11 +2756,11 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, -1, -1, -1, -1, -7, -2, 5, 6, -67,
- -9, -2, -65, 11, -1, -19, -2, 12, 13, 14, -1, 15, 16, 17,
- 18, -73, 21, 22, 23, -26, -2, 24, 25, -67, 28, -1, 29, -32,
- -2, 30, -1, 31, -1, -69, -1, -1, -1, 34, 35, 36, 37, -1,
- -1, -1, -1, -1, 38, -1, -1, 39,
+ -1, -1, -1, -1, 4, -1, -1, -1, -1, -7, -2, 5, 6, -67,
+ -9, -2, -65, 11, -1, -19, -2, 12, 13, 14, -1, 15, 16, 17,
+ 18, -73, 21, 22, 23, -26, -2, 24, 25, -67, 28, -1, 29, -32,
+ -2, 30, -1, 31, -1, -69, -1, -1, -1, 34, 35, 36, 37, -1,
+ -1, -1, -1, -1, 38, -1, -1, 39,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2835,9 +2809,9 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -2847,7 +2821,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ModuleDef::ModuleDef (void)
@@ -2869,16 +2843,16 @@ POA_CORBA::ModuleDef::~ModuleDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2892,27 +2866,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2922,7 +2895,7 @@ namespace POA_CORBA
void POA_CORBA::ModuleDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2932,26 +2905,26 @@ void POA_CORBA::ModuleDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ModuleDef * const impl =
static_cast<POA_CORBA::ModuleDef *> (servant);
-
+
_is_a_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2963,14 +2936,13 @@ void POA_CORBA::ModuleDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2984,20 +2956,19 @@ void POA_CORBA::ModuleDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3007,7 +2978,7 @@ void POA_CORBA::ModuleDef::_is_a_skel (
void POA_CORBA::ModuleDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3017,24 +2988,24 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ModuleDef * const impl =
static_cast<POA_CORBA::ModuleDef *> (servant);
-
+
_non_existent_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3046,14 +3017,13 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3067,20 +3037,19 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3090,7 +3059,7 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
void POA_CORBA::ModuleDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3100,24 +3069,24 @@ void POA_CORBA::ModuleDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ModuleDef * const impl =
static_cast<POA_CORBA::ModuleDef *> (servant);
-
+
_repository_id_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3129,14 +3098,13 @@ void POA_CORBA::ModuleDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ModuleDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -3146,41 +3114,40 @@ void POA_CORBA::ModuleDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ModuleDef * const impl =
static_cast<POA_CORBA::ModuleDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3194,20 +3161,19 @@ void POA_CORBA::ModuleDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3217,7 +3183,7 @@ void POA_CORBA::ModuleDef::_interface_skel (
void POA_CORBA::ModuleDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3227,24 +3193,24 @@ void POA_CORBA::ModuleDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ModuleDef * const impl =
static_cast<POA_CORBA::ModuleDef *> (servant);
-
+
_get_component_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3256,7 +3222,6 @@ void POA_CORBA::ModuleDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
@@ -3313,26 +3278,25 @@ void POA_CORBA::ModuleDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ModuleDef *
-POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ModuleDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ModuleDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3452,9 +3416,9 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
static const signed char lookup[] =
{
- -12, -3, -15, -2, 4, 5, -1, 53, 8, 48, -46, -1, -46, 17,
- 18, 19, -1, 20, 21, -1, 22, -9, -3, 23, -6, -2, -24, -2,
- -38, -1, -1, -1, -1, -1, -1, -1, 26,
+ -12, -3, -15, -2, 4, 5, -1, 53, 8, 48, -46, -1, -46, 17,
+ 18, 19, -1, 20, 21, -1, 22, -9, -3, 23, -6, -2, -24, -2,
+ -38, -1, -1, -1, -1, -1, -1, -1, 26,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3503,9 +3467,9 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -3515,7 +3479,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ConstantDef::ConstantDef (void)
@@ -3536,11 +3500,11 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_ConstantDef
: public TAO::Upcall_Command
{
@@ -3554,20 +3518,19 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3576,7 +3539,7 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ConstantDef::_get_type_skel (
@@ -3590,16 +3553,16 @@ void POA_CORBA::ConstantDef::_get_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -3607,7 +3570,7 @@ void POA_CORBA::ConstantDef::_get_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3619,14 +3582,13 @@ void POA_CORBA::ConstantDef::_get_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_def_ConstantDef
: public TAO::Upcall_Command
{
@@ -3640,20 +3602,19 @@ void POA_CORBA::ConstantDef::_get_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3662,7 +3623,7 @@ void POA_CORBA::ConstantDef::_get_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ConstantDef::_get_type_def_skel (
@@ -3676,16 +3637,16 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -3693,7 +3654,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3705,14 +3666,13 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_type_def_ConstantDef
: public TAO::Upcall_Command
{
@@ -3726,21 +3686,20 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3749,7 +3708,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ConstantDef::_set_type_def_skel (
@@ -3763,18 +3722,18 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -3782,7 +3741,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3794,14 +3753,13 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_value_ConstantDef
: public TAO::Upcall_Command
{
@@ -3815,20 +3773,19 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Any>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Any> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->value (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3837,7 +3794,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ConstantDef::_get_value_skel (
@@ -3851,16 +3808,16 @@ void POA_CORBA::ConstantDef::_get_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Any>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -3868,7 +3825,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3880,14 +3837,13 @@ void POA_CORBA::ConstantDef::_get_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_value_ConstantDef
: public TAO::Upcall_Command
{
@@ -3901,21 +3857,20 @@ void POA_CORBA::ConstantDef::_get_value_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Any>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Any> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->value (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3924,7 +3879,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ConstantDef::_set_value_skel (
@@ -3938,18 +3893,18 @@ void POA_CORBA::ConstantDef::_set_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_value
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -3957,7 +3912,7 @@ void POA_CORBA::ConstantDef::_set_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3969,19 +3924,18 @@ void POA_CORBA::ConstantDef::_set_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ConstantDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3995,27 +3949,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4025,7 +3978,7 @@ namespace POA_CORBA
void POA_CORBA::ConstantDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4035,26 +3988,26 @@ void POA_CORBA::ConstantDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
-
+
_is_a_ConstantDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4066,14 +4019,13 @@ void POA_CORBA::ConstantDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ConstantDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4087,20 +4039,19 @@ void POA_CORBA::ConstantDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4110,7 +4061,7 @@ void POA_CORBA::ConstantDef::_is_a_skel (
void POA_CORBA::ConstantDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4120,24 +4071,24 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
-
+
_non_existent_ConstantDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4149,14 +4100,13 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ConstantDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4170,20 +4120,19 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4193,7 +4142,7 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
void POA_CORBA::ConstantDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4203,24 +4152,24 @@ void POA_CORBA::ConstantDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
-
+
_repository_id_ConstantDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4232,14 +4181,13 @@ void POA_CORBA::ConstantDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ConstantDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -4249,41 +4197,40 @@ void POA_CORBA::ConstantDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ConstantDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4297,20 +4244,19 @@ void POA_CORBA::ConstantDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ConstantDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4320,7 +4266,7 @@ void POA_CORBA::ConstantDef::_interface_skel (
void POA_CORBA::ConstantDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4330,24 +4276,24 @@ void POA_CORBA::ConstantDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ConstantDef * const impl =
static_cast<POA_CORBA::ConstantDef *> (servant);
-
+
_get_component_ConstantDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4359,7 +4305,6 @@ void POA_CORBA::ConstantDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
@@ -4412,26 +4357,25 @@ void POA_CORBA::ConstantDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ConstantDef *
-POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstantDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ConstantDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4567,11 +4511,11 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15,
- -2, -68, 14, -64, 17, 18, 19, 20, 21, -1, -1, 22, -1, -1,
- -24, -2, 23, -1, -64, 26, -29, -2, 27, 28, -64, -31, -2, -62,
- 33, -1, -1, 34, 35, 36, -1, -1, 37, 38, -1, 39, -1, -1,
- 40, 41, 42, -1, 43,
+ -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15,
+ -2, -68, 14, -64, 17, 18, 19, 20, 21, -1, -1, 22, -1, -1,
+ -24, -2, 23, -1, -64, 26, -29, -2, 27, 28, -64, -31, -2, -62,
+ 33, -1, -1, 34, 35, 36, -1, -1, 37, 38, -1, 39, -1, -1,
+ 40, 41, 42, -1, 43,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4620,9 +4564,9 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_StructDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -4632,7 +4576,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::StructDef::StructDef (void)
@@ -4656,11 +4600,11 @@ POA_CORBA::StructDef::~StructDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_members_StructDef
: public TAO::Upcall_Command
{
@@ -4674,20 +4618,19 @@ POA_CORBA::StructDef::~StructDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->members (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StructDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4696,7 +4639,7 @@ POA_CORBA::StructDef::~StructDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::StructDef::_get_members_skel (
@@ -4710,16 +4653,16 @@ void POA_CORBA::StructDef::_get_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
@@ -4727,7 +4670,7 @@ void POA_CORBA::StructDef::_get_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4739,14 +4682,13 @@ void POA_CORBA::StructDef::_get_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_members_StructDef
: public TAO::Upcall_Command
{
@@ -4760,21 +4702,20 @@ void POA_CORBA::StructDef::_get_members_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->members (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StructDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4783,7 +4724,7 @@ void POA_CORBA::StructDef::_get_members_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::StructDef::_set_members_skel (
@@ -4797,18 +4738,18 @@ void POA_CORBA::StructDef::_set_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_members
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
@@ -4816,7 +4757,7 @@ void POA_CORBA::StructDef::_set_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4828,19 +4769,18 @@ void POA_CORBA::StructDef::_set_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_StructDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4854,27 +4794,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StructDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4884,7 +4823,7 @@ namespace POA_CORBA
void POA_CORBA::StructDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4894,26 +4833,26 @@ void POA_CORBA::StructDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
-
+
_is_a_StructDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4925,14 +4864,13 @@ void POA_CORBA::StructDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_StructDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4946,20 +4884,19 @@ void POA_CORBA::StructDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StructDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4969,7 +4906,7 @@ void POA_CORBA::StructDef::_is_a_skel (
void POA_CORBA::StructDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4979,24 +4916,24 @@ void POA_CORBA::StructDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
-
+
_non_existent_StructDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5008,14 +4945,13 @@ void POA_CORBA::StructDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_StructDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5029,20 +4965,19 @@ void POA_CORBA::StructDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StructDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5052,7 +4987,7 @@ void POA_CORBA::StructDef::_non_existent_skel (
void POA_CORBA::StructDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5062,24 +4997,24 @@ void POA_CORBA::StructDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
-
+
_repository_id_StructDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5091,14 +5026,13 @@ void POA_CORBA::StructDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::StructDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -5108,41 +5042,40 @@ void POA_CORBA::StructDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_StructDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5156,20 +5089,19 @@ void POA_CORBA::StructDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StructDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5179,7 +5111,7 @@ void POA_CORBA::StructDef::_interface_skel (
void POA_CORBA::StructDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5189,24 +5121,24 @@ void POA_CORBA::StructDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StructDef * const impl =
static_cast<POA_CORBA::StructDef *> (servant);
-
+
_get_component_StructDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5218,7 +5150,6 @@ void POA_CORBA::StructDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::StructDef::_is_a (
@@ -5283,26 +5214,25 @@ void POA_CORBA::StructDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::StructDef *
-POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StructDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::StructDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5441,13 +5371,13 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, 5, 6, -7, -3, -87, 10, 11, -1, -1,
- -1, -1, -1, -1, 12, -1, -1, -14, -2, 13, -1, -17, -2, -91,
- -21, -2, 16, -1, -92, -1, -23, -2, 19, 20, -95, -25, -2, -92,
- -88, 27, -1, -1, 28, 29, 30, 31, 32, 33, 34, 35, -1, 36,
- 37, 38, 39, -1, -40, -2, -87, -1, -1, -1, -1, 42, -1, -1,
- -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44,
- -1, 45,
+ -1, -1, -1, -1, 4, 5, 6, -7, -3, -87, 10, 11, -1, -1,
+ -1, -1, -1, -1, 12, -1, -1, -14, -2, 13, -1, -17, -2, -91,
+ -21, -2, 16, -1, -92, -1, -23, -2, 19, 20, -95, -25, -2, -92,
+ -88, 27, -1, -1, 28, 29, 30, 31, 32, 33, 34, 35, -1, 36,
+ 37, 38, 39, -1, -40, -2, -87, -1, -1, -1, -1, 42, -1, -1,
+ -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44,
+ -1, 45,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5496,9 +5426,9 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_UnionDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -5508,7 +5438,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::UnionDef::UnionDef (void)
@@ -5532,11 +5462,11 @@ POA_CORBA::UnionDef::~UnionDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_discriminator_type_UnionDef
: public TAO::Upcall_Command
{
@@ -5550,20 +5480,19 @@ POA_CORBA::UnionDef::~UnionDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->discriminator_type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5572,7 +5501,7 @@ POA_CORBA::UnionDef::~UnionDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::UnionDef::_get_discriminator_type_skel (
@@ -5586,16 +5515,16 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
@@ -5603,7 +5532,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5615,14 +5544,13 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_discriminator_type_def_UnionDef
: public TAO::Upcall_Command
{
@@ -5636,20 +5564,19 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->discriminator_type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5658,7 +5585,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
@@ -5672,16 +5599,16 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
@@ -5689,7 +5616,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5701,14 +5628,13 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_discriminator_type_def_UnionDef
: public TAO::Upcall_Command
{
@@ -5722,21 +5648,20 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->discriminator_type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5745,7 +5670,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
@@ -5759,18 +5684,18 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_discriminator_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
@@ -5778,7 +5703,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5790,14 +5715,13 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_members_UnionDef
: public TAO::Upcall_Command
{
@@ -5811,20 +5735,19 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::UnionMemberSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->members (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5833,7 +5756,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::UnionDef::_get_members_skel (
@@ -5847,16 +5770,16 @@ void POA_CORBA::UnionDef::_get_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
@@ -5864,7 +5787,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5876,14 +5799,13 @@ void POA_CORBA::UnionDef::_get_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_members_UnionDef
: public TAO::Upcall_Command
{
@@ -5897,21 +5819,20 @@ void POA_CORBA::UnionDef::_get_members_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->members (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5920,7 +5841,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::UnionDef::_set_members_skel (
@@ -5934,18 +5855,18 @@ void POA_CORBA::UnionDef::_set_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_members
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
@@ -5953,7 +5874,7 @@ void POA_CORBA::UnionDef::_set_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5965,19 +5886,18 @@ void POA_CORBA::UnionDef::_set_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_UnionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5991,27 +5911,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6021,7 +5940,7 @@ namespace POA_CORBA
void POA_CORBA::UnionDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6031,26 +5950,26 @@ void POA_CORBA::UnionDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
-
+
_is_a_UnionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6062,14 +5981,13 @@ void POA_CORBA::UnionDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_UnionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6083,20 +6001,19 @@ void POA_CORBA::UnionDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6106,7 +6023,7 @@ void POA_CORBA::UnionDef::_is_a_skel (
void POA_CORBA::UnionDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6116,24 +6033,24 @@ void POA_CORBA::UnionDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
-
+
_non_existent_UnionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6145,14 +6062,13 @@ void POA_CORBA::UnionDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_UnionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6166,20 +6082,19 @@ void POA_CORBA::UnionDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6189,7 +6104,7 @@ void POA_CORBA::UnionDef::_non_existent_skel (
void POA_CORBA::UnionDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6199,24 +6114,24 @@ void POA_CORBA::UnionDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
-
+
_repository_id_UnionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6228,14 +6143,13 @@ void POA_CORBA::UnionDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::UnionDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -6245,41 +6159,40 @@ void POA_CORBA::UnionDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_UnionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6293,20 +6206,19 @@ void POA_CORBA::UnionDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::UnionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6316,7 +6228,7 @@ void POA_CORBA::UnionDef::_interface_skel (
void POA_CORBA::UnionDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6326,24 +6238,24 @@ void POA_CORBA::UnionDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::UnionDef * const impl =
static_cast<POA_CORBA::UnionDef *> (servant);
-
+
_get_component_UnionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6355,7 +6267,6 @@ void POA_CORBA::UnionDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::UnionDef::_is_a (
@@ -6420,26 +6331,25 @@ void POA_CORBA::UnionDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::UnionDef *
-POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::UnionDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::UnionDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6557,9 +6467,9 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
static const signed char lookup[] =
{
- -13, -2, -21, -2, 4, 5, -1, 55, 8, 51, 12, -1, -48, 15,
- 16, 17, -1, 18, 19, -1, 20, -1, -56, 23, -9, -3, -6, -2,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -13, -2, -21, -2, 4, 5, -1, 55, 8, 51, 12, -1, -48, 15,
+ 16, 17, -1, 18, 19, -1, 20, -1, -56, 23, -9, -3, -6, -2,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6608,9 +6518,9 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_EnumDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -6620,7 +6530,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::EnumDef::EnumDef (void)
@@ -6643,11 +6553,11 @@ POA_CORBA::EnumDef::~EnumDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_members_EnumDef
: public TAO::Upcall_Command
{
@@ -6661,20 +6571,19 @@ POA_CORBA::EnumDef::~EnumDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::EnumMemberSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->members (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::EnumDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6683,7 +6592,7 @@ POA_CORBA::EnumDef::~EnumDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::EnumDef::_get_members_skel (
@@ -6697,16 +6606,16 @@ void POA_CORBA::EnumDef::_get_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
@@ -6714,7 +6623,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6726,14 +6635,13 @@ void POA_CORBA::EnumDef::_get_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_members_EnumDef
: public TAO::Upcall_Command
{
@@ -6747,21 +6655,20 @@ void POA_CORBA::EnumDef::_get_members_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->members (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::EnumDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6770,7 +6677,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::EnumDef::_set_members_skel (
@@ -6784,18 +6691,18 @@ void POA_CORBA::EnumDef::_set_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_members
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
@@ -6803,7 +6710,7 @@ void POA_CORBA::EnumDef::_set_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6815,19 +6722,18 @@ void POA_CORBA::EnumDef::_set_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_EnumDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6841,27 +6747,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::EnumDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6871,7 +6776,7 @@ namespace POA_CORBA
void POA_CORBA::EnumDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6881,26 +6786,26 @@ void POA_CORBA::EnumDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
-
+
_is_a_EnumDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6912,14 +6817,13 @@ void POA_CORBA::EnumDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_EnumDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6933,20 +6837,19 @@ void POA_CORBA::EnumDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::EnumDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6956,7 +6859,7 @@ void POA_CORBA::EnumDef::_is_a_skel (
void POA_CORBA::EnumDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6966,24 +6869,24 @@ void POA_CORBA::EnumDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
-
+
_non_existent_EnumDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6995,14 +6898,13 @@ void POA_CORBA::EnumDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_EnumDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7016,20 +6918,19 @@ void POA_CORBA::EnumDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::EnumDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7039,7 +6940,7 @@ void POA_CORBA::EnumDef::_non_existent_skel (
void POA_CORBA::EnumDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7049,24 +6950,24 @@ void POA_CORBA::EnumDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
-
+
_repository_id_EnumDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7078,14 +6979,13 @@ void POA_CORBA::EnumDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::EnumDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7095,41 +6995,40 @@ void POA_CORBA::EnumDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_EnumDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7143,20 +7042,19 @@ void POA_CORBA::EnumDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::EnumDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7166,7 +7064,7 @@ void POA_CORBA::EnumDef::_interface_skel (
void POA_CORBA::EnumDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7176,24 +7074,24 @@ void POA_CORBA::EnumDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::EnumDef * const impl =
static_cast<POA_CORBA::EnumDef *> (servant);
-
+
_get_component_EnumDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7205,7 +7103,6 @@ void POA_CORBA::EnumDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::EnumDef::_is_a (
@@ -7266,26 +7163,25 @@ void POA_CORBA::EnumDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::EnumDef *
-POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::EnumDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::EnumDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7403,9 +7299,9 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
static const signed char lookup[] =
{
- -13, -2, -21, -2, 4, 5, -1, 55, 8, 51, 12, -1, -48, 15,
- 16, 17, -1, 18, 19, -1, 20, -1, -56, 23, -9, -3, -6, -2,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -13, -2, -21, -2, 4, 5, -1, 55, 8, 51, 12, -1, -48, 15,
+ 16, 17, -1, 18, 19, -1, 20, -1, -56, 23, -9, -3, -6, -2,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7454,9 +7350,9 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_AliasDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -7466,7 +7362,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::AliasDef::AliasDef (void)
@@ -7489,11 +7385,11 @@ POA_CORBA::AliasDef::~AliasDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_original_type_def_AliasDef
: public TAO::Upcall_Command
{
@@ -7507,20 +7403,19 @@ POA_CORBA::AliasDef::~AliasDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->original_type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AliasDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7529,7 +7424,7 @@ POA_CORBA::AliasDef::~AliasDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AliasDef::_get_original_type_def_skel (
@@ -7543,16 +7438,16 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
@@ -7560,7 +7455,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7572,14 +7467,13 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_original_type_def_AliasDef
: public TAO::Upcall_Command
{
@@ -7593,21 +7487,20 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->original_type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AliasDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7616,7 +7509,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AliasDef::_set_original_type_def_skel (
@@ -7630,18 +7523,18 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_original_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
@@ -7649,7 +7542,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7661,19 +7554,18 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_AliasDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7687,27 +7579,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AliasDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7717,7 +7608,7 @@ namespace POA_CORBA
void POA_CORBA::AliasDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7727,26 +7618,26 @@ void POA_CORBA::AliasDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
-
+
_is_a_AliasDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7758,14 +7649,13 @@ void POA_CORBA::AliasDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_AliasDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7779,20 +7669,19 @@ void POA_CORBA::AliasDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AliasDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7802,7 +7691,7 @@ void POA_CORBA::AliasDef::_is_a_skel (
void POA_CORBA::AliasDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7812,24 +7701,24 @@ void POA_CORBA::AliasDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
-
+
_non_existent_AliasDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7841,14 +7730,13 @@ void POA_CORBA::AliasDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_AliasDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7862,20 +7750,19 @@ void POA_CORBA::AliasDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AliasDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7885,7 +7772,7 @@ void POA_CORBA::AliasDef::_non_existent_skel (
void POA_CORBA::AliasDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7895,24 +7782,24 @@ void POA_CORBA::AliasDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
-
+
_repository_id_AliasDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7924,14 +7811,13 @@ void POA_CORBA::AliasDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::AliasDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7941,41 +7827,40 @@ void POA_CORBA::AliasDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_AliasDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7989,20 +7874,19 @@ void POA_CORBA::AliasDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AliasDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -8012,7 +7896,7 @@ void POA_CORBA::AliasDef::_interface_skel (
void POA_CORBA::AliasDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8022,24 +7906,24 @@ void POA_CORBA::AliasDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AliasDef * const impl =
static_cast<POA_CORBA::AliasDef *> (servant);
-
+
_get_component_AliasDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8051,7 +7935,6 @@ void POA_CORBA::AliasDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::AliasDef::_is_a (
@@ -8112,26 +7995,25 @@ void POA_CORBA::AliasDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::AliasDef *
-POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AliasDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::AliasDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8247,9 +8129,9 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -9, -3, -13, -2, 4, 5, -1, 50, 8, -45, 12, -1, -46, 15,
- 16, 17, -1, 18, 19, -1, 20, -6, -2, 21, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 22,
+ -9, -3, -13, -2, 4, 5, -1, 50, 8, -45, 12, -1, -46, 15,
+ 16, 17, -1, 18, 19, -1, 20, -6, -2, 21, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 22,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8298,9 +8180,9 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_NativeDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -8310,7 +8192,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::NativeDef::NativeDef (void)
@@ -8333,16 +8215,16 @@ POA_CORBA::NativeDef::~NativeDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_NativeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8356,27 +8238,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::NativeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -8386,7 +8267,7 @@ namespace POA_CORBA
void POA_CORBA::NativeDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8396,26 +8277,26 @@ void POA_CORBA::NativeDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::NativeDef * const impl =
static_cast<POA_CORBA::NativeDef *> (servant);
-
+
_is_a_NativeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8427,14 +8308,13 @@ void POA_CORBA::NativeDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_NativeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8448,20 +8328,19 @@ void POA_CORBA::NativeDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::NativeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -8471,7 +8350,7 @@ void POA_CORBA::NativeDef::_is_a_skel (
void POA_CORBA::NativeDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8481,24 +8360,24 @@ void POA_CORBA::NativeDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::NativeDef * const impl =
static_cast<POA_CORBA::NativeDef *> (servant);
-
+
_non_existent_NativeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8510,14 +8389,13 @@ void POA_CORBA::NativeDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_NativeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8531,20 +8409,19 @@ void POA_CORBA::NativeDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::NativeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -8554,7 +8431,7 @@ void POA_CORBA::NativeDef::_non_existent_skel (
void POA_CORBA::NativeDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8564,24 +8441,24 @@ void POA_CORBA::NativeDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::NativeDef * const impl =
static_cast<POA_CORBA::NativeDef *> (servant);
-
+
_repository_id_NativeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8593,14 +8470,13 @@ void POA_CORBA::NativeDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::NativeDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -8610,41 +8486,40 @@ void POA_CORBA::NativeDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::NativeDef * const impl =
static_cast<POA_CORBA::NativeDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_NativeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8658,20 +8533,19 @@ void POA_CORBA::NativeDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::NativeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -8681,7 +8555,7 @@ void POA_CORBA::NativeDef::_interface_skel (
void POA_CORBA::NativeDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8691,24 +8565,24 @@ void POA_CORBA::NativeDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::NativeDef * const impl =
static_cast<POA_CORBA::NativeDef *> (servant);
-
+
_get_component_NativeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8720,7 +8594,6 @@ void POA_CORBA::NativeDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::NativeDef::_is_a (
@@ -8781,26 +8654,25 @@ void POA_CORBA::NativeDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::NativeDef *
-POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::NativeDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::NativeDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8937,9 +8809,9 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -8949,7 +8821,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::PrimitiveDef::PrimitiveDef (void)
@@ -8970,11 +8842,11 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_kind_PrimitiveDef
: public TAO::Upcall_Command
{
@@ -8988,20 +8860,19 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveKind> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->kind (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::PrimitiveDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9010,7 +8881,7 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::PrimitiveDef::_get_kind_skel (
@@ -9024,16 +8895,16 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::PrimitiveDef * const impl =
static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -9041,7 +8912,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9053,19 +8924,18 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_PrimitiveDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9079,27 +8949,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::PrimitiveDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9109,7 +8978,7 @@ namespace POA_CORBA
void POA_CORBA::PrimitiveDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9119,26 +8988,26 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::PrimitiveDef * const impl =
static_cast<POA_CORBA::PrimitiveDef *> (servant);
-
+
_is_a_PrimitiveDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9150,14 +9019,13 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_PrimitiveDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9171,20 +9039,19 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::PrimitiveDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9194,7 +9061,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
void POA_CORBA::PrimitiveDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9204,24 +9071,24 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::PrimitiveDef * const impl =
static_cast<POA_CORBA::PrimitiveDef *> (servant);
-
+
_non_existent_PrimitiveDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9233,14 +9100,13 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_PrimitiveDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9254,20 +9120,19 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::PrimitiveDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9277,7 +9142,7 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
void POA_CORBA::PrimitiveDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9287,24 +9152,24 @@ void POA_CORBA::PrimitiveDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::PrimitiveDef * const impl =
static_cast<POA_CORBA::PrimitiveDef *> (servant);
-
+
_repository_id_PrimitiveDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9316,14 +9181,13 @@ void POA_CORBA::PrimitiveDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::PrimitiveDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -9333,41 +9197,40 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::PrimitiveDef * const impl =
static_cast<POA_CORBA::PrimitiveDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_PrimitiveDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9381,20 +9244,19 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::PrimitiveDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9404,7 +9266,7 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
void POA_CORBA::PrimitiveDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9414,24 +9276,24 @@ void POA_CORBA::PrimitiveDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::PrimitiveDef * const impl =
static_cast<POA_CORBA::PrimitiveDef *> (servant);
-
+
_get_component_PrimitiveDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9443,7 +9305,6 @@ void POA_CORBA::PrimitiveDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
@@ -9496,26 +9357,25 @@ void POA_CORBA::PrimitiveDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::PrimitiveDef *
-POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::PrimitiveDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::PrimitiveDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9622,8 +9482,8 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -22, -1, -1, 9,
- 10, 11, -1, -1, 12, 13, 14,
+ -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -22, -1, -1, 9,
+ 10, 11, -1, -1, 12, 13, 14,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9672,9 +9532,9 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_StringDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -9684,7 +9544,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::StringDef::StringDef (void)
@@ -9705,11 +9565,11 @@ POA_CORBA::StringDef::~StringDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_bound_StringDef
: public TAO::Upcall_Command
{
@@ -9723,20 +9583,19 @@ POA_CORBA::StringDef::~StringDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->bound (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9745,7 +9604,7 @@ POA_CORBA::StringDef::~StringDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::StringDef::_get_bound_skel (
@@ -9759,16 +9618,16 @@ void POA_CORBA::StringDef::_get_bound_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
@@ -9776,7 +9635,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9788,14 +9647,13 @@ void POA_CORBA::StringDef::_get_bound_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_bound_StringDef
: public TAO::Upcall_Command
{
@@ -9809,21 +9667,20 @@ void POA_CORBA::StringDef::_get_bound_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->bound (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9832,7 +9689,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::StringDef::_set_bound_skel (
@@ -9846,18 +9703,18 @@ void POA_CORBA::StringDef::_set_bound_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_bound
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
@@ -9865,7 +9722,7 @@ void POA_CORBA::StringDef::_set_bound_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9877,19 +9734,18 @@ void POA_CORBA::StringDef::_set_bound_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_StringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9903,27 +9759,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -9933,7 +9788,7 @@ namespace POA_CORBA
void POA_CORBA::StringDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9943,26 +9798,26 @@ void POA_CORBA::StringDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
-
+
_is_a_StringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9974,14 +9829,13 @@ void POA_CORBA::StringDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_StringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9995,20 +9849,19 @@ void POA_CORBA::StringDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10018,7 +9871,7 @@ void POA_CORBA::StringDef::_is_a_skel (
void POA_CORBA::StringDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10028,24 +9881,24 @@ void POA_CORBA::StringDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
-
+
_non_existent_StringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10057,14 +9910,13 @@ void POA_CORBA::StringDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_StringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10078,20 +9930,19 @@ void POA_CORBA::StringDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10101,7 +9952,7 @@ void POA_CORBA::StringDef::_non_existent_skel (
void POA_CORBA::StringDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10111,24 +9962,24 @@ void POA_CORBA::StringDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
-
+
_repository_id_StringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10140,14 +9991,13 @@ void POA_CORBA::StringDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::StringDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -10157,41 +10007,40 @@ void POA_CORBA::StringDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_StringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10205,20 +10054,19 @@ void POA_CORBA::StringDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::StringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10228,7 +10076,7 @@ void POA_CORBA::StringDef::_interface_skel (
void POA_CORBA::StringDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10238,24 +10086,24 @@ void POA_CORBA::StringDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::StringDef * const impl =
static_cast<POA_CORBA::StringDef *> (servant);
-
+
_get_component_StringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10267,7 +10115,6 @@ void POA_CORBA::StringDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::StringDef::_is_a (
@@ -10320,26 +10167,25 @@ void POA_CORBA::StringDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::StringDef *
-POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StringDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::StringDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -10446,8 +10292,8 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -22, -1, -1, 9,
- 10, 11, -1, -1, 12, 13, 14,
+ -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -22, -1, -1, 9,
+ 10, 11, -1, -1, 12, 13, 14,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10496,9 +10342,9 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_WstringDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -10508,7 +10354,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::WstringDef::WstringDef (void)
@@ -10529,11 +10375,11 @@ POA_CORBA::WstringDef::~WstringDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_bound_WstringDef
: public TAO::Upcall_Command
{
@@ -10547,20 +10393,19 @@ POA_CORBA::WstringDef::~WstringDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->bound (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::WstringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10569,7 +10414,7 @@ POA_CORBA::WstringDef::~WstringDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::WstringDef::_get_bound_skel (
@@ -10583,16 +10428,16 @@ void POA_CORBA::WstringDef::_get_bound_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
@@ -10600,7 +10445,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10612,14 +10457,13 @@ void POA_CORBA::WstringDef::_get_bound_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_bound_WstringDef
: public TAO::Upcall_Command
{
@@ -10633,21 +10477,20 @@ void POA_CORBA::WstringDef::_get_bound_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->bound (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::WstringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10656,7 +10499,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::WstringDef::_set_bound_skel (
@@ -10670,18 +10513,18 @@ void POA_CORBA::WstringDef::_set_bound_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_bound
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
@@ -10689,7 +10532,7 @@ void POA_CORBA::WstringDef::_set_bound_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10701,19 +10544,18 @@ void POA_CORBA::WstringDef::_set_bound_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_WstringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10727,27 +10569,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::WstringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10757,7 +10598,7 @@ namespace POA_CORBA
void POA_CORBA::WstringDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10767,26 +10608,26 @@ void POA_CORBA::WstringDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
-
+
_is_a_WstringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10798,14 +10639,13 @@ void POA_CORBA::WstringDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_WstringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10819,20 +10659,19 @@ void POA_CORBA::WstringDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::WstringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10842,7 +10681,7 @@ void POA_CORBA::WstringDef::_is_a_skel (
void POA_CORBA::WstringDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10852,24 +10691,24 @@ void POA_CORBA::WstringDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
-
+
_non_existent_WstringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10881,14 +10720,13 @@ void POA_CORBA::WstringDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_WstringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10902,20 +10740,19 @@ void POA_CORBA::WstringDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::WstringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -10925,7 +10762,7 @@ void POA_CORBA::WstringDef::_non_existent_skel (
void POA_CORBA::WstringDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10935,24 +10772,24 @@ void POA_CORBA::WstringDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
-
+
_repository_id_WstringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10964,14 +10801,13 @@ void POA_CORBA::WstringDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::WstringDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -10981,41 +10817,40 @@ void POA_CORBA::WstringDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_WstringDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11029,20 +10864,19 @@ void POA_CORBA::WstringDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::WstringDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11052,7 +10886,7 @@ void POA_CORBA::WstringDef::_interface_skel (
void POA_CORBA::WstringDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11062,24 +10896,24 @@ void POA_CORBA::WstringDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::WstringDef * const impl =
static_cast<POA_CORBA::WstringDef *> (servant);
-
+
_get_component_WstringDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11091,7 +10925,6 @@ void POA_CORBA::WstringDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::WstringDef::_is_a (
@@ -11144,26 +10977,25 @@ void POA_CORBA::WstringDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::WstringDef *
-POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::WstringDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::WstringDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11273,9 +11105,9 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -29, -1, -1, 9,
- 10, 11, -15, -2, 12, 13, 14, -32, -1, -1, -1, -1, -1, 17,
-
+ -1, -1, -1, -1, -1, 5, -1, 6, -7, -2, -29, -1, -1, 9,
+ 10, 11, -15, -2, 12, 13, 14, -32, -1, -1, -1, -1, -1, 17,
+
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11324,9 +11156,9 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -11336,7 +11168,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::SequenceDef::SequenceDef (void)
@@ -11357,11 +11189,11 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_bound_SequenceDef
: public TAO::Upcall_Command
{
@@ -11375,20 +11207,19 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->bound (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11397,7 +11228,7 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::SequenceDef::_get_bound_skel (
@@ -11411,16 +11242,16 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -11428,7 +11259,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11440,14 +11271,13 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_bound_SequenceDef
: public TAO::Upcall_Command
{
@@ -11461,21 +11291,20 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->bound (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11484,7 +11313,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::SequenceDef::_set_bound_skel (
@@ -11498,18 +11327,18 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_bound
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -11517,7 +11346,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11529,14 +11358,13 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_element_type_SequenceDef
: public TAO::Upcall_Command
{
@@ -11550,20 +11378,19 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->element_type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11572,7 +11399,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::SequenceDef::_get_element_type_skel (
@@ -11586,16 +11413,16 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -11603,7 +11430,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11615,14 +11442,13 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_element_type_def_SequenceDef
: public TAO::Upcall_Command
{
@@ -11636,20 +11462,19 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->element_type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11658,7 +11483,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::SequenceDef::_get_element_type_def_skel (
@@ -11672,16 +11497,16 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -11689,7 +11514,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11701,14 +11526,13 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_element_type_def_SequenceDef
: public TAO::Upcall_Command
{
@@ -11722,21 +11546,20 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->element_type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11745,7 +11568,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::SequenceDef::_set_element_type_def_skel (
@@ -11759,18 +11582,18 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_element_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -11778,7 +11601,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11790,19 +11613,18 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_SequenceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11816,27 +11638,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11846,7 +11667,7 @@ namespace POA_CORBA
void POA_CORBA::SequenceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11856,26 +11677,26 @@ void POA_CORBA::SequenceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
-
+
_is_a_SequenceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11887,14 +11708,13 @@ void POA_CORBA::SequenceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_SequenceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11908,20 +11728,19 @@ void POA_CORBA::SequenceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -11931,7 +11750,7 @@ void POA_CORBA::SequenceDef::_is_a_skel (
void POA_CORBA::SequenceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11941,24 +11760,24 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
-
+
_non_existent_SequenceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11970,14 +11789,13 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_SequenceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11991,20 +11809,19 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12014,7 +11831,7 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
void POA_CORBA::SequenceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12024,24 +11841,24 @@ void POA_CORBA::SequenceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
-
+
_repository_id_SequenceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12053,14 +11870,13 @@ void POA_CORBA::SequenceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::SequenceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -12070,41 +11886,40 @@ void POA_CORBA::SequenceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_SequenceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12118,20 +11933,19 @@ void POA_CORBA::SequenceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::SequenceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12141,7 +11955,7 @@ void POA_CORBA::SequenceDef::_interface_skel (
void POA_CORBA::SequenceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12151,24 +11965,24 @@ void POA_CORBA::SequenceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::SequenceDef * const impl =
static_cast<POA_CORBA::SequenceDef *> (servant);
-
+
_get_component_SequenceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12180,7 +11994,6 @@ void POA_CORBA::SequenceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
@@ -12233,26 +12046,25 @@ void POA_CORBA::SequenceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::SequenceDef *
-POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::SequenceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::SequenceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12362,8 +12174,8 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
static const signed char lookup[] =
{
- -1, -1, -1, -9, -2, 5, -1, 6, -1, 7, 8, -29, -1, 11,
- 12, 13, -1, 14, 15, -16, -2, -23,
+ -1, -1, -1, -9, -2, 5, -1, 6, -1, 7, 8, -29, -1, 11,
+ 12, 13, -1, 14, 15, -16, -2, -23,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12412,9 +12224,9 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -12424,7 +12236,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ArrayDef::ArrayDef (void)
@@ -12445,11 +12257,11 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_length_ArrayDef
: public TAO::Upcall_Command
{
@@ -12463,20 +12275,19 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->length (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12485,7 +12296,7 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ArrayDef::_get_length_skel (
@@ -12499,16 +12310,16 @@ void POA_CORBA::ArrayDef::_get_length_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -12516,7 +12327,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12528,14 +12339,13 @@ void POA_CORBA::ArrayDef::_get_length_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_length_ArrayDef
: public TAO::Upcall_Command
{
@@ -12549,21 +12359,20 @@ void POA_CORBA::ArrayDef::_get_length_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->length (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12572,7 +12381,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ArrayDef::_set_length_skel (
@@ -12586,18 +12395,18 @@ void POA_CORBA::ArrayDef::_set_length_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_length
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -12605,7 +12414,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12617,14 +12426,13 @@ void POA_CORBA::ArrayDef::_set_length_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_element_type_ArrayDef
: public TAO::Upcall_Command
{
@@ -12638,20 +12446,19 @@ void POA_CORBA::ArrayDef::_set_length_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->element_type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12660,7 +12467,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ArrayDef::_get_element_type_skel (
@@ -12674,16 +12481,16 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -12691,7 +12498,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12703,14 +12510,13 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_element_type_def_ArrayDef
: public TAO::Upcall_Command
{
@@ -12724,20 +12530,19 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->element_type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12746,7 +12551,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ArrayDef::_get_element_type_def_skel (
@@ -12760,16 +12565,16 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -12777,7 +12582,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12789,14 +12594,13 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_element_type_def_ArrayDef
: public TAO::Upcall_Command
{
@@ -12810,21 +12614,20 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->element_type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12833,7 +12636,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ArrayDef::_set_element_type_def_skel (
@@ -12847,18 +12650,18 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_element_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -12866,7 +12669,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12878,19 +12681,18 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ArrayDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12904,27 +12706,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -12934,7 +12735,7 @@ namespace POA_CORBA
void POA_CORBA::ArrayDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12944,26 +12745,26 @@ void POA_CORBA::ArrayDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
-
+
_is_a_ArrayDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12975,14 +12776,13 @@ void POA_CORBA::ArrayDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ArrayDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12996,20 +12796,19 @@ void POA_CORBA::ArrayDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13019,7 +12818,7 @@ void POA_CORBA::ArrayDef::_is_a_skel (
void POA_CORBA::ArrayDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13029,24 +12828,24 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
-
+
_non_existent_ArrayDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13058,14 +12857,13 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ArrayDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13079,20 +12877,19 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13102,7 +12899,7 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
void POA_CORBA::ArrayDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13112,24 +12909,24 @@ void POA_CORBA::ArrayDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
-
+
_repository_id_ArrayDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13141,14 +12938,13 @@ void POA_CORBA::ArrayDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ArrayDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -13158,41 +12954,40 @@ void POA_CORBA::ArrayDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ArrayDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13206,20 +13001,19 @@ void POA_CORBA::ArrayDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ArrayDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13229,7 +13023,7 @@ void POA_CORBA::ArrayDef::_interface_skel (
void POA_CORBA::ArrayDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13239,24 +13033,24 @@ void POA_CORBA::ArrayDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ArrayDef * const impl =
static_cast<POA_CORBA::ArrayDef *> (servant);
-
+
_get_component_ArrayDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13268,7 +13062,6 @@ void POA_CORBA::ArrayDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
@@ -13321,26 +13114,25 @@ void POA_CORBA::ArrayDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ArrayDef *
-POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ArrayDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ArrayDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -13476,11 +13268,11 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
static const signed char lookup[] =
{
- -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15,
- -2, -68, 14, -64, 17, 18, 19, 20, 21, -1, -1, 22, -1, -1,
- -24, -2, 23, -1, -64, 26, -29, -2, 27, 28, -64, -31, -2, -62,
- 33, -1, -1, 34, 35, 36, -1, -1, 37, 38, -1, 39, -1, -1,
- 40, 41, 42, -1, 43,
+ -1, -1, -1, -7, -3, 5, 6, -12, -2, -66, 10, 11, -1, -15,
+ -2, -68, 14, -64, 17, 18, 19, 20, 21, -1, -1, 22, -1, -1,
+ -24, -2, 23, -1, -64, 26, -29, -2, 27, 28, -64, -31, -2, -62,
+ 33, -1, -1, 34, 35, 36, -1, -1, 37, 38, -1, 39, -1, -1,
+ 40, 41, 42, -1, 43,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -13529,9 +13321,9 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -13541,7 +13333,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ExceptionDef::ExceptionDef (void)
@@ -13563,11 +13355,11 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_ExceptionDef
: public TAO::Upcall_Command
{
@@ -13581,20 +13373,19 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13603,7 +13394,7 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExceptionDef::_get_type_skel (
@@ -13617,16 +13408,16 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -13634,7 +13425,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13646,14 +13437,13 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_members_ExceptionDef
: public TAO::Upcall_Command
{
@@ -13667,20 +13457,19 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->members (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13689,7 +13478,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExceptionDef::_get_members_skel (
@@ -13703,16 +13492,16 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -13720,7 +13509,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13732,14 +13521,13 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_members_ExceptionDef
: public TAO::Upcall_Command
{
@@ -13753,21 +13541,20 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->members (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13776,7 +13563,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExceptionDef::_set_members_skel (
@@ -13790,18 +13577,18 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_members
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -13809,7 +13596,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13821,19 +13608,18 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ExceptionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13847,27 +13633,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13877,7 +13662,7 @@ namespace POA_CORBA
void POA_CORBA::ExceptionDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13887,26 +13672,26 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
-
+
_is_a_ExceptionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13918,14 +13703,13 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ExceptionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13939,20 +13723,19 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -13962,7 +13745,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
void POA_CORBA::ExceptionDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13972,24 +13755,24 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
-
+
_non_existent_ExceptionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14001,14 +13784,13 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ExceptionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -14022,20 +13804,19 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14045,7 +13826,7 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
void POA_CORBA::ExceptionDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -14055,24 +13836,24 @@ void POA_CORBA::ExceptionDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
-
+
_repository_id_ExceptionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14084,14 +13865,13 @@ void POA_CORBA::ExceptionDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ExceptionDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -14101,41 +13881,40 @@ void POA_CORBA::ExceptionDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ExceptionDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -14149,20 +13928,19 @@ void POA_CORBA::ExceptionDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExceptionDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14172,7 +13950,7 @@ void POA_CORBA::ExceptionDef::_interface_skel (
void POA_CORBA::ExceptionDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -14182,24 +13960,24 @@ void POA_CORBA::ExceptionDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExceptionDef * const impl =
static_cast<POA_CORBA::ExceptionDef *> (servant);
-
+
_get_component_ExceptionDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14211,7 +13989,6 @@ void POA_CORBA::ExceptionDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
@@ -14268,26 +14045,25 @@ void POA_CORBA::ExceptionDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ExceptionDef *
-POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExceptionDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ExceptionDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -14407,9 +14183,9 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
static const signed char lookup[] =
{
- -9, -5, -15, -2, 4, 5, -1, 50, 8, -45, 14, -1, -46, 17,
- 18, 19, -1, 20, 21, -1, 22, -6, -2, 23, -1, -1, -24, -2,
- -38, -1, -1, -1, -1, -1, -1, -1, 26,
+ -9, -5, -15, -2, 4, 5, -1, 50, 8, -45, 14, -1, -46, 17,
+ 18, 19, -1, 20, 21, -1, 22, -6, -2, 23, -1, -1, -24, -2,
+ -38, -1, -1, -1, -1, -1, -1, -1, 26,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -14458,9 +14234,9 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -14470,7 +14246,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::AttributeDef::AttributeDef (void)
@@ -14491,11 +14267,11 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_AttributeDef
: public TAO::Upcall_Command
{
@@ -14509,20 +14285,19 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14531,7 +14306,7 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AttributeDef::_get_type_skel (
@@ -14545,16 +14320,16 @@ void POA_CORBA::AttributeDef::_get_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -14562,7 +14337,7 @@ void POA_CORBA::AttributeDef::_get_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14574,14 +14349,13 @@ void POA_CORBA::AttributeDef::_get_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_def_AttributeDef
: public TAO::Upcall_Command
{
@@ -14595,20 +14369,19 @@ void POA_CORBA::AttributeDef::_get_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14617,7 +14390,7 @@ void POA_CORBA::AttributeDef::_get_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AttributeDef::_get_type_def_skel (
@@ -14631,16 +14404,16 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -14648,7 +14421,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14660,14 +14433,13 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_type_def_AttributeDef
: public TAO::Upcall_Command
{
@@ -14681,21 +14453,20 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14704,7 +14475,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AttributeDef::_set_type_def_skel (
@@ -14718,18 +14489,18 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -14737,7 +14508,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14749,14 +14520,13 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_mode_AttributeDef
: public TAO::Upcall_Command
{
@@ -14770,20 +14540,19 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeMode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->mode (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14792,7 +14561,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AttributeDef::_get_mode_skel (
@@ -14806,16 +14575,16 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -14823,7 +14592,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14835,14 +14604,13 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_mode_AttributeDef
: public TAO::Upcall_Command
{
@@ -14856,21 +14624,20 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->mode (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14879,7 +14646,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::AttributeDef::_set_mode_skel (
@@ -14893,18 +14660,18 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_mode
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -14912,7 +14679,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14924,19 +14691,18 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_AttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -14950,27 +14716,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -14980,7 +14745,7 @@ namespace POA_CORBA
void POA_CORBA::AttributeDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -14990,26 +14755,26 @@ void POA_CORBA::AttributeDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
-
+
_is_a_AttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15021,14 +14786,13 @@ void POA_CORBA::AttributeDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_AttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -15042,20 +14806,19 @@ void POA_CORBA::AttributeDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15065,7 +14828,7 @@ void POA_CORBA::AttributeDef::_is_a_skel (
void POA_CORBA::AttributeDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -15075,24 +14838,24 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
-
+
_non_existent_AttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15104,14 +14867,13 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_AttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -15125,20 +14887,19 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15148,7 +14909,7 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
void POA_CORBA::AttributeDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -15158,24 +14919,24 @@ void POA_CORBA::AttributeDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
-
+
_repository_id_AttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15187,14 +14948,13 @@ void POA_CORBA::AttributeDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::AttributeDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -15204,41 +14964,40 @@ void POA_CORBA::AttributeDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_AttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -15252,20 +15011,19 @@ void POA_CORBA::AttributeDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15275,7 +15033,7 @@ void POA_CORBA::AttributeDef::_interface_skel (
void POA_CORBA::AttributeDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -15285,24 +15043,24 @@ void POA_CORBA::AttributeDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AttributeDef * const impl =
static_cast<POA_CORBA::AttributeDef *> (servant);
-
+
_get_component_AttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15314,7 +15072,6 @@ void POA_CORBA::AttributeDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
@@ -15367,26 +15124,25 @@ void POA_CORBA::AttributeDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::AttributeDef *
-POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AttributeDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::AttributeDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -15511,10 +15267,10 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
static const signed char lookup[] =
{
- -1, -1, -6, -5, 4, 5, -1, -12, -2, -50, 11, -1, -48, -1,
- -1, 14, -16, -4, 15, -46, -20, -2, -45, 22, -1, -1, -1, 23,
- 24, 25, -1, 26, -1, 27, -1, -1, -28, -2, -45, -1, 30, -1,
- -1, 31,
+ -1, -1, -6, -5, 4, 5, -1, -12, -2, -50, 11, -1, -48, -1,
+ -1, 14, -16, -4, 15, -46, -20, -2, -45, 22, -1, -1, -1, 23,
+ 24, 25, -1, 26, -1, 27, -1, -1, -28, -2, -45, -1, 30, -1,
+ -1, 31,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -15563,9 +15319,9 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -15575,7 +15331,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ExtAttributeDef::ExtAttributeDef (void)
@@ -15597,11 +15353,11 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_get_exceptions_ExtAttributeDef
: public TAO::Upcall_Command
{
@@ -15615,20 +15371,19 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->get_exceptions (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15637,7 +15392,7 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
@@ -15651,16 +15406,16 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -15668,7 +15423,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15680,14 +15435,13 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_get_exceptions_ExtAttributeDef
: public TAO::Upcall_Command
{
@@ -15701,21 +15455,20 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExcDescriptionSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->get_exceptions (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15724,7 +15477,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
@@ -15738,18 +15491,18 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_get_exceptions
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -15757,7 +15510,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15769,14 +15522,13 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_set_exceptions_ExtAttributeDef
: public TAO::Upcall_Command
{
@@ -15790,20 +15542,19 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->set_exceptions (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15812,7 +15563,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
@@ -15826,16 +15577,16 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -15843,7 +15594,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15855,14 +15606,13 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_set_exceptions_ExtAttributeDef
: public TAO::Upcall_Command
{
@@ -15876,21 +15626,20 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExcDescriptionSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->set_exceptions (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15899,7 +15648,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
@@ -15913,18 +15662,18 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_set_exceptions
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -15932,7 +15681,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -15944,14 +15693,13 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_attribute_ExtAttributeDef
: public TAO::Upcall_Command
{
@@ -15965,20 +15713,19 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDescription> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->describe_attribute (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -15987,7 +15734,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
@@ -16001,16 +15748,16 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -16018,7 +15765,7 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16030,19 +15777,18 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ExtAttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -16056,27 +15802,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16086,7 +15831,7 @@ namespace POA_CORBA
void POA_CORBA::ExtAttributeDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -16096,26 +15841,26 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-
+
_is_a_ExtAttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16127,14 +15872,13 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ExtAttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -16148,20 +15892,19 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16171,7 +15914,7 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
void POA_CORBA::ExtAttributeDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -16181,24 +15924,24 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-
+
_non_existent_ExtAttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16210,14 +15953,13 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ExtAttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -16231,20 +15973,19 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16254,7 +15995,7 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
void POA_CORBA::ExtAttributeDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -16264,24 +16005,24 @@ void POA_CORBA::ExtAttributeDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-
+
_repository_id_ExtAttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16293,14 +16034,13 @@ void POA_CORBA::ExtAttributeDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ExtAttributeDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -16310,41 +16050,40 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ExtAttributeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -16358,20 +16097,19 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAttributeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16381,7 +16119,7 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
void POA_CORBA::ExtAttributeDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -16391,24 +16129,24 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAttributeDef * const impl =
static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-
+
_get_component_ExtAttributeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16420,7 +16158,6 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ExtAttributeDef::_is_a (
@@ -16477,26 +16214,25 @@ void POA_CORBA::ExtAttributeDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ExtAttributeDef *
-POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAttributeDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ExtAttributeDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -16627,7 +16363,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
{
{
- const TAO_operation_db_entry *resword;
+ const TAO_operation_db_entry *resword;
switch (key)
{
@@ -16728,9 +16464,9 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_OperationDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -16740,7 +16476,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::OperationDef::OperationDef (void)
@@ -16761,11 +16497,11 @@ POA_CORBA::OperationDef::~OperationDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_result_OperationDef
: public TAO::Upcall_Command
{
@@ -16779,20 +16515,19 @@ POA_CORBA::OperationDef::~OperationDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->result (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16801,7 +16536,7 @@ POA_CORBA::OperationDef::~OperationDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_get_result_skel (
@@ -16815,16 +16550,16 @@ void POA_CORBA::OperationDef::_get_result_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -16832,7 +16567,7 @@ void POA_CORBA::OperationDef::_get_result_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16844,14 +16579,13 @@ void POA_CORBA::OperationDef::_get_result_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_result_def_OperationDef
: public TAO::Upcall_Command
{
@@ -16865,20 +16599,19 @@ void POA_CORBA::OperationDef::_get_result_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->result_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16887,7 +16620,7 @@ void POA_CORBA::OperationDef::_get_result_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_get_result_def_skel (
@@ -16901,16 +16634,16 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -16918,7 +16651,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -16930,14 +16663,13 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_result_def_OperationDef
: public TAO::Upcall_Command
{
@@ -16951,21 +16683,20 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->result_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -16974,7 +16705,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_set_result_def_skel (
@@ -16988,18 +16719,18 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_result_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17007,7 +16738,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17019,14 +16750,13 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_params_OperationDef
: public TAO::Upcall_Command
{
@@ -17040,20 +16770,19 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ParDescriptionSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->params (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17062,7 +16791,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_get_params_skel (
@@ -17076,16 +16805,16 @@ void POA_CORBA::OperationDef::_get_params_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17093,7 +16822,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17105,14 +16834,13 @@ void POA_CORBA::OperationDef::_get_params_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_params_OperationDef
: public TAO::Upcall_Command
{
@@ -17126,21 +16854,20 @@ void POA_CORBA::OperationDef::_get_params_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->params (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17149,7 +16876,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_set_params_skel (
@@ -17163,18 +16890,18 @@ void POA_CORBA::OperationDef::_set_params_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_params
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17182,7 +16909,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17194,14 +16921,13 @@ void POA_CORBA::OperationDef::_set_params_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_mode_OperationDef
: public TAO::Upcall_Command
{
@@ -17215,20 +16941,19 @@ void POA_CORBA::OperationDef::_set_params_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::OperationMode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::OperationMode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->mode (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17237,7 +16962,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_get_mode_skel (
@@ -17251,16 +16976,16 @@ void POA_CORBA::OperationDef::_get_mode_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::OperationMode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17268,7 +16993,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17280,14 +17005,13 @@ void POA_CORBA::OperationDef::_get_mode_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_mode_OperationDef
: public TAO::Upcall_Command
{
@@ -17301,21 +17025,20 @@ void POA_CORBA::OperationDef::_get_mode_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->mode (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17324,7 +17047,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_set_mode_skel (
@@ -17338,18 +17061,18 @@ void POA_CORBA::OperationDef::_set_mode_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_mode
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17357,7 +17080,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17369,14 +17092,13 @@ void POA_CORBA::OperationDef::_set_mode_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_contexts_OperationDef
: public TAO::Upcall_Command
{
@@ -17390,20 +17112,19 @@ void POA_CORBA::OperationDef::_set_mode_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ContextIdSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->contexts (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17412,7 +17133,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_get_contexts_skel (
@@ -17426,16 +17147,16 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17443,7 +17164,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17455,14 +17176,13 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_contexts_OperationDef
: public TAO::Upcall_Command
{
@@ -17476,21 +17196,20 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->contexts (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17499,7 +17218,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_set_contexts_skel (
@@ -17513,18 +17232,18 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_contexts
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17532,7 +17251,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17544,14 +17263,13 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_exceptions_OperationDef
: public TAO::Upcall_Command
{
@@ -17565,20 +17283,19 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->exceptions (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17587,7 +17304,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_get_exceptions_skel (
@@ -17601,16 +17318,16 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17618,7 +17335,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17630,14 +17347,13 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_exceptions_OperationDef
: public TAO::Upcall_Command
{
@@ -17651,21 +17367,20 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->exceptions (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17674,7 +17389,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::OperationDef::_set_exceptions_skel (
@@ -17688,18 +17403,18 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_exceptions
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
@@ -17707,7 +17422,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17719,19 +17434,18 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_OperationDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -17745,27 +17459,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17775,7 +17488,7 @@ namespace POA_CORBA
void POA_CORBA::OperationDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -17785,26 +17498,26 @@ void POA_CORBA::OperationDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
-
+
_is_a_OperationDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17816,14 +17529,13 @@ void POA_CORBA::OperationDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_OperationDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -17837,20 +17549,19 @@ void POA_CORBA::OperationDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17860,7 +17571,7 @@ void POA_CORBA::OperationDef::_is_a_skel (
void POA_CORBA::OperationDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -17870,24 +17581,24 @@ void POA_CORBA::OperationDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
-
+
_non_existent_OperationDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17899,14 +17610,13 @@ void POA_CORBA::OperationDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_OperationDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -17920,20 +17630,19 @@ void POA_CORBA::OperationDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -17943,7 +17652,7 @@ void POA_CORBA::OperationDef::_non_existent_skel (
void POA_CORBA::OperationDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -17953,24 +17662,24 @@ void POA_CORBA::OperationDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
-
+
_repository_id_OperationDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -17982,14 +17691,13 @@ void POA_CORBA::OperationDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::OperationDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -17999,41 +17707,40 @@ void POA_CORBA::OperationDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_OperationDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -18047,20 +17754,19 @@ void POA_CORBA::OperationDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::OperationDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18070,7 +17776,7 @@ void POA_CORBA::OperationDef::_interface_skel (
void POA_CORBA::OperationDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -18080,24 +17786,24 @@ void POA_CORBA::OperationDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::OperationDef * const impl =
static_cast<POA_CORBA::OperationDef *> (servant);
-
+
_get_component_OperationDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -18109,7 +17815,6 @@ void POA_CORBA::OperationDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::OperationDef::_is_a (
@@ -18162,26 +17867,25 @@ void POA_CORBA::OperationDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::OperationDef *
-POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::OperationDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::OperationDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -18321,12 +18025,12 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, 5, 6, -7, -3, -82, 10, 11, -1, -1,
- 12, -13, -2, -82, 15, -1, 16, -1, -1, -17, -2, -25, -2, -84,
- 19, -29, -2, 20, 21, 22, 23, -1, -32, -3, 24, -1, -95, 27,
- 28, -94, -1, 31, -90, 35, 36, -37, -2, -82, 39, -1, -1, 40,
- 41, 42, 43, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, 46,
+ -1, -1, -1, -1, 4, 5, 6, -7, -3, -82, 10, 11, -1, -1,
+ 12, -13, -2, -82, 15, -1, 16, -1, -1, -17, -2, -25, -2, -84,
+ 19, -29, -2, 20, 21, 22, 23, -1, -32, -3, 24, -1, -95, 27,
+ 28, -94, -1, 31, -90, 35, 36, -37, -2, -82, 39, -1, -1, 40,
+ 41, 42, 43, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, 46,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -18375,9 +18079,9 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -18387,7 +18091,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::InterfaceDef::InterfaceDef (void)
@@ -18410,11 +18114,11 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_base_interfaces_InterfaceDef
: public TAO::Upcall_Command
{
@@ -18428,20 +18132,19 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->base_interfaces (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18450,7 +18153,7 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
@@ -18464,16 +18167,16 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -18481,7 +18184,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -18493,14 +18196,13 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_base_interfaces_InterfaceDef
: public TAO::Upcall_Command
{
@@ -18514,21 +18216,20 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->base_interfaces (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18537,7 +18238,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
@@ -18551,18 +18252,18 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_base_interfaces
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -18570,7 +18271,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -18582,14 +18283,13 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class is_a_InterfaceDef
: public TAO::Upcall_Command
{
@@ -18603,27 +18303,26 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18632,7 +18331,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceDef::is_a_skel (
@@ -18646,18 +18345,18 @@ void POA_CORBA::InterfaceDef::is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_interface_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -18665,7 +18364,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -18677,14 +18376,13 @@ void POA_CORBA::InterfaceDef::is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_interface_InterfaceDef
: public TAO::Upcall_Command
{
@@ -18698,20 +18396,19 @@ void POA_CORBA::InterfaceDef::is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef::FullInterfaceDescription> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->describe_interface (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18720,7 +18417,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceDef::describe_interface_skel (
@@ -18734,16 +18431,16 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -18751,7 +18448,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -18763,14 +18460,13 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_attribute_InterfaceDef
: public TAO::Upcall_Command
{
@@ -18784,44 +18480,44 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_attribute (
arg_1
@@ -18830,9 +18526,8 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18841,7 +18536,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceDef::create_attribute_skel (
@@ -18855,14 +18550,14 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -18872,9 +18567,9 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
&_tao_type,
&_tao_mode
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -18882,7 +18577,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -18894,14 +18589,13 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_operation_InterfaceDef
: public TAO::Upcall_Command
{
@@ -18915,62 +18609,62 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
7);
-
+
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq> (
this->operation_details_,
this->args_,
8);
-
+
retval =
this->servant_->create_operation (
arg_1
@@ -18982,9 +18676,8 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
, arg_7
, arg_8
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -18993,7 +18686,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceDef::create_operation_skel (
@@ -19007,7 +18700,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -19017,7 +18710,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -19030,9 +18723,9 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
&_tao_exceptions,
&_tao_contexts
};
-
+
static size_t const nargs = 9;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -19040,7 +18733,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19052,19 +18745,18 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_InterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -19078,27 +18770,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19108,7 +18799,7 @@ namespace POA_CORBA
void POA_CORBA::InterfaceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -19118,26 +18809,26 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
-
+
_is_a_InterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19149,14 +18840,13 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_InterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -19170,20 +18860,19 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19193,7 +18882,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
void POA_CORBA::InterfaceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -19203,24 +18892,24 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
-
+
_non_existent_InterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19232,14 +18921,13 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_InterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -19253,20 +18941,19 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19276,7 +18963,7 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
void POA_CORBA::InterfaceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -19286,24 +18973,24 @@ void POA_CORBA::InterfaceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
-
+
_repository_id_InterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19315,14 +19002,13 @@ void POA_CORBA::InterfaceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::InterfaceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -19332,41 +19018,40 @@ void POA_CORBA::InterfaceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_InterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -19380,20 +19065,19 @@ void POA_CORBA::InterfaceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19403,7 +19087,7 @@ void POA_CORBA::InterfaceDef::_interface_skel (
void POA_CORBA::InterfaceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -19413,24 +19097,24 @@ void POA_CORBA::InterfaceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceDef * const impl =
static_cast<POA_CORBA::InterfaceDef *> (servant);
-
+
_get_component_InterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19442,7 +19126,6 @@ void POA_CORBA::InterfaceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
@@ -19503,26 +19186,25 @@ void POA_CORBA::InterfaceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::InterfaceDef *
-POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::InterfaceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -19658,9 +19340,9 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function ( ::CORBA::Objec
int
CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -19670,7 +19352,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecro
reinterpret_cast<size_t> (CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::InterfaceAttrExtension::InterfaceAttrExtension (void)
@@ -19689,11 +19371,11 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_ext_interface_InterfaceAttrExtension
: public TAO::Upcall_Command
{
@@ -19707,20 +19389,19 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->describe_ext_interface (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceAttrExtension * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19729,7 +19410,7 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
@@ -19743,16 +19424,16 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
@@ -19760,7 +19441,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19772,14 +19453,13 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_ext_attribute_InterfaceAttrExtension
: public TAO::Upcall_Command
{
@@ -19793,56 +19473,56 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
7);
-
+
retval =
this->servant_->create_ext_attribute (
arg_1
@@ -19853,9 +19533,8 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
, arg_6
, arg_7
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceAttrExtension * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19864,7 +19543,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
@@ -19878,7 +19557,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -19887,7 +19566,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -19899,9 +19578,9 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
&_tao_get_exceptions,
&_tao_set_exceptions
};
-
+
static size_t const nargs = 8;
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
@@ -19909,7 +19588,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -19921,19 +19600,18 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_InterfaceAttrExtension_Upcall_Command
: public TAO::Upcall_Command
{
@@ -19947,27 +19625,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceAttrExtension * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -19977,7 +19654,7 @@ namespace POA_CORBA
void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -19987,26 +19664,26 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-
+
_is_a_InterfaceAttrExtension_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20018,14 +19695,13 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_InterfaceAttrExtension_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20039,20 +19715,19 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceAttrExtension * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20062,7 +19737,7 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20072,24 +19747,24 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-
+
_non_existent_InterfaceAttrExtension_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20101,14 +19776,13 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_InterfaceAttrExtension_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20122,20 +19796,19 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceAttrExtension * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20145,7 +19818,7 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20155,24 +19828,24 @@ void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-
+
_repository_id_InterfaceAttrExtension_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20184,14 +19857,13 @@ void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::InterfaceAttrExtension::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -20201,41 +19873,40 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_InterfaceAttrExtension_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20249,20 +19920,19 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::InterfaceAttrExtension * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20272,7 +19942,7 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
void POA_CORBA::InterfaceAttrExtension::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20282,24 +19952,24 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::InterfaceAttrExtension * const impl =
static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-
+
_get_component_InterfaceAttrExtension_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20311,7 +19981,6 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::InterfaceAttrExtension::_is_a (
@@ -20356,26 +20025,25 @@ void POA_CORBA::InterfaceAttrExtension::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::InterfaceAttrExtension *
-POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceAttrExtension::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::InterfaceAttrExtension STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -20517,12 +20185,12 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, -1, -1, -8, -2, 5, -1, 6, 7, -79,
- -10, -3, -75, 13, -15, -2, 14, -76, 17, 18, -1, 19, 20, 21,
- 22, -28, -3, 23, 24, -35, -2, 25, 26, -1, 27, -83, 31, -1,
- 32, 33, -1, 34, -1, -87, 37, -1, 38, -1, 39, -1, -1, -40,
- -2, -75, -1, -45, -2, 42, -1, 43, 44, -79, -1, -1, -1, -1,
- 47, -1, -1, 48,
+ -1, -1, -1, -1, 4, -1, -1, -8, -2, 5, -1, 6, 7, -79,
+ -10, -3, -75, 13, -15, -2, 14, -76, 17, 18, -1, 19, 20, 21,
+ 22, -28, -3, 23, 24, -35, -2, 25, 26, -1, 27, -83, 31, -1,
+ 32, 33, -1, 34, -1, -87, 37, -1, 38, -1, 39, -1, -1, -40,
+ -2, -75, -1, -45, -2, 42, -1, 43, 44, -79, -1, -1, -1, -1,
+ 47, -1, -1, 48,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -20571,9 +20239,9 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -20583,7 +20251,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ExtInterfaceDef::ExtInterfaceDef (void)
@@ -20608,16 +20276,16 @@ POA_CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ExtInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20631,27 +20299,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20661,7 +20328,7 @@ namespace POA_CORBA
void POA_CORBA::ExtInterfaceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20671,26 +20338,26 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtInterfaceDef * const impl =
static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-
+
_is_a_ExtInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20702,14 +20369,13 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ExtInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20723,20 +20389,19 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20746,7 +20411,7 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20756,24 +20421,24 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtInterfaceDef * const impl =
static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-
+
_non_existent_ExtInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20785,14 +20450,13 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ExtInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20806,20 +20470,19 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20829,7 +20492,7 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20839,24 +20502,24 @@ void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtInterfaceDef * const impl =
static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-
+
_repository_id_ExtInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20868,14 +20531,13 @@ void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ExtInterfaceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -20885,41 +20547,40 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ExtInterfaceDef * const impl =
static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ExtInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -20933,20 +20594,19 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -20956,7 +20616,7 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
void POA_CORBA::ExtInterfaceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -20966,24 +20626,24 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtInterfaceDef * const impl =
static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-
+
_get_component_ExtInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -20995,7 +20655,6 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ExtInterfaceDef::_is_a (
@@ -21064,26 +20723,25 @@ void POA_CORBA::ExtInterfaceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ExtInterfaceDef *
-POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtInterfaceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ExtInterfaceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -21223,12 +20881,12 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, 5, 6, -7, -3, -82, 10, 11, -1, -1,
- 12, -13, -2, -82, 15, -1, 16, -1, -1, -17, -2, -25, -2, -84,
- 19, -29, -2, 20, 21, 22, 23, -1, -32, -3, 24, -1, -95, 27,
- 28, -94, -1, 31, -90, 35, 36, -37, -2, -82, 39, -1, -1, 40,
- 41, 42, 43, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, 46,
+ -1, -1, -1, -1, 4, 5, 6, -7, -3, -82, 10, 11, -1, -1,
+ 12, -13, -2, -82, 15, -1, 16, -1, -1, -17, -2, -25, -2, -84,
+ 19, -29, -2, 20, 21, 22, 23, -1, -32, -3, 24, -1, -95, 27,
+ 28, -94, -1, 31, -90, 35, 36, -37, -2, -82, 39, -1, -1, 40,
+ 41, 42, 43, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, 46,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -21277,9 +20935,9 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
int
CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -21289,7 +20947,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
@@ -21313,16 +20971,16 @@ POA_CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_AbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -21336,27 +20994,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -21366,7 +21023,7 @@ namespace POA_CORBA
void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -21376,26 +21033,26 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::AbstractInterfaceDef * const impl =
static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-
+
_is_a_AbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -21407,14 +21064,13 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_AbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -21428,20 +21084,19 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -21451,7 +21106,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -21461,24 +21116,24 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AbstractInterfaceDef * const impl =
static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-
+
_non_existent_AbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -21490,14 +21145,13 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_AbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -21511,20 +21165,19 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -21534,7 +21187,7 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -21544,24 +21197,24 @@ void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AbstractInterfaceDef * const impl =
static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-
+
_repository_id_AbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -21573,14 +21226,13 @@ void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::AbstractInterfaceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -21590,41 +21242,40 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::AbstractInterfaceDef * const impl =
static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_AbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -21638,20 +21289,19 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::AbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -21661,7 +21311,7 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
void POA_CORBA::AbstractInterfaceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -21671,24 +21321,24 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::AbstractInterfaceDef * const impl =
static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-
+
_get_component_AbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -21700,7 +21350,6 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
@@ -21765,26 +21414,25 @@ void POA_CORBA::AbstractInterfaceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::AbstractInterfaceDef *
-POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AbstractInterfaceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::AbstractInterfaceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -21926,12 +21574,12 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, -1, -1, -8, -2, 5, -1, 6, 7, -79,
- -10, -3, -75, 13, -15, -2, 14, -76, 17, 18, -1, 19, 20, 21,
- 22, -28, -3, 23, 24, -35, -2, 25, 26, -1, 27, -83, 31, -1,
- 32, 33, -1, 34, -1, -87, 37, -1, 38, -1, 39, -1, -1, -40,
- -2, -75, -1, -45, -2, 42, -1, 43, 44, -79, -1, -1, -1, -1,
- 47, -1, -1, 48,
+ -1, -1, -1, -1, 4, -1, -1, -8, -2, 5, -1, 6, 7, -79,
+ -10, -3, -75, 13, -15, -2, 14, -76, 17, 18, -1, 19, 20, 21,
+ 22, -28, -3, 23, 24, -35, -2, 25, 26, -1, 27, -83, 31, -1,
+ 32, 33, -1, 34, -1, -87, 37, -1, 38, -1, 39, -1, -1, -40,
+ -2, -75, -1, -45, -2, 42, -1, 43, 44, -79, -1, -1, -1, -1,
+ 47, -1, -1, 48,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -21980,9 +21628,9 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
int
CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -21992,7 +21640,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
reinterpret_cast<size_t> (CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (void)
@@ -22018,16 +21666,16 @@ POA_CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ExtAbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22041,27 +21689,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22071,7 +21718,7 @@ namespace POA_CORBA
void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22081,26 +21728,26 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtAbstractInterfaceDef * const impl =
static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-
+
_is_a_ExtAbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22112,14 +21759,13 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ExtAbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22133,20 +21779,19 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22156,7 +21801,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22166,24 +21811,24 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAbstractInterfaceDef * const impl =
static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-
+
_non_existent_ExtAbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22195,14 +21840,13 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ExtAbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22216,20 +21860,19 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22239,7 +21882,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22249,24 +21892,24 @@ void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAbstractInterfaceDef * const impl =
static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-
+
_repository_id_ExtAbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22278,14 +21921,13 @@ void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -22295,41 +21937,40 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ExtAbstractInterfaceDef * const impl =
static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ExtAbstractInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22343,20 +21984,19 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtAbstractInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22366,7 +22006,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22376,24 +22016,24 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtAbstractInterfaceDef * const impl =
static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-
+
_get_component_ExtAbstractInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22405,7 +22045,6 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef::_is_a (
@@ -22478,26 +22117,25 @@ void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ExtAbstractInterfaceDef *
-POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAbstractInterfaceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ExtAbstractInterfaceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -22637,12 +22275,12 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, 5, 6, -7, -3, -82, 10, 11, -1, -1,
- 12, -13, -2, -82, 15, -1, 16, -1, -1, -17, -2, -25, -2, -84,
- 19, -29, -2, 20, 21, 22, 23, -1, -32, -3, 24, -1, -95, 27,
- 28, -94, -1, 31, -90, 35, 36, -37, -2, -82, 39, -1, -1, 40,
- 41, 42, 43, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, 46,
+ -1, -1, -1, -1, 4, 5, 6, -7, -3, -82, 10, 11, -1, -1,
+ 12, -13, -2, -82, 15, -1, 16, -1, -1, -17, -2, -25, -2, -84,
+ 19, -29, -2, 20, 21, 22, 23, -1, -32, -3, 24, -1, -95, 27,
+ 28, -94, -1, 31, -90, 35, 36, -37, -2, -82, 39, -1, -1, 40,
+ 41, 42, 43, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, 46,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22691,9 +22329,9 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr
int
CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -22703,7 +22341,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
@@ -22727,16 +22365,16 @@ POA_CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_LocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22750,27 +22388,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::LocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22780,7 +22417,7 @@ namespace POA_CORBA
void POA_CORBA::LocalInterfaceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22790,26 +22427,26 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::LocalInterfaceDef * const impl =
static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-
+
_is_a_LocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22821,14 +22458,13 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_LocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22842,20 +22478,19 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::LocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22865,7 +22500,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22875,24 +22510,24 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::LocalInterfaceDef * const impl =
static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-
+
_non_existent_LocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22904,14 +22539,13 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_LocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -22925,20 +22559,19 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::LocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -22948,7 +22581,7 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -22958,24 +22591,24 @@ void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::LocalInterfaceDef * const impl =
static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-
+
_repository_id_LocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -22987,14 +22620,13 @@ void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::LocalInterfaceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -23004,41 +22636,40 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::LocalInterfaceDef * const impl =
static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_LocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -23052,20 +22683,19 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::LocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -23075,7 +22705,7 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
void POA_CORBA::LocalInterfaceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -23085,24 +22715,24 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::LocalInterfaceDef * const impl =
static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-
+
_get_component_LocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -23114,7 +22744,6 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
@@ -23179,26 +22808,25 @@ void POA_CORBA::LocalInterfaceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::LocalInterfaceDef *
-POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::LocalInterfaceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::LocalInterfaceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -23340,12 +22968,12 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, -1, -1, -8, -2, 5, -1, 6, 7, -79,
- -10, -3, -75, 13, -15, -2, 14, -76, 17, 18, -1, 19, 20, 21,
- 22, -28, -3, 23, 24, -35, -2, 25, 26, -1, 27, -83, 31, -1,
- 32, 33, -1, 34, -1, -87, 37, -1, 38, -1, 39, -1, -1, -40,
- -2, -75, -1, -45, -2, 42, -1, 43, 44, -79, -1, -1, -1, -1,
- 47, -1, -1, 48,
+ -1, -1, -1, -1, 4, -1, -1, -8, -2, 5, -1, 6, 7, -79,
+ -10, -3, -75, 13, -15, -2, 14, -76, 17, 18, -1, 19, 20, 21,
+ 22, -28, -3, 23, 24, -35, -2, 25, 26, -1, 27, -83, 31, -1,
+ 32, 33, -1, 34, -1, -87, 37, -1, 38, -1, 39, -1, -1, -40,
+ -2, -75, -1, -45, -2, 42, -1, 43, 44, -79, -1, -1, -1, -1,
+ 47, -1, -1, 48,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -23394,9 +23022,9 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
int
CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -23406,7 +23034,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (void)
@@ -23432,16 +23060,16 @@ POA_CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ExtLocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -23455,27 +23083,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtLocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -23485,7 +23112,7 @@ namespace POA_CORBA
void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -23495,26 +23122,26 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtLocalInterfaceDef * const impl =
static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-
+
_is_a_ExtLocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -23526,14 +23153,13 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ExtLocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -23547,20 +23173,19 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtLocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -23570,7 +23195,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -23580,24 +23205,24 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtLocalInterfaceDef * const impl =
static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-
+
_non_existent_ExtLocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -23609,14 +23234,13 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ExtLocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -23630,20 +23254,19 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtLocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -23653,7 +23276,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -23663,24 +23286,24 @@ void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtLocalInterfaceDef * const impl =
static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-
+
_repository_id_ExtLocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -23692,14 +23315,13 @@ void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -23709,41 +23331,40 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ExtLocalInterfaceDef * const impl =
static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ExtLocalInterfaceDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -23757,20 +23378,19 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtLocalInterfaceDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -23780,7 +23400,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -23790,24 +23410,24 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtLocalInterfaceDef * const impl =
static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-
+
_get_component_ExtLocalInterfaceDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -23819,7 +23439,6 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef::_is_a (
@@ -23892,26 +23511,25 @@ void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ExtLocalInterfaceDef *
-POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtLocalInterfaceDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ExtLocalInterfaceDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
index dcc845194d3..562c27c3fd4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::Repository_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -95,7 +95,7 @@ POA_CORBA::Repository_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -113,17 +113,17 @@ POA_CORBA::Repository_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Repository_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->Repository::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -139,7 +139,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -155,7 +155,7 @@ void POA_CORBA::Repository_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -173,7 +173,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -193,7 +193,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -217,7 +217,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -239,7 +239,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -261,7 +261,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -287,7 +287,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -311,7 +311,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -337,7 +337,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -361,7 +361,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -385,7 +385,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -409,7 +409,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -445,7 +445,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -469,7 +469,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -493,7 +493,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -515,7 +515,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -539,7 +539,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -563,7 +563,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -599,7 +599,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -617,7 +617,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -635,7 +635,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -653,7 +653,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -671,7 +671,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -689,7 +689,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -709,7 +709,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -729,7 +729,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -802,7 +802,7 @@ POA_CORBA::ModuleDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -814,7 +814,7 @@ POA_CORBA::ModuleDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -832,17 +832,17 @@ POA_CORBA::ModuleDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ModuleDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ModuleDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -858,7 +858,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -874,7 +874,7 @@ void POA_CORBA::ModuleDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -892,7 +892,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -912,7 +912,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -936,7 +936,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -958,7 +958,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -980,7 +980,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1006,7 +1006,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1030,7 +1030,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1056,7 +1056,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1080,7 +1080,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1104,7 +1104,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1128,7 +1128,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1164,7 +1164,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1188,7 +1188,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1212,7 +1212,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1234,7 +1234,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1258,7 +1258,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1282,7 +1282,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1318,7 +1318,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1334,7 +1334,7 @@ char * POA_CORBA::ModuleDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1352,7 +1352,7 @@ void POA_CORBA::ModuleDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1368,7 +1368,7 @@ char * POA_CORBA::ModuleDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1386,7 +1386,7 @@ void POA_CORBA::ModuleDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1402,7 +1402,7 @@ char * POA_CORBA::ModuleDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1420,7 +1420,7 @@ void POA_CORBA::ModuleDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1436,7 +1436,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1452,7 +1452,7 @@ char * POA_CORBA::ModuleDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1468,7 +1468,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1484,7 +1484,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1559,7 +1559,7 @@ POA_CORBA::ConstantDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1571,7 +1571,7 @@ POA_CORBA::ConstantDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1589,17 +1589,17 @@ POA_CORBA::ConstantDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstantDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstantDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ConstantDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ConstantDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1615,7 +1615,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1631,7 +1631,7 @@ void POA_CORBA::ConstantDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1647,7 +1647,7 @@ char * POA_CORBA::ConstantDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1665,7 +1665,7 @@ void POA_CORBA::ConstantDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1681,7 +1681,7 @@ char * POA_CORBA::ConstantDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1699,7 +1699,7 @@ void POA_CORBA::ConstantDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1715,7 +1715,7 @@ char * POA_CORBA::ConstantDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1733,7 +1733,7 @@ void POA_CORBA::ConstantDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1749,7 +1749,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1765,7 +1765,7 @@ char * POA_CORBA::ConstantDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1781,7 +1781,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1797,7 +1797,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1819,7 +1819,7 @@ void POA_CORBA::ConstantDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1835,7 +1835,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1851,7 +1851,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1869,7 +1869,7 @@ void POA_CORBA::ConstantDef_tie<T>::type_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1885,7 +1885,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1956,7 +1956,7 @@ POA_CORBA::StructDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1968,7 +1968,7 @@ POA_CORBA::StructDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1986,17 +1986,17 @@ POA_CORBA::StructDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StructDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StructDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->StructDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->StructDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2012,7 +2012,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2028,7 +2028,7 @@ void POA_CORBA::StructDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2044,7 +2044,7 @@ char * POA_CORBA::StructDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2062,7 +2062,7 @@ void POA_CORBA::StructDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2078,7 +2078,7 @@ char * POA_CORBA::StructDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2096,7 +2096,7 @@ void POA_CORBA::StructDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2112,7 +2112,7 @@ char * POA_CORBA::StructDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2130,7 +2130,7 @@ void POA_CORBA::StructDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2146,7 +2146,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2162,7 +2162,7 @@ char * POA_CORBA::StructDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2178,7 +2178,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2194,7 +2194,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2216,7 +2216,7 @@ void POA_CORBA::StructDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2232,7 +2232,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2250,7 +2250,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2270,7 +2270,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2294,7 +2294,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2316,7 +2316,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2338,7 +2338,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2364,7 +2364,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2388,7 +2388,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2414,7 +2414,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2438,7 +2438,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2462,7 +2462,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2486,7 +2486,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2522,7 +2522,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2546,7 +2546,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2570,7 +2570,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2592,7 +2592,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2616,7 +2616,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2640,7 +2640,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2676,7 +2676,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2692,7 +2692,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2763,7 +2763,7 @@ POA_CORBA::UnionDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -2775,7 +2775,7 @@ POA_CORBA::UnionDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -2793,17 +2793,17 @@ POA_CORBA::UnionDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::UnionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::UnionDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->UnionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->UnionDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2819,7 +2819,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2835,7 +2835,7 @@ void POA_CORBA::UnionDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2851,7 +2851,7 @@ char * POA_CORBA::UnionDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2869,7 +2869,7 @@ void POA_CORBA::UnionDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2885,7 +2885,7 @@ char * POA_CORBA::UnionDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2903,7 +2903,7 @@ void POA_CORBA::UnionDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2919,7 +2919,7 @@ char * POA_CORBA::UnionDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2937,7 +2937,7 @@ void POA_CORBA::UnionDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2953,7 +2953,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2969,7 +2969,7 @@ char * POA_CORBA::UnionDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2985,7 +2985,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3001,7 +3001,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3023,7 +3023,7 @@ void POA_CORBA::UnionDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3039,7 +3039,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3057,7 +3057,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3077,7 +3077,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3101,7 +3101,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3123,7 +3123,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3145,7 +3145,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3171,7 +3171,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3195,7 +3195,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3221,7 +3221,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3245,7 +3245,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3269,7 +3269,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3293,7 +3293,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3329,7 +3329,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3353,7 +3353,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3377,7 +3377,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3399,7 +3399,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3423,7 +3423,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3447,7 +3447,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3483,7 +3483,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3499,7 +3499,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3515,7 +3515,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3533,7 +3533,7 @@ void POA_CORBA::UnionDef_tie<T>::discriminator_type_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3549,7 +3549,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3620,7 +3620,7 @@ POA_CORBA::EnumDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -3632,7 +3632,7 @@ POA_CORBA::EnumDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -3650,17 +3650,17 @@ POA_CORBA::EnumDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::EnumDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::EnumDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->EnumDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->EnumDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3676,7 +3676,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3692,7 +3692,7 @@ void POA_CORBA::EnumDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3708,7 +3708,7 @@ char * POA_CORBA::EnumDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3726,7 +3726,7 @@ void POA_CORBA::EnumDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3742,7 +3742,7 @@ char * POA_CORBA::EnumDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3760,7 +3760,7 @@ void POA_CORBA::EnumDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3776,7 +3776,7 @@ char * POA_CORBA::EnumDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3794,7 +3794,7 @@ void POA_CORBA::EnumDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3810,7 +3810,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3826,7 +3826,7 @@ char * POA_CORBA::EnumDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3842,7 +3842,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3858,7 +3858,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3880,7 +3880,7 @@ void POA_CORBA::EnumDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3896,7 +3896,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3912,7 +3912,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3983,7 +3983,7 @@ POA_CORBA::AliasDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -3995,7 +3995,7 @@ POA_CORBA::AliasDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -4013,17 +4013,17 @@ POA_CORBA::AliasDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AliasDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AliasDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->AliasDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->AliasDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4039,7 +4039,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4055,7 +4055,7 @@ void POA_CORBA::AliasDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4071,7 +4071,7 @@ char * POA_CORBA::AliasDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4089,7 +4089,7 @@ void POA_CORBA::AliasDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4105,7 +4105,7 @@ char * POA_CORBA::AliasDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4123,7 +4123,7 @@ void POA_CORBA::AliasDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4139,7 +4139,7 @@ char * POA_CORBA::AliasDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4157,7 +4157,7 @@ void POA_CORBA::AliasDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4173,7 +4173,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4189,7 +4189,7 @@ char * POA_CORBA::AliasDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4205,7 +4205,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4221,7 +4221,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4243,7 +4243,7 @@ void POA_CORBA::AliasDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4259,7 +4259,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4275,7 +4275,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4346,7 +4346,7 @@ POA_CORBA::NativeDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -4358,7 +4358,7 @@ POA_CORBA::NativeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -4376,17 +4376,17 @@ POA_CORBA::NativeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::NativeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::NativeDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->NativeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->NativeDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4402,7 +4402,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4418,7 +4418,7 @@ void POA_CORBA::NativeDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4434,7 +4434,7 @@ char * POA_CORBA::NativeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4452,7 +4452,7 @@ void POA_CORBA::NativeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4468,7 +4468,7 @@ char * POA_CORBA::NativeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4486,7 +4486,7 @@ void POA_CORBA::NativeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4502,7 +4502,7 @@ char * POA_CORBA::NativeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4520,7 +4520,7 @@ void POA_CORBA::NativeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4536,7 +4536,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4552,7 +4552,7 @@ char * POA_CORBA::NativeDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4568,7 +4568,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4584,7 +4584,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4606,7 +4606,7 @@ void POA_CORBA::NativeDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4675,7 +4675,7 @@ POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -4687,7 +4687,7 @@ POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -4705,17 +4705,17 @@ POA_CORBA::PrimitiveDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::PrimitiveDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::PrimitiveDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->PrimitiveDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->PrimitiveDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4731,7 +4731,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4747,7 +4747,7 @@ void POA_CORBA::PrimitiveDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4763,7 +4763,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4832,7 +4832,7 @@ POA_CORBA::StringDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -4844,7 +4844,7 @@ POA_CORBA::StringDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -4862,17 +4862,17 @@ POA_CORBA::StringDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StringDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->StringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->StringDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4888,7 +4888,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4904,7 +4904,7 @@ void POA_CORBA::StringDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4920,7 +4920,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4936,7 +4936,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5007,7 +5007,7 @@ POA_CORBA::WstringDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5019,7 +5019,7 @@ POA_CORBA::WstringDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5037,17 +5037,17 @@ POA_CORBA::WstringDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::WstringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::WstringDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->WstringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->WstringDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5063,7 +5063,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5079,7 +5079,7 @@ void POA_CORBA::WstringDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5095,7 +5095,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5111,7 +5111,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5182,7 +5182,7 @@ POA_CORBA::SequenceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5194,7 +5194,7 @@ POA_CORBA::SequenceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5212,17 +5212,17 @@ POA_CORBA::SequenceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::SequenceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::SequenceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->SequenceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->SequenceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5238,7 +5238,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5254,7 +5254,7 @@ void POA_CORBA::SequenceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5270,7 +5270,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5286,7 +5286,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5304,7 +5304,7 @@ void POA_CORBA::SequenceDef_tie<T>::bound (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5320,7 +5320,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5336,7 +5336,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5407,7 +5407,7 @@ POA_CORBA::ArrayDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5419,7 +5419,7 @@ POA_CORBA::ArrayDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5437,17 +5437,17 @@ POA_CORBA::ArrayDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ArrayDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ArrayDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ArrayDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ArrayDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5463,7 +5463,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5479,7 +5479,7 @@ void POA_CORBA::ArrayDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5495,7 +5495,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5511,7 +5511,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5529,7 +5529,7 @@ void POA_CORBA::ArrayDef_tie<T>::length (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5545,7 +5545,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5561,7 +5561,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5632,7 +5632,7 @@ POA_CORBA::ExceptionDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5644,7 +5644,7 @@ POA_CORBA::ExceptionDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5662,17 +5662,17 @@ POA_CORBA::ExceptionDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExceptionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExceptionDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ExceptionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ExceptionDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5688,7 +5688,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5704,7 +5704,7 @@ void POA_CORBA::ExceptionDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5720,7 +5720,7 @@ char * POA_CORBA::ExceptionDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5738,7 +5738,7 @@ void POA_CORBA::ExceptionDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5754,7 +5754,7 @@ char * POA_CORBA::ExceptionDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5772,7 +5772,7 @@ void POA_CORBA::ExceptionDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5788,7 +5788,7 @@ char * POA_CORBA::ExceptionDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5806,7 +5806,7 @@ void POA_CORBA::ExceptionDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5822,7 +5822,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5838,7 +5838,7 @@ char * POA_CORBA::ExceptionDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5854,7 +5854,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5870,7 +5870,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5892,7 +5892,7 @@ void POA_CORBA::ExceptionDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5910,7 +5910,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5930,7 +5930,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5954,7 +5954,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5976,7 +5976,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5998,7 +5998,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6024,7 +6024,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6048,7 +6048,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6074,7 +6074,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6098,7 +6098,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6122,7 +6122,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6146,7 +6146,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6182,7 +6182,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6206,7 +6206,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6230,7 +6230,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6252,7 +6252,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6276,7 +6276,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6300,7 +6300,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6336,7 +6336,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6352,7 +6352,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6368,7 +6368,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6439,7 +6439,7 @@ POA_CORBA::AttributeDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -6451,7 +6451,7 @@ POA_CORBA::AttributeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -6469,17 +6469,17 @@ POA_CORBA::AttributeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AttributeDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->AttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->AttributeDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6495,7 +6495,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6511,7 +6511,7 @@ void POA_CORBA::AttributeDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6527,7 +6527,7 @@ char * POA_CORBA::AttributeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6545,7 +6545,7 @@ void POA_CORBA::AttributeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6561,7 +6561,7 @@ char * POA_CORBA::AttributeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6579,7 +6579,7 @@ void POA_CORBA::AttributeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6595,7 +6595,7 @@ char * POA_CORBA::AttributeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6613,7 +6613,7 @@ void POA_CORBA::AttributeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6629,7 +6629,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6645,7 +6645,7 @@ char * POA_CORBA::AttributeDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6661,7 +6661,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6677,7 +6677,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6699,7 +6699,7 @@ void POA_CORBA::AttributeDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6715,7 +6715,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6731,7 +6731,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6749,7 +6749,7 @@ void POA_CORBA::AttributeDef_tie<T>::type_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6765,7 +6765,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6836,7 +6836,7 @@ POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -6848,7 +6848,7 @@ POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean releas
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -6866,17 +6866,17 @@ POA_CORBA::ExtAttributeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ExtAttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ExtAttributeDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6892,7 +6892,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6908,7 +6908,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6924,7 +6924,7 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6942,7 +6942,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6958,7 +6958,7 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6976,7 +6976,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6992,7 +6992,7 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7010,7 +7010,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7026,7 +7026,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7042,7 +7042,7 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7058,7 +7058,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7074,7 +7074,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7096,7 +7096,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7112,7 +7112,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7128,7 +7128,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7146,7 +7146,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::type_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7162,7 +7162,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7180,7 +7180,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::mode (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7196,7 +7196,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7214,7 +7214,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7230,7 +7230,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7248,7 +7248,7 @@ void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7317,7 +7317,7 @@ POA_CORBA::OperationDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -7329,7 +7329,7 @@ POA_CORBA::OperationDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -7347,17 +7347,17 @@ POA_CORBA::OperationDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::OperationDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::OperationDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->OperationDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->OperationDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7373,7 +7373,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7389,7 +7389,7 @@ void POA_CORBA::OperationDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7405,7 +7405,7 @@ char * POA_CORBA::OperationDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7423,7 +7423,7 @@ void POA_CORBA::OperationDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7439,7 +7439,7 @@ char * POA_CORBA::OperationDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7457,7 +7457,7 @@ void POA_CORBA::OperationDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7473,7 +7473,7 @@ char * POA_CORBA::OperationDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7491,7 +7491,7 @@ void POA_CORBA::OperationDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7507,7 +7507,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7523,7 +7523,7 @@ char * POA_CORBA::OperationDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7539,7 +7539,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7555,7 +7555,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7577,7 +7577,7 @@ void POA_CORBA::OperationDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7593,7 +7593,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7609,7 +7609,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7627,7 +7627,7 @@ void POA_CORBA::OperationDef_tie<T>::result_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7643,7 +7643,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7661,7 +7661,7 @@ void POA_CORBA::OperationDef_tie<T>::params (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7677,7 +7677,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7695,7 +7695,7 @@ void POA_CORBA::OperationDef_tie<T>::mode (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7711,7 +7711,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7729,7 +7729,7 @@ void POA_CORBA::OperationDef_tie<T>::contexts (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7745,7 +7745,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7816,7 +7816,7 @@ POA_CORBA::InterfaceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -7828,7 +7828,7 @@ POA_CORBA::InterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -7846,17 +7846,17 @@ POA_CORBA::InterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::InterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->InterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->InterfaceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7872,7 +7872,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7888,7 +7888,7 @@ void POA_CORBA::InterfaceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7906,7 +7906,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7926,7 +7926,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7950,7 +7950,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7972,7 +7972,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7994,7 +7994,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8020,7 +8020,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8044,7 +8044,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8070,7 +8070,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8094,7 +8094,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8118,7 +8118,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8142,7 +8142,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8178,7 +8178,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8202,7 +8202,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8226,7 +8226,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8248,7 +8248,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8272,7 +8272,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8296,7 +8296,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8332,7 +8332,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8348,7 +8348,7 @@ char * POA_CORBA::InterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8366,7 +8366,7 @@ void POA_CORBA::InterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8382,7 +8382,7 @@ char * POA_CORBA::InterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8400,7 +8400,7 @@ void POA_CORBA::InterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8416,7 +8416,7 @@ char * POA_CORBA::InterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8434,7 +8434,7 @@ void POA_CORBA::InterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8450,7 +8450,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8466,7 +8466,7 @@ char * POA_CORBA::InterfaceDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8482,7 +8482,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8498,7 +8498,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8520,7 +8520,7 @@ void POA_CORBA::InterfaceDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8536,7 +8536,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8552,7 +8552,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8570,7 +8570,7 @@ void POA_CORBA::InterfaceDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8588,7 +8588,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8604,7 +8604,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8630,7 +8630,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8715,7 +8715,7 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -8727,7 +8727,7 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -8745,17 +8745,17 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->InterfaceAttrExtension::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->InterfaceAttrExtension::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8771,7 +8771,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8854,7 +8854,7 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -8866,7 +8866,7 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean releas
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -8884,17 +8884,17 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ExtInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ExtInterfaceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8910,7 +8910,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8926,7 +8926,7 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8944,7 +8944,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8964,7 +8964,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8988,7 +8988,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9010,7 +9010,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9032,7 +9032,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9058,7 +9058,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9082,7 +9082,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9108,7 +9108,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9132,7 +9132,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9156,7 +9156,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9180,7 +9180,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9216,7 +9216,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9240,7 +9240,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9264,7 +9264,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9286,7 +9286,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9310,7 +9310,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9334,7 +9334,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9370,7 +9370,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9386,7 +9386,7 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9404,7 +9404,7 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9420,7 +9420,7 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9438,7 +9438,7 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9454,7 +9454,7 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9472,7 +9472,7 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9488,7 +9488,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9504,7 +9504,7 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9520,7 +9520,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9536,7 +9536,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9558,7 +9558,7 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9574,7 +9574,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9590,7 +9590,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9608,7 +9608,7 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9626,7 +9626,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9642,7 +9642,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9668,7 +9668,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9700,7 +9700,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9716,7 +9716,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9799,7 +9799,7 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -9811,7 +9811,7 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -9829,17 +9829,17 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->AbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->AbstractInterfaceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9855,7 +9855,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9871,7 +9871,7 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9889,7 +9889,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9909,7 +9909,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9933,7 +9933,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9955,7 +9955,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -9977,7 +9977,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10003,7 +10003,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10027,7 +10027,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10053,7 +10053,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10077,7 +10077,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10101,7 +10101,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10125,7 +10125,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10161,7 +10161,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10185,7 +10185,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10209,7 +10209,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10231,7 +10231,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10255,7 +10255,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10279,7 +10279,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10315,7 +10315,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10331,7 +10331,7 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10349,7 +10349,7 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10365,7 +10365,7 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10383,7 +10383,7 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10399,7 +10399,7 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10417,7 +10417,7 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10433,7 +10433,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10449,7 +10449,7 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10465,7 +10465,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10481,7 +10481,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10503,7 +10503,7 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10519,7 +10519,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10535,7 +10535,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10553,7 +10553,7 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10571,7 +10571,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10587,7 +10587,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10613,7 +10613,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10698,7 +10698,7 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -10710,7 +10710,7 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolea
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -10728,17 +10728,17 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ExtAbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ExtAbstractInterfaceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10754,7 +10754,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10770,7 +10770,7 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10788,7 +10788,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10808,7 +10808,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10832,7 +10832,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10854,7 +10854,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10876,7 +10876,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10902,7 +10902,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10926,7 +10926,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10952,7 +10952,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -10976,7 +10976,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11000,7 +11000,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11024,7 +11024,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11060,7 +11060,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11084,7 +11084,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11108,7 +11108,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11130,7 +11130,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11154,7 +11154,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11178,7 +11178,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11214,7 +11214,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11230,7 +11230,7 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11248,7 +11248,7 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11264,7 +11264,7 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11282,7 +11282,7 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11298,7 +11298,7 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11316,7 +11316,7 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11332,7 +11332,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11348,7 +11348,7 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11364,7 +11364,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11380,7 +11380,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11402,7 +11402,7 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11418,7 +11418,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11434,7 +11434,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11452,7 +11452,7 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11470,7 +11470,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11486,7 +11486,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11512,7 +11512,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11544,7 +11544,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11560,7 +11560,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11643,7 +11643,7 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -11655,7 +11655,7 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean rele
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -11673,17 +11673,17 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->LocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->LocalInterfaceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11699,7 +11699,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11715,7 +11715,7 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11733,7 +11733,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11753,7 +11753,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11777,7 +11777,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11799,7 +11799,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11821,7 +11821,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11847,7 +11847,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11871,7 +11871,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11897,7 +11897,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11921,7 +11921,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11945,7 +11945,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -11969,7 +11969,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12005,7 +12005,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12029,7 +12029,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12053,7 +12053,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12075,7 +12075,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12099,7 +12099,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12123,7 +12123,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12159,7 +12159,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12175,7 +12175,7 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12193,7 +12193,7 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12209,7 +12209,7 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12227,7 +12227,7 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12243,7 +12243,7 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12261,7 +12261,7 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12277,7 +12277,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12293,7 +12293,7 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12309,7 +12309,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12325,7 +12325,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12347,7 +12347,7 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12363,7 +12363,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12379,7 +12379,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12397,7 +12397,7 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12415,7 +12415,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12431,7 +12431,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12457,7 +12457,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12542,7 +12542,7 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -12554,7 +12554,7 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -12572,17 +12572,17 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ExtLocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ExtLocalInterfaceDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12598,7 +12598,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12614,7 +12614,7 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12632,7 +12632,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12652,7 +12652,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12676,7 +12676,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12698,7 +12698,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12720,7 +12720,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12746,7 +12746,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12770,7 +12770,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12796,7 +12796,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12820,7 +12820,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12844,7 +12844,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12868,7 +12868,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12904,7 +12904,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12928,7 +12928,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12952,7 +12952,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12974,7 +12974,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -12998,7 +12998,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13022,7 +13022,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13058,7 +13058,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13074,7 +13074,7 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13092,7 +13092,7 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13108,7 +13108,7 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13126,7 +13126,7 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13142,7 +13142,7 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13160,7 +13160,7 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13176,7 +13176,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13192,7 +13192,7 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13208,7 +13208,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13224,7 +13224,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13246,7 +13246,7 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13262,7 +13262,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13278,7 +13278,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13296,7 +13296,7 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13314,7 +13314,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13330,7 +13330,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13356,7 +13356,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13388,7 +13388,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -13404,7 +13404,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 1e7fe4beb0c..f9aee1d5cef 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -26,7 +26,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_codegen.cpp:603
#ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_COMPONENTSS_CPP_
@@ -87,13 +87,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::DefinitionKind>
: public
@@ -105,13 +105,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
#define _CORBA_REPOSITORY__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Repository>
: public
@@ -125,13 +125,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
#define _CORBA_CONTAINER__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Container>
: public
@@ -145,13 +145,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
#define _CORBA_IDLTYPE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::IDLType>
: public
@@ -165,13 +165,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -183,13 +183,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDefSeq>
: public
@@ -201,13 +201,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InitializerSeq>
: public
@@ -219,13 +219,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtInitializerSeq>
: public
@@ -237,13 +237,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExceptionDefSeq>
: public
@@ -255,13 +255,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
#define _CORBA_OPERATIONMODE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::OperationMode>
: public
@@ -273,13 +273,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ParDescriptionSeq>
: public
@@ -291,13 +291,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ContextIdSeq>
: public
@@ -309,13 +309,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
#define _CORBA_INTERFACEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDef>
: public
@@ -329,13 +329,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
#define _CORBA_VALUEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDef>
: public
@@ -349,13 +349,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::ComponentDef>
: public
@@ -369,13 +369,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::HomeDef>
: public
@@ -389,13 +389,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::EventDef>
: public
@@ -409,13 +409,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::ProvidesDef>
: public
@@ -429,13 +429,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::UsesDef>
: public
@@ -449,13 +449,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::EmitsDef>
: public
@@ -469,13 +469,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::PublishesDef>
: public
@@ -489,13 +489,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::ConsumesDef>
: public
@@ -509,13 +509,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::FactoryDef>
: public
@@ -529,13 +529,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_)
#define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ComponentIR::FinderDef>
: public
@@ -572,13 +572,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::DefinitionKind>
: public
@@ -590,13 +590,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
#define _CORBA_REPOSITORY__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Repository>
: public
@@ -611,13 +611,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
#define _CORBA_CONTAINER__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Container>
: public
@@ -632,13 +632,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
#define _CORBA_IDLTYPE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::IDLType>
: public
@@ -653,13 +653,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -671,13 +671,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDefSeq>
: public
@@ -689,13 +689,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InitializerSeq>
: public
@@ -707,13 +707,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtInitializerSeq>
: public
@@ -725,13 +725,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExceptionDefSeq>
: public
@@ -743,13 +743,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
#define _CORBA_OPERATIONMODE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::OperationMode>
: public
@@ -761,13 +761,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ParDescriptionSeq>
: public
@@ -779,13 +779,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ContextIdSeq>
: public
@@ -797,13 +797,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
#define _CORBA_INTERFACEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDef>
: public
@@ -818,13 +818,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
#define _CORBA_VALUEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDef>
: public
@@ -839,13 +839,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::ComponentDef>
: public
@@ -860,13 +860,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::HomeDef>
: public
@@ -881,13 +881,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::EventDef>
: public
@@ -902,13 +902,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::ProvidesDef>
: public
@@ -923,13 +923,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::UsesDef>
: public
@@ -944,13 +944,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::EmitsDef>
: public
@@ -965,13 +965,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::PublishesDef>
: public
@@ -986,13 +986,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::ConsumesDef>
: public
@@ -1007,13 +1007,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::FactoryDef>
: public
@@ -1028,13 +1028,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ComponentIR::FinderDef>
: public
@@ -1207,14 +1207,14 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
static const signed short lookup[] =
{
- -14, -2, -20, -2, 4, 5, 6, -1, -22, -2, 7, -1, 169, 10,
- 154, 13, -124, -1, -25, -2, -28, -4, -36, -3, -41, -2, 16, 17,
- 18, -1, 19, -137, -132, -1, 24, -1, -126, -1, 27, -1, -128, 32,
- 33, -1, 34, -1, 35, -43, -2, -135, 39, 40, -1, -46, -2, -139,
- -1, -118, 45, -114, -11, -2, -1, 48, 49, -51, -2, 50, -111, -53,
- -3, -110, 56, -8, -2, 57, -1, 58, -1, -1, 59, -1, 60, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 61, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+ -14, -2, -20, -2, 4, 5, 6, -1, -22, -2, 7, -1, 169, 10,
+ 154, 13, -124, -1, -25, -2, -28, -4, -36, -3, -41, -2, 16, 17,
+ 18, -1, 19, -137, -132, -1, 24, -1, -126, -1, 27, -1, -128, 32,
+ 33, -1, 34, -1, 35, -43, -2, -135, 39, 40, -1, -46, -2, -139,
+ -1, -118, 45, -114, -11, -2, -1, 48, 49, -51, -2, 50, -111, -53,
+ -3, -110, 56, -8, -2, 57, -1, 58, -1, -1, 59, -1, 60, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 61, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1263,9 +1263,9 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
int
CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -1275,7 +1275,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::EventDef::EventDef (void)
@@ -1300,18 +1300,18 @@ POA_CORBA::ComponentIR::EventDef::~EventDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_EventDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1325,39 +1325,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1367,26 +1366,26 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::EventDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-
+
_is_a_EventDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1398,16 +1397,15 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_EventDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1421,32 +1419,31 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1456,24 +1453,24 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-
+
_non_existent_EventDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1485,16 +1482,15 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_EventDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1508,32 +1504,31 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1543,24 +1538,24 @@ void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-
+
_repository_id_EventDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1572,14 +1567,13 @@ void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::EventDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -1589,30 +1583,29 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::EventDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -1621,11 +1614,11 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_EventDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1639,32 +1632,31 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1674,24 +1666,24 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-
+
_get_component_EventDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1703,7 +1695,6 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::EventDef::_is_a (
@@ -1772,26 +1763,25 @@ void POA_CORBA::ComponentIR::EventDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::EventDef *
-POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::EventDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1916,10 +1906,10 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, -1, -1, 7, -1, -10, -2, 8, 9, -50,
- -12, -2, -48, 14, 15, -1, 16, 17, 18, 19, -1, 20, 21, 22,
- -1, -1, 23, 24, 25, 26, 27, 28, 29, -1, 30, -1, 31, 32,
- 33, -1, -1, -1, 34,
+ -1, -1, -1, -1, -1, -1, -1, 7, -1, -10, -2, 8, 9, -50,
+ -12, -2, -48, 14, 15, -1, 16, 17, 18, 19, -1, 20, 21, 22,
+ -1, -1, 23, 24, 25, 26, 27, 28, 29, -1, 30, -1, 31, 32,
+ 33, -1, -1, -1, 34,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1968,9 +1958,9 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function ( ::CORBA::Object
int
CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -1980,7 +1970,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::Container::Container (void)
@@ -2003,11 +1993,11 @@ POA_CORBA::ComponentIR::Container::~Container (void)
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_component_Container
: public TAO::Upcall_Command
{
@@ -2021,44 +2011,44 @@ POA_CORBA::ComponentIR::Container::~Container (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_component (
arg_1
@@ -2067,20 +2057,19 @@ POA_CORBA::ComponentIR::Container::~Container (void)
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::Container::create_component_skel (
@@ -2094,14 +2083,14 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -2111,9 +2100,9 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
&_tao_base_component,
&_tao_supports_interfaces
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -2121,7 +2110,7 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2133,16 +2122,15 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_home_Container
: public TAO::Upcall_Command
{
@@ -2156,56 +2144,56 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_,
7);
-
+
retval =
this->servant_->create_home (
arg_1
@@ -2216,20 +2204,19 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
, arg_6
, arg_7
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::Container::create_home_skel (
@@ -2243,7 +2230,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -2252,7 +2239,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -2264,9 +2251,9 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
&_tao_supports_interfaces,
&_tao_primary_key
};
-
+
static size_t const nargs = 8;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -2274,7 +2261,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2286,16 +2273,15 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_event_Container
: public TAO::Upcall_Command
{
@@ -2309,74 +2295,74 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
7);
-
+
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
this->operation_details_,
this->args_,
8);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
9);
-
+
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq> (
this->operation_details_,
this->args_,
10);
-
+
retval =
this->servant_->create_event (
arg_1
@@ -2390,20 +2376,19 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
, arg_9
, arg_10
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::Container::create_event_skel (
@@ -2417,7 +2402,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -2429,7 +2414,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -2444,9 +2429,9 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
&_tao_supported_interfaces,
&_tao_initializers
};
-
+
static size_t const nargs = 11;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -2454,7 +2439,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2466,21 +2451,20 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2494,39 +2478,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Container::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2536,26 +2519,26 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-
+
_is_a_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2567,16 +2550,15 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2590,32 +2572,31 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Container::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2625,24 +2606,24 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-
+
_non_existent_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2654,16 +2635,15 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2677,32 +2657,31 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Container::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2712,24 +2691,24 @@ void POA_CORBA::ComponentIR::Container::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-
+
_repository_id_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2741,14 +2720,13 @@ void POA_CORBA::ComponentIR::Container::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::Container::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -2758,30 +2736,29 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -2790,11 +2767,11 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_Container_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2808,32 +2785,31 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Container * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Container::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2843,24 +2819,24 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::Container * const impl =
static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-
+
_get_component_Container_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2872,7 +2848,6 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::Container::_is_a (
@@ -2925,26 +2900,25 @@ void POA_CORBA::ComponentIR::Container::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::Container *
-POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Container::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::Container STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3080,11 +3054,11 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, u
static const signed char lookup[] =
{
- -1, -1, -1, -11, -2, -13, -2, 7, 8, -25, -2, 9, 10, -67,
- -27, -2, -68, 15, -1, 16, -1, 17, 18, -35, -2, 19, 20, 21,
- 22, -1, 23, 24, -80, -1, -77, 29, 30, -1, 31, 32, 33, 34,
- -76, 37, -1, 38, 39, -1, 40, -1, 41, 42, 43, 44, -1, -1,
- -1, 45,
+ -1, -1, -1, -11, -2, -13, -2, 7, 8, -25, -2, 9, 10, -67,
+ -27, -2, -68, 15, -1, 16, -1, 17, 18, -35, -2, 19, 20, 21,
+ 22, -1, 23, 24, -80, -1, -77, 29, 30, -1, 31, 32, 33, 34,
+ -76, 37, -1, 38, 39, -1, 40, -1, 41, 42, 43, 44, -1, -1,
+ -1, 45,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3133,9 +3107,9 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function ( ::CORBA::Object
int
CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -3145,7 +3119,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::ModuleDef::ModuleDef (void)
@@ -3169,18 +3143,18 @@ POA_CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3194,39 +3168,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3236,26 +3209,26 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ModuleDef * const impl =
static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-
+
_is_a_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3267,16 +3240,15 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3290,32 +3262,31 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3325,24 +3296,24 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ModuleDef * const impl =
static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-
+
_non_existent_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3354,16 +3325,15 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3377,32 +3347,31 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3412,24 +3381,24 @@ void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ModuleDef * const impl =
static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-
+
_repository_id_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3441,14 +3410,13 @@ void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -3458,30 +3426,29 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::ModuleDef * const impl =
static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -3490,11 +3457,11 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ModuleDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3508,32 +3475,31 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ModuleDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3543,24 +3509,24 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ModuleDef * const impl =
static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-
+
_get_component_ModuleDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3572,7 +3538,6 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::ModuleDef::_is_a (
@@ -3637,26 +3602,25 @@ void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::ModuleDef *
-POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ModuleDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::ModuleDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3790,12 +3754,12 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
static const signed char lookup[] =
{
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, -28,
- -2, 13, 14, 15, 16, -1, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, -31, -2, 26, 27, -97, -1, 30, -84, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, -1, -1, -1, -1, -1, 42, 43, 44, -1, -1,
- -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 46,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, -28,
+ -2, 13, 14, 15, 16, -1, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, -31, -2, 26, 27, -97, -1, 30, -84, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, -1, -1, -1, -1, -1, 42, 43, 44, -1, -1,
+ -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 46,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3844,9 +3808,9 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function ( ::CORBA::Objec
int
CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -3856,7 +3820,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecro
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::Repository::Repository (void)
@@ -3879,18 +3843,18 @@ POA_CORBA::ComponentIR::Repository::~Repository (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -3904,39 +3868,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Repository::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -3946,26 +3909,26 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::Repository * const impl =
static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-
+
_is_a_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3977,16 +3940,15 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4000,32 +3962,31 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4035,24 +3996,24 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::Repository * const impl =
static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-
+
_non_existent_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4064,16 +4025,15 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4087,32 +4047,31 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4122,24 +4081,24 @@ void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::Repository * const impl =
static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-
+
_repository_id_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4151,14 +4110,13 @@ void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::Repository::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -4168,30 +4126,29 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::Repository * const impl =
static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -4200,11 +4157,11 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_Repository_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4218,32 +4175,31 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::Repository * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::Repository::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4253,24 +4209,24 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::Repository * const impl =
static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-
+
_get_component_Repository_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4282,7 +4238,6 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::Repository::_is_a (
@@ -4343,26 +4298,25 @@ void POA_CORBA::ComponentIR::Repository::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::Repository *
-POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Repository::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::Repository STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4479,9 +4433,9 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
static const signed char lookup[] =
{
- -12, -2, -19, -2, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
- 15, 16, -1, 17, 18, -53, 21, -9, -2, 22, -6, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 23,
+ -12, -2, -19, -2, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
+ 15, 16, -1, 17, 18, -53, 21, -9, -2, 22, -6, -2, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 23,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4530,9 +4484,9 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
int
CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -4542,7 +4496,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::ProvidesDef::ProvidesDef (void)
@@ -4565,11 +4519,11 @@ POA_CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_interface_type_ProvidesDef
: public TAO::Upcall_Command
{
@@ -4583,31 +4537,30 @@ POA_CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->interface_type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ProvidesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
@@ -4621,16 +4574,16 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -4638,7 +4591,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4650,16 +4603,15 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_interface_type_ProvidesDef
: public TAO::Upcall_Command
{
@@ -4673,32 +4625,31 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->interface_type (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ProvidesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
@@ -4712,18 +4663,18 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_interface_type
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -4731,7 +4682,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4743,21 +4694,20 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ProvidesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4771,39 +4721,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ProvidesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4813,26 +4762,26 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-
+
_is_a_ProvidesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4844,16 +4793,15 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ProvidesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4867,32 +4815,31 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ProvidesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4902,24 +4849,24 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-
+
_non_existent_ProvidesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4931,16 +4878,15 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ProvidesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -4954,32 +4900,31 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ProvidesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -4989,24 +4934,24 @@ void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-
+
_repository_id_ProvidesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5018,14 +4963,13 @@ void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -5035,30 +4979,29 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -5067,11 +5010,11 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ProvidesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5085,32 +5028,31 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ProvidesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5120,24 +5062,24 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ProvidesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-
+
_get_component_ProvidesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5149,7 +5091,6 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::ProvidesDef::_is_a (
@@ -5202,26 +5143,25 @@ void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::ProvidesDef *
-POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ProvidesDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::ProvidesDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5340,9 +5280,9 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
static const signed char lookup[] =
{
- -17, -2, -21, -2, 4, 5, -1, 55, 8, 51, 11, -1, 45, 14,
- 15, 16, -52, 19, 20, -53, 23, -12, -2, 24, -9, -2, -6, -2,
- -1, -1, -1, -1, -1, -1, -1, -1, 25,
+ -17, -2, -21, -2, 4, 5, -1, 55, 8, 51, 11, -1, 45, 14,
+ 15, 16, -52, 19, 20, -53, 23, -12, -2, 24, -9, -2, -6, -2,
+ -1, -1, -1, -1, -1, -1, -1, -1, 25,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5391,9 +5331,9 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function ( ::CORBA::Object_p
int
CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -5403,7 +5343,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::UsesDef::UsesDef (void)
@@ -5426,11 +5366,11 @@ POA_CORBA::ComponentIR::UsesDef::~UsesDef (void)
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_interface_type_UsesDef
: public TAO::Upcall_Command
{
@@ -5444,31 +5384,30 @@ POA_CORBA::ComponentIR::UsesDef::~UsesDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->interface_type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
@@ -5482,16 +5421,16 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -5499,7 +5438,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5511,16 +5450,15 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_interface_type_UsesDef
: public TAO::Upcall_Command
{
@@ -5534,32 +5472,31 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->interface_type (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
@@ -5573,18 +5510,18 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_interface_type
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -5592,7 +5529,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5604,16 +5541,15 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_is_multiple_UsesDef
: public TAO::Upcall_Command
{
@@ -5627,31 +5563,30 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->is_multiple (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
@@ -5665,16 +5600,16 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -5682,7 +5617,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5694,16 +5629,15 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_is_multiple_UsesDef
: public TAO::Upcall_Command
{
@@ -5717,32 +5651,31 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->is_multiple (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
@@ -5756,18 +5689,18 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_is_multiple
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -5775,7 +5708,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5787,21 +5720,20 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_UsesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5815,39 +5747,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5857,26 +5788,26 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-
+
_is_a_UsesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5888,16 +5819,15 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_UsesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5911,32 +5841,31 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5946,24 +5875,24 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-
+
_non_existent_UsesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5975,16 +5904,15 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_UsesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5998,32 +5926,31 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6033,24 +5960,24 @@ void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-
+
_repository_id_UsesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6062,14 +5989,13 @@ void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -6079,30 +6005,29 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -6111,11 +6036,11 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_UsesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6129,32 +6054,31 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::UsesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::UsesDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6164,24 +6088,24 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::UsesDef * const impl =
static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-
+
_get_component_UsesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6193,7 +6117,6 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef::_is_a (
@@ -6246,26 +6169,25 @@ void POA_CORBA::ComponentIR::UsesDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::UsesDef *
-POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::UsesDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::UsesDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6383,9 +6305,9 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
static const signed char lookup[] =
{
- -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
- 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
+ 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6434,9 +6356,9 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
int
CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -6446,7 +6368,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::EventPortDef::EventPortDef (void)
@@ -6469,11 +6391,11 @@ POA_CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_event_EventPortDef
: public TAO::Upcall_Command
{
@@ -6487,31 +6409,30 @@ POA_CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->event (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
@@ -6525,16 +6446,16 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -6542,7 +6463,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6554,16 +6475,15 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_event_EventPortDef
: public TAO::Upcall_Command
{
@@ -6577,32 +6497,31 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->event (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
@@ -6616,18 +6535,18 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_event
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -6635,7 +6554,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6647,16 +6566,15 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class is_a_EventPortDef
: public TAO::Upcall_Command
{
@@ -6670,38 +6588,37 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
@@ -6715,18 +6632,18 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_event_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -6734,7 +6651,7 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6746,21 +6663,20 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_EventPortDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6774,39 +6690,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6816,26 +6731,26 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-
+
_is_a_EventPortDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6847,16 +6762,15 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_EventPortDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6870,32 +6784,31 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6905,24 +6818,24 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-
+
_non_existent_EventPortDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6934,16 +6847,15 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_EventPortDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6957,32 +6869,31 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6992,24 +6903,24 @@ void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-
+
_repository_id_EventPortDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7021,14 +6932,13 @@ void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7038,30 +6948,29 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7070,11 +6979,11 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_EventPortDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7088,32 +6997,31 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EventPortDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7123,24 +7031,24 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EventPortDef * const impl =
static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-
+
_get_component_EventPortDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7152,7 +7060,6 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef::_is_a (
@@ -7205,26 +7112,25 @@ void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::EventPortDef *
-POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventPortDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::EventPortDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7342,9 +7248,9 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
static const signed char lookup[] =
{
- -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
- 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
+ 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7393,9 +7299,9 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
int
CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -7405,7 +7311,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::EmitsDef::EmitsDef (void)
@@ -7427,18 +7333,18 @@ POA_CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_EmitsDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7452,39 +7358,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EmitsDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7494,26 +7399,26 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::EmitsDef * const impl =
static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-
+
_is_a_EmitsDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7525,16 +7430,15 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_EmitsDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7548,32 +7452,31 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EmitsDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7583,24 +7486,24 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EmitsDef * const impl =
static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-
+
_non_existent_EmitsDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7612,16 +7515,15 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_EmitsDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7635,32 +7537,31 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EmitsDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7670,24 +7571,24 @@ void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EmitsDef * const impl =
static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-
+
_repository_id_EmitsDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7699,14 +7600,13 @@ void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7716,30 +7616,29 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::EmitsDef * const impl =
static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -7748,11 +7647,11 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_EmitsDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7766,32 +7665,31 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::EmitsDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7801,24 +7699,24 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::EmitsDef * const impl =
static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-
+
_get_component_EmitsDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7830,7 +7728,6 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef::_is_a (
@@ -7887,26 +7784,25 @@ void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::EmitsDef *
-POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EmitsDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::EmitsDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8024,9 +7920,9 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
static const signed char lookup[] =
{
- -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
- 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
+ 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8075,9 +7971,9 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
int
CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -8087,7 +7983,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::PublishesDef::PublishesDef (void)
@@ -8109,18 +8005,18 @@ POA_CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_PublishesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8134,39 +8030,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::PublishesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8176,26 +8071,26 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::PublishesDef * const impl =
static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-
+
_is_a_PublishesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8207,16 +8102,15 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_PublishesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8230,32 +8124,31 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::PublishesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8265,24 +8158,24 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::PublishesDef * const impl =
static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-
+
_non_existent_PublishesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8294,16 +8187,15 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_PublishesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8317,32 +8209,31 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::PublishesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8352,24 +8243,24 @@ void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::PublishesDef * const impl =
static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-
+
_repository_id_PublishesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8381,14 +8272,13 @@ void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -8398,30 +8288,29 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::PublishesDef * const impl =
static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -8430,11 +8319,11 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_PublishesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8448,32 +8337,31 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::PublishesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8483,24 +8371,24 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::PublishesDef * const impl =
static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-
+
_get_component_PublishesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8512,7 +8400,6 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef::_is_a (
@@ -8569,26 +8456,25 @@ void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::PublishesDef *
-POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::PublishesDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::PublishesDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8706,9 +8592,9 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
static const signed char lookup[] =
{
- -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
- 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -12, -2, -20, -3, 4, 5, -1, 53, 8, 48, 11, -1, -48, 14,
+ 15, 16, -1, 17, 18, 19, -54, -9, -2, 23, -6, -2, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8757,9 +8643,9 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
int
CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -8769,7 +8655,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::ConsumesDef::ConsumesDef (void)
@@ -8791,18 +8677,18 @@ POA_CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ConsumesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8816,39 +8702,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ConsumesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8858,26 +8743,26 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ConsumesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-
+
_is_a_ConsumesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8889,16 +8774,15 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ConsumesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8912,32 +8796,31 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ConsumesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -8947,24 +8830,24 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ConsumesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-
+
_non_existent_ConsumesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -8976,16 +8859,15 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ConsumesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -8999,32 +8881,31 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ConsumesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9034,24 +8915,24 @@ void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ConsumesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-
+
_repository_id_ConsumesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9063,14 +8944,13 @@ void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -9080,30 +8960,29 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::ConsumesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -9112,11 +8991,11 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ConsumesDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -9130,32 +9009,31 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ConsumesDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -9165,24 +9043,24 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ConsumesDef * const impl =
static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-
+
_get_component_ConsumesDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9194,7 +9072,6 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef::_is_a (
@@ -9251,26 +9128,25 @@ void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::ConsumesDef *
-POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ConsumesDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::ConsumesDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9421,13 +9297,13 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, -8, -2, -10, -3, 5, -1, 6, 7, -97,
- -15, -2, -98, 13, -21, -2, 14, -96, 17, 18, -1, 19, 20, -98,
- -23, -2, -91, 25, 26, 27, -32, -3, 28, -1, -40, -2, 29, 30,
- -1, 31, -99, 35, 36, 37, 38, -1, 39, -1, -103, 42, -1, 43,
- -1, 44, -1, -1, -1, 45, -1, -1, -1, -46, -2, -91, -48, -2,
- -91, -52, -2, 50, 51, -93, -1, -1, -1, -1, 54, -1, -1, 55,
- -1, -1, -1, -56, -2, -91,
+ -1, -1, -1, -1, 4, -8, -2, -10, -3, 5, -1, 6, 7, -97,
+ -15, -2, -98, 13, -21, -2, 14, -96, 17, 18, -1, 19, 20, -98,
+ -23, -2, -91, 25, 26, 27, -32, -3, 28, -1, -40, -2, 29, 30,
+ -1, 31, -99, 35, 36, 37, 38, -1, 39, -1, -103, 42, -1, 43,
+ -1, 44, -1, -1, -1, 45, -1, -1, -1, -46, -2, -91, -48, -2,
+ -91, -52, -2, 50, 51, -93, -1, -1, -1, -1, 54, -1, -1, 55,
+ -1, -1, -1, -56, -2, -91,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9476,9 +9352,9 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
int
CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -9488,7 +9364,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::ComponentDef::ComponentDef (void)
@@ -9516,11 +9392,11 @@ POA_CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_base_component_ComponentDef
: public TAO::Upcall_Command
{
@@ -9534,31 +9410,30 @@ POA_CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->base_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
@@ -9572,16 +9447,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -9589,7 +9464,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9601,16 +9476,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_base_component_ComponentDef
: public TAO::Upcall_Command
{
@@ -9624,32 +9498,31 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->base_component (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
@@ -9663,18 +9536,18 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_base_component
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -9682,7 +9555,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9694,16 +9567,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_supported_interfaces_ComponentDef
: public TAO::Upcall_Command
{
@@ -9717,31 +9589,30 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->supported_interfaces (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
@@ -9755,16 +9626,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -9772,7 +9643,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9784,16 +9655,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_supported_interfaces_ComponentDef
: public TAO::Upcall_Command
{
@@ -9807,32 +9677,31 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->supported_interfaces (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
@@ -9846,18 +9715,18 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_supported_interfaces
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -9865,7 +9734,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -9877,16 +9746,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_provides_ComponentDef
: public TAO::Upcall_Command
{
@@ -9900,38 +9768,38 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ProvidesDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_provides (
arg_1
@@ -9939,20 +9807,19 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
@@ -9966,13 +9833,13 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -9981,9 +9848,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
&_tao_version,
&_tao_interface_type
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -9991,7 +9858,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10003,16 +9870,15 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_uses_ComponentDef
: public TAO::Upcall_Command
{
@@ -10026,44 +9892,44 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::UsesDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_uses (
arg_1
@@ -10072,20 +9938,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
@@ -10099,14 +9964,14 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -10116,9 +9981,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
&_tao_interface_type,
&_tao_is_multiple
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -10126,7 +9991,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10138,16 +10003,15 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_emits_ComponentDef
: public TAO::Upcall_Command
{
@@ -10161,38 +10025,38 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EmitsDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_emits (
arg_1
@@ -10200,20 +10064,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
@@ -10227,13 +10090,13 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -10242,9 +10105,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
&_tao_version,
&_tao_event
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -10252,7 +10115,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10264,16 +10127,15 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_publishes_ComponentDef
: public TAO::Upcall_Command
{
@@ -10287,38 +10149,38 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::PublishesDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_publishes (
arg_1
@@ -10326,20 +10188,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
@@ -10353,13 +10214,13 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -10368,9 +10229,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
&_tao_version,
&_tao_event
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -10378,7 +10239,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10390,16 +10251,15 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_consumes_ComponentDef
: public TAO::Upcall_Command
{
@@ -10413,38 +10273,38 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ConsumesDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
this->operation_details_,
this->args_,
4);
-
+
retval =
this->servant_->create_consumes (
arg_1
@@ -10452,20 +10312,19 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
, arg_3
, arg_4
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
@@ -10479,13 +10338,13 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -10494,9 +10353,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
&_tao_version,
&_tao_event
};
-
+
static size_t const nargs = 5;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -10504,7 +10363,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10516,21 +10375,20 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ComponentDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10544,39 +10402,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10586,26 +10443,26 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-
+
_is_a_ComponentDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10617,16 +10474,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ComponentDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10640,32 +10496,31 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10675,24 +10530,24 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-
+
_non_existent_ComponentDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10704,16 +10559,15 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ComponentDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10727,32 +10581,31 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10762,24 +10615,24 @@ void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-
+
_repository_id_ComponentDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10791,14 +10644,13 @@ void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -10808,30 +10660,29 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -10840,11 +10691,11 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ComponentDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -10858,32 +10709,31 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::ComponentDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -10893,24 +10743,24 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::ComponentDef * const impl =
static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-
+
_get_component_ComponentDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -10922,7 +10772,6 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef::_is_a (
@@ -10995,26 +10844,25 @@ void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::ComponentDef *
-POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ComponentDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::ComponentDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11145,7 +10993,7 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
{
{
- const TAO_operation_db_entry *resword;
+ const TAO_operation_db_entry *resword;
switch (key)
{
@@ -11246,9 +11094,9 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function ( ::CORBA::Objec
int
CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -11258,7 +11106,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecro
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::FactoryDef::FactoryDef (void)
@@ -11280,18 +11128,18 @@ POA_CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_FactoryDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11305,39 +11153,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FactoryDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11347,26 +11194,26 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::FactoryDef * const impl =
static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-
+
_is_a_FactoryDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11378,16 +11225,15 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_FactoryDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11401,32 +11247,31 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FactoryDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11436,24 +11281,24 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::FactoryDef * const impl =
static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-
+
_non_existent_FactoryDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11465,16 +11310,15 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_FactoryDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11488,32 +11332,31 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FactoryDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11523,24 +11366,24 @@ void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::FactoryDef * const impl =
static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-
+
_repository_id_FactoryDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11552,14 +11395,13 @@ void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -11569,30 +11411,29 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::FactoryDef * const impl =
static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -11601,11 +11442,11 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_FactoryDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -11619,32 +11460,31 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FactoryDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -11654,24 +11494,24 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::FactoryDef * const impl =
static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-
+
_get_component_FactoryDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -11683,7 +11523,6 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::FactoryDef::_is_a (
@@ -11740,26 +11579,25 @@ void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::FactoryDef *
-POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FactoryDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::FactoryDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11890,7 +11728,7 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
{
{
- const TAO_operation_db_entry *resword;
+ const TAO_operation_db_entry *resword;
switch (key)
{
@@ -11991,9 +11829,9 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function ( ::CORBA::Object
int
CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -12003,7 +11841,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::FinderDef::FinderDef (void)
@@ -12025,18 +11863,18 @@ POA_CORBA::ComponentIR::FinderDef::~FinderDef (void)
{
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_FinderDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12050,39 +11888,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FinderDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12092,26 +11929,26 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::FinderDef * const impl =
static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-
+
_is_a_FinderDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12123,16 +11960,15 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_FinderDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12146,32 +11982,31 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FinderDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12181,24 +12016,24 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::FinderDef * const impl =
static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-
+
_non_existent_FinderDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12210,16 +12045,15 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_FinderDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12233,32 +12067,31 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FinderDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12268,24 +12101,24 @@ void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::FinderDef * const impl =
static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-
+
_repository_id_FinderDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12297,14 +12130,13 @@ void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -12314,30 +12146,29 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::FinderDef * const impl =
static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -12346,11 +12177,11 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_FinderDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -12364,32 +12195,31 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::FinderDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::FinderDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -12399,24 +12229,24 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::FinderDef * const impl =
static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-
+
_get_component_FinderDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12428,7 +12258,6 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::FinderDef::_is_a (
@@ -12485,26 +12314,25 @@ void POA_CORBA::ComponentIR::FinderDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::FinderDef *
-POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FinderDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::FinderDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12656,14 +12484,14 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
static const signed char lookup[] =
{
- -1, -1, -1, -1, 4, 5, 6, -7, -3, -102, 10, 11, -12, -2,
- -102, -1, -1, -1, 14, 15, -1, -1, -16, -2, -18, -2, -104, -103,
- 20, -1, -21, -2, -102, 23, 24, 25, 26, 27, 28, -1, -32, -2,
- 29, -1, -36, -2, -38, -2, -40, -3, 30, -43, -2, 31, -1, -115,
- 34, 35, -114, -1, -114, -113, -111, 45, -1, 46, 47, 48, -1, 49,
- 50, -1, 51, -1, -1, -1, -1, 52, -1, -53, -2, -102, -1, -1,
- -1, -1, -1, -1, 55, -1, -1, -1, 56, -1, -1, -1, -1, -1,
- 57, -1, 58,
+ -1, -1, -1, -1, 4, 5, 6, -7, -3, -102, 10, 11, -12, -2,
+ -102, -1, -1, -1, 14, 15, -1, -1, -16, -2, -18, -2, -104, -103,
+ 20, -1, -21, -2, -102, 23, 24, 25, 26, 27, 28, -1, -32, -2,
+ 29, -1, -36, -2, -38, -2, -40, -3, 30, -43, -2, 31, -1, -115,
+ 34, 35, -114, -1, -114, -113, -111, 45, -1, 46, 47, 48, -1, 49,
+ 50, -1, 51, -1, -1, -1, -1, 52, -1, -53, -2, -102, -1, -1,
+ -1, -1, -1, -1, 55, -1, -1, -1, 56, -1, -1, -1, -1, -1,
+ 57, -1, 58,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12712,9 +12540,9 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_p
int
CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
+ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -12724,7 +12552,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ComponentIR::HomeDef::HomeDef (void)
@@ -12752,11 +12580,11 @@ POA_CORBA::ComponentIR::HomeDef::~HomeDef (void)
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_base_home_HomeDef
: public TAO::Upcall_Command
{
@@ -12770,31 +12598,30 @@ POA_CORBA::ComponentIR::HomeDef::~HomeDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->base_home (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
@@ -12808,16 +12635,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -12825,7 +12652,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12837,16 +12664,15 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_base_home_HomeDef
: public TAO::Upcall_Command
{
@@ -12860,32 +12686,31 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->base_home (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
@@ -12899,18 +12724,18 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_base_home
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -12918,7 +12743,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -12930,16 +12755,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_supported_interfaces_HomeDef
: public TAO::Upcall_Command
{
@@ -12953,31 +12777,30 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->supported_interfaces (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
@@ -12991,16 +12814,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13008,7 +12831,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13020,16 +12843,15 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_supported_interfaces_HomeDef
: public TAO::Upcall_Command
{
@@ -13043,32 +12865,31 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->supported_interfaces (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
@@ -13082,18 +12903,18 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_supported_interfaces
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13101,7 +12922,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13113,16 +12934,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_managed_component_HomeDef
: public TAO::Upcall_Command
{
@@ -13136,31 +12956,30 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->managed_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
@@ -13174,16 +12993,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13191,7 +13010,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13203,16 +13022,15 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_managed_component_HomeDef
: public TAO::Upcall_Command
{
@@ -13226,32 +13044,31 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->managed_component (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
@@ -13265,18 +13082,18 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_managed_component
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13284,7 +13101,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13296,16 +13113,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_primary_key_HomeDef
: public TAO::Upcall_Command
{
@@ -13319,31 +13135,30 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->primary_key (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
@@ -13357,16 +13172,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13374,7 +13189,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13386,16 +13201,15 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_primary_key_HomeDef
: public TAO::Upcall_Command
{
@@ -13409,32 +13223,31 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->primary_key (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
@@ -13448,18 +13261,18 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_primary_key
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13467,7 +13280,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13479,16 +13292,15 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_factory_HomeDef
: public TAO::Upcall_Command
{
@@ -13502,44 +13314,44 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FactoryDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_factory (
arg_1
@@ -13548,20 +13360,19 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
@@ -13575,14 +13386,14 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -13592,9 +13403,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
&_tao_params,
&_tao_exceptions
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13602,7 +13413,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13614,16 +13425,15 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_finder_HomeDef
: public TAO::Upcall_Command
{
@@ -13637,44 +13447,44 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FinderDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_finder (
arg_1
@@ -13683,20 +13493,19 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
@@ -13710,14 +13519,14 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -13727,9 +13536,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
&_tao_params,
&_tao_exceptions
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -13737,7 +13546,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13749,21 +13558,20 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_HomeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13777,39 +13585,38 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13819,26 +13626,26 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-
+
_is_a_HomeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13850,16 +13657,15 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_HomeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13873,32 +13679,31 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13908,24 +13713,24 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-
+
_non_existent_HomeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -13937,16 +13742,15 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_HomeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -13960,32 +13764,31 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -13995,24 +13798,24 @@ void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-
+
_repository_id_HomeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14024,14 +13827,13 @@ void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -14041,30 +13843,29 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
@@ -14073,11 +13874,11 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
{
namespace ComponentIR
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_HomeDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -14091,32 +13892,31 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ComponentIR::HomeDef * const servant_;
TAO_Operation_Details const * const operation_details_;
TAO::Argument * const * const args_;
};
}
-
+
}
void POA_CORBA::ComponentIR::HomeDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -14126,24 +13926,24 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ComponentIR::HomeDef * const impl =
static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-
+
_get_component_HomeDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -14155,7 +13955,6 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef::_is_a (
@@ -14228,26 +14027,25 @@ void POA_CORBA::ComponentIR::HomeDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ComponentIR::HomeDef *
-POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::HomeDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ComponentIR::HomeDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
index eae67ae179d..e5d13d91b94 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -95,7 +95,7 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -113,17 +113,17 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->EventDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->EventDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -139,7 +139,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -155,7 +155,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -173,7 +173,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -193,7 +193,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -217,7 +217,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -239,7 +239,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -261,7 +261,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -287,7 +287,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -311,7 +311,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -337,7 +337,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -361,7 +361,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -385,7 +385,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -409,7 +409,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -445,7 +445,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -469,7 +469,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -493,7 +493,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -515,7 +515,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -539,7 +539,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -563,7 +563,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -599,7 +599,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -615,7 +615,7 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -633,7 +633,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -649,7 +649,7 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -667,7 +667,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -683,7 +683,7 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -701,7 +701,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -717,7 +717,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -733,7 +733,7 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -749,7 +749,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -765,7 +765,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -787,7 +787,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -803,7 +803,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -819,7 +819,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -837,7 +837,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -853,7 +853,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -871,7 +871,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -887,7 +887,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -905,7 +905,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -921,7 +921,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -939,7 +939,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -955,7 +955,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -973,7 +973,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -989,7 +989,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1007,7 +1007,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1023,7 +1023,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1041,7 +1041,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1059,7 +1059,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1075,7 +1075,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1101,7 +1101,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1127,7 +1127,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1159,7 +1159,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1175,7 +1175,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1193,7 +1193,7 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1209,7 +1209,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1292,7 +1292,7 @@ POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1304,7 +1304,7 @@ POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1322,17 +1322,17 @@ POA_CORBA::ComponentIR::Container_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->Container::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1348,7 +1348,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1364,7 +1364,7 @@ void POA_CORBA::ComponentIR::Container_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1382,7 +1382,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1402,7 +1402,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1426,7 +1426,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1448,7 +1448,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1470,7 +1470,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1496,7 +1496,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1520,7 +1520,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1546,7 +1546,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1570,7 +1570,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1594,7 +1594,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1618,7 +1618,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1654,7 +1654,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1678,7 +1678,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1702,7 +1702,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1724,7 +1724,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1748,7 +1748,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1772,7 +1772,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1808,7 +1808,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1834,7 +1834,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1864,7 +1864,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1953,7 +1953,7 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1965,7 +1965,7 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1983,17 +1983,17 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ModuleDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2009,7 +2009,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2025,7 +2025,7 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2043,7 +2043,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2063,7 +2063,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2087,7 +2087,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2109,7 +2109,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2131,7 +2131,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2157,7 +2157,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2181,7 +2181,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2207,7 +2207,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2231,7 +2231,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2255,7 +2255,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2279,7 +2279,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2315,7 +2315,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2339,7 +2339,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2363,7 +2363,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2385,7 +2385,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2409,7 +2409,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2433,7 +2433,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2469,7 +2469,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2485,7 +2485,7 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2503,7 +2503,7 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2519,7 +2519,7 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2537,7 +2537,7 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2553,7 +2553,7 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2571,7 +2571,7 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2587,7 +2587,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2603,7 +2603,7 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2619,7 +2619,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2635,7 +2635,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2657,7 +2657,7 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2683,7 +2683,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2713,7 +2713,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2802,7 +2802,7 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -2814,7 +2814,7 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (T *obj, ::CORBA::Boolea
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -2832,17 +2832,17 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->Repository::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2858,7 +2858,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2874,7 +2874,7 @@ void POA_CORBA::ComponentIR::Repository_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2892,7 +2892,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2912,7 +2912,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2936,7 +2936,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2958,7 +2958,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2980,7 +2980,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3006,7 +3006,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3030,7 +3030,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3056,7 +3056,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3080,7 +3080,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3104,7 +3104,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3128,7 +3128,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3164,7 +3164,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3188,7 +3188,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3212,7 +3212,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3234,7 +3234,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3258,7 +3258,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3282,7 +3282,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3318,7 +3318,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3336,7 +3336,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3354,7 +3354,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3372,7 +3372,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3390,7 +3390,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3408,7 +3408,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3428,7 +3428,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3448,7 +3448,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3468,7 +3468,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3494,7 +3494,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3524,7 +3524,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3613,7 +3613,7 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -3625,7 +3625,7 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (T *obj, ::CORBA::Boole
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -3643,17 +3643,17 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ProvidesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ProvidesDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3669,7 +3669,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3685,7 +3685,7 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3701,7 +3701,7 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3719,7 +3719,7 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3735,7 +3735,7 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3753,7 +3753,7 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3769,7 +3769,7 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3787,7 +3787,7 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3803,7 +3803,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3819,7 +3819,7 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3835,7 +3835,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3851,7 +3851,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3873,7 +3873,7 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3889,7 +3889,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3960,7 +3960,7 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -3972,7 +3972,7 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -3990,17 +3990,17 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->UsesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->UsesDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4016,7 +4016,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4032,7 +4032,7 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4048,7 +4048,7 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4066,7 +4066,7 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4082,7 +4082,7 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4100,7 +4100,7 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4116,7 +4116,7 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4134,7 +4134,7 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4150,7 +4150,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4166,7 +4166,7 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4182,7 +4182,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4198,7 +4198,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4220,7 +4220,7 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4236,7 +4236,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4254,7 +4254,7 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4270,7 +4270,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4341,7 +4341,7 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -4353,7 +4353,7 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (T *obj, ::CORBA::Bool
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -4371,17 +4371,17 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->EventPortDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->EventPortDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4397,7 +4397,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4413,7 +4413,7 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4429,7 +4429,7 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4447,7 +4447,7 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4463,7 +4463,7 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4481,7 +4481,7 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4497,7 +4497,7 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4515,7 +4515,7 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4531,7 +4531,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4547,7 +4547,7 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4563,7 +4563,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4579,7 +4579,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4601,7 +4601,7 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4617,7 +4617,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4635,7 +4635,7 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4706,7 +4706,7 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -4718,7 +4718,7 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -4736,17 +4736,17 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->EmitsDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->EmitsDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4762,7 +4762,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4778,7 +4778,7 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4794,7 +4794,7 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4812,7 +4812,7 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4828,7 +4828,7 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4846,7 +4846,7 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4862,7 +4862,7 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4880,7 +4880,7 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4896,7 +4896,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4912,7 +4912,7 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4928,7 +4928,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4944,7 +4944,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4966,7 +4966,7 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -4982,7 +4982,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5000,7 +5000,7 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5071,7 +5071,7 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5083,7 +5083,7 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (T *obj, ::CORBA::Bool
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5101,17 +5101,17 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->PublishesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->PublishesDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5127,7 +5127,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5143,7 +5143,7 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5159,7 +5159,7 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5177,7 +5177,7 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5193,7 +5193,7 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5211,7 +5211,7 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5227,7 +5227,7 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5245,7 +5245,7 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5261,7 +5261,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5277,7 +5277,7 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5293,7 +5293,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5309,7 +5309,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5331,7 +5331,7 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5347,7 +5347,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5365,7 +5365,7 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5436,7 +5436,7 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5448,7 +5448,7 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (T *obj, ::CORBA::Boole
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5466,17 +5466,17 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ConsumesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ConsumesDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5492,7 +5492,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5508,7 +5508,7 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5524,7 +5524,7 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5542,7 +5542,7 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5558,7 +5558,7 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5576,7 +5576,7 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5592,7 +5592,7 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5610,7 +5610,7 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5626,7 +5626,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5642,7 +5642,7 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5658,7 +5658,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5674,7 +5674,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5696,7 +5696,7 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5712,7 +5712,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5730,7 +5730,7 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5801,7 +5801,7 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -5813,7 +5813,7 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (T *obj, ::CORBA::Bool
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -5831,17 +5831,17 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ComponentDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ComponentDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5857,7 +5857,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5873,7 +5873,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5891,7 +5891,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5911,7 +5911,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5935,7 +5935,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5957,7 +5957,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -5979,7 +5979,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6005,7 +6005,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6029,7 +6029,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6055,7 +6055,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6079,7 +6079,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6103,7 +6103,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6127,7 +6127,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6163,7 +6163,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6187,7 +6187,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6211,7 +6211,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6233,7 +6233,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6257,7 +6257,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6281,7 +6281,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6317,7 +6317,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6333,7 +6333,7 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6351,7 +6351,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6367,7 +6367,7 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6385,7 +6385,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6401,7 +6401,7 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6419,7 +6419,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6435,7 +6435,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6451,7 +6451,7 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6467,7 +6467,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6483,7 +6483,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6505,7 +6505,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6521,7 +6521,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6537,7 +6537,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6555,7 +6555,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6573,7 +6573,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6589,7 +6589,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6615,7 +6615,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6647,7 +6647,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6663,7 +6663,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6693,7 +6693,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6709,7 +6709,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6727,7 +6727,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6743,7 +6743,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6761,7 +6761,7 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6785,7 +6785,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6811,7 +6811,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6835,7 +6835,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6859,7 +6859,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6936,7 +6936,7 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -6948,7 +6948,7 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolea
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -6966,17 +6966,17 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->FactoryDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->FactoryDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -6992,7 +6992,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7008,7 +7008,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7024,7 +7024,7 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7042,7 +7042,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7058,7 +7058,7 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7076,7 +7076,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7092,7 +7092,7 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7110,7 +7110,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7126,7 +7126,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7142,7 +7142,7 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7158,7 +7158,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7174,7 +7174,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7196,7 +7196,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7212,7 +7212,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7228,7 +7228,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7246,7 +7246,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7262,7 +7262,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7280,7 +7280,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7296,7 +7296,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7314,7 +7314,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7330,7 +7330,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7348,7 +7348,7 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7364,7 +7364,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7435,7 +7435,7 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -7447,7 +7447,7 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -7465,17 +7465,17 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->FinderDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->FinderDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7491,7 +7491,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7507,7 +7507,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7523,7 +7523,7 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7541,7 +7541,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7557,7 +7557,7 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7575,7 +7575,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7591,7 +7591,7 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7609,7 +7609,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7625,7 +7625,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7641,7 +7641,7 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7657,7 +7657,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7673,7 +7673,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7695,7 +7695,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7711,7 +7711,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7727,7 +7727,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7745,7 +7745,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7761,7 +7761,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7779,7 +7779,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::params (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7795,7 +7795,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7813,7 +7813,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7829,7 +7829,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7847,7 +7847,7 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7863,7 +7863,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7934,7 +7934,7 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -7946,7 +7946,7 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -7964,17 +7964,17 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->HomeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->HomeDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -7990,7 +7990,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8006,7 +8006,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8024,7 +8024,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8044,7 +8044,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8068,7 +8068,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8090,7 +8090,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8112,7 +8112,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8138,7 +8138,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8162,7 +8162,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8188,7 +8188,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8212,7 +8212,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8236,7 +8236,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8260,7 +8260,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8296,7 +8296,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8320,7 +8320,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8344,7 +8344,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8366,7 +8366,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8390,7 +8390,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8414,7 +8414,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8450,7 +8450,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8466,7 +8466,7 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8484,7 +8484,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8500,7 +8500,7 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8518,7 +8518,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8534,7 +8534,7 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8552,7 +8552,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8568,7 +8568,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8584,7 +8584,7 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8600,7 +8600,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8616,7 +8616,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8638,7 +8638,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8654,7 +8654,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8670,7 +8670,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8688,7 +8688,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8706,7 +8706,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8722,7 +8722,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8748,7 +8748,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8780,7 +8780,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8796,7 +8796,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8826,7 +8826,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8842,7 +8842,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8860,7 +8860,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8876,7 +8876,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8894,7 +8894,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8910,7 +8910,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8928,7 +8928,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8944,7 +8944,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8962,7 +8962,7 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -8988,7 +8988,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index f41363829d3..4d391c38a93 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -26,7 +26,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_codegen.cpp:603
#ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_EXTENDEDS_CPP_
@@ -87,13 +87,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::DefinitionKind>
: public
@@ -105,13 +105,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
#define _CORBA_REPOSITORY__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Repository>
: public
@@ -125,13 +125,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
#define _CORBA_CONTAINER__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::Container>
: public
@@ -145,13 +145,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
#define _CORBA_IDLTYPE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::IDLType>
: public
@@ -165,13 +165,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -183,13 +183,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDefSeq>
: public
@@ -201,13 +201,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::InitializerSeq>
: public
@@ -219,13 +219,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtInitializerSeq>
: public
@@ -237,13 +237,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExceptionDefSeq>
: public
@@ -255,13 +255,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AttributeMode>
: public
@@ -273,13 +273,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::AttributeDef>
: public
@@ -293,13 +293,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtAttributeDef>
: public
@@ -313,13 +313,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
#define _CORBA_OPERATIONMODE__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::OperationMode>
: public
@@ -331,13 +331,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ParDescriptionSeq>
: public
@@ -349,13 +349,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ContextIdSeq>
: public
@@ -367,13 +367,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
#define _CORBA_OPERATIONDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::OperationDef>
: public
@@ -387,13 +387,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_)
#define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueMemberDef>
: public
@@ -407,13 +407,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
#define _CORBA_VALUEDEF__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDef>
: public
@@ -427,13 +427,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_)
#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ValueDef::FullValueDescription>
: public
@@ -445,13 +445,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_)
#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_
-
+
template<>
class SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
: public
@@ -486,13 +486,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::DefinitionKind>
: public
@@ -504,13 +504,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
#define _CORBA_REPOSITORY__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Repository>
: public
@@ -525,13 +525,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
#define _CORBA_CONTAINER__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::Container>
: public
@@ -546,13 +546,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
#define _CORBA_IDLTYPE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::IDLType>
: public
@@ -567,13 +567,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InterfaceDefSeq>
: public
@@ -585,13 +585,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDefSeq>
: public
@@ -603,13 +603,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::InitializerSeq>
: public
@@ -621,13 +621,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtInitializerSeq>
: public
@@ -639,13 +639,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExceptionDefSeq>
: public
@@ -657,13 +657,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AttributeMode>
: public
@@ -675,13 +675,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::AttributeDef>
: public
@@ -696,13 +696,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtAttributeDef>
: public
@@ -717,13 +717,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:817
#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
#define _CORBA_OPERATIONMODE__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::OperationMode>
: public
@@ -735,13 +735,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ParDescriptionSeq>
: public
@@ -753,13 +753,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:611
#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ContextIdSeq>
: public
@@ -771,13 +771,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
#define _CORBA_OPERATIONDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::OperationDef>
: public
@@ -792,13 +792,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueMemberDef>
: public
@@ -813,13 +813,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:140
#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
#define _CORBA_VALUEDEF__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDef>
: public
@@ -834,13 +834,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_)
#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ValueDef::FullValueDescription>
: public
@@ -852,13 +852,13 @@ namespace TAO
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:859
#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_)
#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_
-
+
template<>
class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
: public
@@ -980,8 +980,8 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
static const signed char lookup[] =
{
- -1, -8, -3, -11, -2, 5, -1, 6, -1, 7, -27, -26, -1, 13,
- 14, 15, -1, -1, 16,
+ -1, -8, -3, -11, -2, 5, -1, 6, -1, 7, -27, -26, -1, 13,
+ 14, 15, -1, -1, 16,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1030,9 +1030,9 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_FixedDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -1042,7 +1042,7 @@ CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::FixedDef::FixedDef (void)
@@ -1063,11 +1063,11 @@ POA_CORBA::FixedDef::~FixedDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_digits_FixedDef
: public TAO::Upcall_Command
{
@@ -1081,20 +1081,19 @@ POA_CORBA::FixedDef::~FixedDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::UShort>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::UShort> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->digits (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1103,7 +1102,7 @@ POA_CORBA::FixedDef::~FixedDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::FixedDef::_get_digits_skel (
@@ -1117,16 +1116,16 @@ void POA_CORBA::FixedDef::_get_digits_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::UShort>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
@@ -1134,7 +1133,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1146,14 +1145,13 @@ void POA_CORBA::FixedDef::_get_digits_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_digits_FixedDef
: public TAO::Upcall_Command
{
@@ -1167,21 +1165,20 @@ void POA_CORBA::FixedDef::_get_digits_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::UShort> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->digits (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1190,7 +1187,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::FixedDef::_set_digits_skel (
@@ -1204,18 +1201,18 @@ void POA_CORBA::FixedDef::_set_digits_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_digits
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
@@ -1223,7 +1220,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1235,14 +1232,13 @@ void POA_CORBA::FixedDef::_set_digits_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_scale_FixedDef
: public TAO::Upcall_Command
{
@@ -1256,20 +1252,19 @@ void POA_CORBA::FixedDef::_set_digits_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Short>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Short> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->scale (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1278,7 +1273,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::FixedDef::_get_scale_skel (
@@ -1292,16 +1287,16 @@ void POA_CORBA::FixedDef::_get_scale_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Short>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
@@ -1309,7 +1304,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1321,14 +1316,13 @@ void POA_CORBA::FixedDef::_get_scale_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_scale_FixedDef
: public TAO::Upcall_Command
{
@@ -1342,21 +1336,20 @@ void POA_CORBA::FixedDef::_get_scale_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Short>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Short> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->scale (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1365,7 +1358,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::FixedDef::_set_scale_skel (
@@ -1379,18 +1372,18 @@ void POA_CORBA::FixedDef::_set_scale_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_scale
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
@@ -1398,7 +1391,7 @@ void POA_CORBA::FixedDef::_set_scale_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1410,19 +1403,18 @@ void POA_CORBA::FixedDef::_set_scale_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_FixedDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1436,27 +1428,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1466,7 +1457,7 @@ namespace POA_CORBA
void POA_CORBA::FixedDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1476,26 +1467,26 @@ void POA_CORBA::FixedDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
-
+
_is_a_FixedDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1507,14 +1498,13 @@ void POA_CORBA::FixedDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_FixedDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1528,20 +1518,19 @@ void POA_CORBA::FixedDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1551,7 +1540,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
void POA_CORBA::FixedDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1561,24 +1550,24 @@ void POA_CORBA::FixedDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
-
+
_non_existent_FixedDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1590,14 +1579,13 @@ void POA_CORBA::FixedDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_FixedDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1611,20 +1599,19 @@ void POA_CORBA::FixedDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1634,7 +1621,7 @@ void POA_CORBA::FixedDef::_non_existent_skel (
void POA_CORBA::FixedDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1644,24 +1631,24 @@ void POA_CORBA::FixedDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
-
+
_repository_id_FixedDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1673,14 +1660,13 @@ void POA_CORBA::FixedDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::FixedDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -1690,41 +1676,40 @@ void POA_CORBA::FixedDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_FixedDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -1738,20 +1723,19 @@ void POA_CORBA::FixedDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::FixedDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -1761,7 +1745,7 @@ void POA_CORBA::FixedDef::_interface_skel (
void POA_CORBA::FixedDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -1771,24 +1755,24 @@ void POA_CORBA::FixedDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::FixedDef * const impl =
static_cast<POA_CORBA::FixedDef *> (servant);
-
+
_get_component_FixedDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -1800,7 +1784,6 @@ void POA_CORBA::FixedDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::FixedDef::_is_a (
@@ -1853,26 +1836,25 @@ void POA_CORBA::FixedDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::FixedDef *
-POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::FixedDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::FixedDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1992,9 +1974,9 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
static const signed char lookup[] =
{
- -13, -2, -15, -2, 4, 5, -1, 53, 8, 48, 12, -47, -46, 17,
- 18, 19, -1, 20, 21, -1, 22, -9, -3, 23, -6, -2, -24, -2,
- -38, -1, -1, -1, -1, -1, -1, -1, 26,
+ -13, -2, -15, -2, 4, 5, -1, 53, 8, 48, 12, -47, -46, 17,
+ 18, 19, -1, 20, 21, -1, 22, -9, -3, 23, -6, -2, -24, -2,
+ -38, -1, -1, -1, -1, -1, -1, -1, 26,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2043,9 +2025,9 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -2055,7 +2037,7 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ValueMemberDef::ValueMemberDef (void)
@@ -2076,11 +2058,11 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_ValueMemberDef
: public TAO::Upcall_Command
{
@@ -2094,20 +2076,19 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2116,7 +2097,7 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueMemberDef::_get_type_skel (
@@ -2130,16 +2111,16 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -2147,7 +2128,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2159,14 +2140,13 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_type_def_ValueMemberDef
: public TAO::Upcall_Command
{
@@ -2180,20 +2160,19 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2202,7 +2181,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueMemberDef::_get_type_def_skel (
@@ -2216,16 +2195,16 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -2233,7 +2212,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2245,14 +2224,13 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_type_def_ValueMemberDef
: public TAO::Upcall_Command
{
@@ -2266,21 +2244,20 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2289,7 +2266,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueMemberDef::_set_type_def_skel (
@@ -2303,18 +2280,18 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -2322,7 +2299,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2334,14 +2311,13 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_access_ValueMemberDef
: public TAO::Upcall_Command
{
@@ -2355,20 +2331,19 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Visibility>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Visibility> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->access (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2377,7 +2352,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueMemberDef::_get_access_skel (
@@ -2391,16 +2366,16 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Visibility>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -2408,7 +2383,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2420,14 +2395,13 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_access_ValueMemberDef
: public TAO::Upcall_Command
{
@@ -2441,21 +2415,20 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Visibility> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->access (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2464,7 +2437,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueMemberDef::_set_access_skel (
@@ -2478,18 +2451,18 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_access
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -2497,7 +2470,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2509,19 +2482,18 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ValueMemberDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2535,27 +2507,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2565,7 +2536,7 @@ namespace POA_CORBA
void POA_CORBA::ValueMemberDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2575,26 +2546,26 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
-
+
_is_a_ValueMemberDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2606,14 +2577,13 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ValueMemberDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2627,20 +2597,19 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2650,7 +2619,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
void POA_CORBA::ValueMemberDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2660,24 +2629,24 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
-
+
_non_existent_ValueMemberDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2689,14 +2658,13 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ValueMemberDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2710,20 +2678,19 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2733,7 +2700,7 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
void POA_CORBA::ValueMemberDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2743,24 +2710,24 @@ void POA_CORBA::ValueMemberDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
-
+
_repository_id_ValueMemberDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2772,14 +2739,13 @@ void POA_CORBA::ValueMemberDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ValueMemberDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -2789,41 +2755,40 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ValueMemberDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -2837,20 +2802,19 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueMemberDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -2860,7 +2824,7 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
void POA_CORBA::ValueMemberDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -2870,24 +2834,24 @@ void POA_CORBA::ValueMemberDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueMemberDef * const impl =
static_cast<POA_CORBA::ValueMemberDef *> (servant);
-
+
_get_component_ValueMemberDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -2899,7 +2863,6 @@ void POA_CORBA::ValueMemberDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
@@ -2952,26 +2915,25 @@ void POA_CORBA::ValueMemberDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ValueMemberDef *
-POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueMemberDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ValueMemberDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3124,14 +3086,14 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
static const signed short lookup[] =
{
- -8, -2, -11, -2, 4, 5, 6, -1, -14, -2, 7, -1, -116, 10,
- -116, 13, -112, -1, -20, -2, -22, -2, -27, -4, -34, -3, 16, 17,
- 18, -1, 19, -117, -116, -1, 24, -1, 25, -1, 26, -1, -122, 31,
- 32, -1, 33, -39, -2, -41, -2, -129, 37, 38, -1, -44, -2, -114,
- -1, -114, 43, -110, -1, -1, -1, 46, 47, -49, -2, 48, -107, -51,
- -3, -106, 54, -1, -1, -1, -1, 55, -1, -1, 56, -1, 57, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 58, -1, -1, -1, -1, -1, 59,
+ -8, -2, -11, -2, 4, 5, 6, -1, -14, -2, 7, -1, -116, 10,
+ -116, 13, -112, -1, -20, -2, -22, -2, -27, -4, -34, -3, 16, 17,
+ 18, -1, 19, -117, -116, -1, 24, -1, 25, -1, 26, -1, -122, 31,
+ 32, -1, 33, -39, -2, -41, -2, -129, 37, 38, -1, -44, -2, -114,
+ -1, -114, 43, -110, -1, -1, -1, 46, 47, -49, -2, 48, -107, -51,
+ -3, -106, 54, -1, -1, -1, -1, 55, -1, -1, 56, -1, 57, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 58, -1, -1, -1, -1, -1, 59,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3180,9 +3142,9 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ValueDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -3192,7 +3154,7 @@ CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ValueDef::ValueDef (void)
@@ -3215,11 +3177,11 @@ POA_CORBA::ValueDef::~ValueDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_supported_interfaces_ValueDef
: public TAO::Upcall_Command
{
@@ -3233,20 +3195,19 @@ POA_CORBA::ValueDef::~ValueDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->supported_interfaces (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3255,7 +3216,7 @@ POA_CORBA::ValueDef::~ValueDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
@@ -3269,16 +3230,16 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3286,7 +3247,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3298,14 +3259,13 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_supported_interfaces_ValueDef
: public TAO::Upcall_Command
{
@@ -3319,21 +3279,20 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->supported_interfaces (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3342,7 +3301,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
@@ -3356,18 +3315,18 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_supported_interfaces
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3375,7 +3334,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3387,14 +3346,13 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_initializers_ValueDef
: public TAO::Upcall_Command
{
@@ -3408,20 +3366,19 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::InitializerSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->initializers (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3430,7 +3387,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_initializers_skel (
@@ -3444,16 +3401,16 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3461,7 +3418,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3473,14 +3430,13 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_initializers_ValueDef
: public TAO::Upcall_Command
{
@@ -3494,21 +3450,20 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->initializers (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3517,7 +3472,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_initializers_skel (
@@ -3531,18 +3486,18 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_initializers
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3550,7 +3505,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3562,14 +3517,13 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_base_value_ValueDef
: public TAO::Upcall_Command
{
@@ -3583,20 +3537,19 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->base_value (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3605,7 +3558,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_base_value_skel (
@@ -3619,16 +3572,16 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3636,7 +3589,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3648,14 +3601,13 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_base_value_ValueDef
: public TAO::Upcall_Command
{
@@ -3669,21 +3621,20 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->base_value (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3692,7 +3643,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_base_value_skel (
@@ -3706,18 +3657,18 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_base_value
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3725,7 +3676,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3737,14 +3688,13 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_abstract_base_values_ValueDef
: public TAO::Upcall_Command
{
@@ -3758,20 +3708,19 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDefSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->abstract_base_values (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3780,7 +3729,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
@@ -3794,16 +3743,16 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3811,7 +3760,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3823,14 +3772,13 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_abstract_base_values_ValueDef
: public TAO::Upcall_Command
{
@@ -3844,21 +3792,20 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->abstract_base_values (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3867,7 +3814,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
@@ -3881,18 +3828,18 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_abstract_base_values
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3900,7 +3847,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3912,14 +3859,13 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_is_abstract_ValueDef
: public TAO::Upcall_Command
{
@@ -3933,20 +3879,19 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->is_abstract (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -3955,7 +3900,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_is_abstract_skel (
@@ -3969,16 +3914,16 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -3986,7 +3931,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -3998,14 +3943,13 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_is_abstract_ValueDef
: public TAO::Upcall_Command
{
@@ -4019,21 +3963,20 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->is_abstract (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4042,7 +3985,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_is_abstract_skel (
@@ -4056,18 +3999,18 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_is_abstract
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4075,7 +4018,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4087,14 +4030,13 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_is_custom_ValueDef
: public TAO::Upcall_Command
{
@@ -4108,20 +4050,19 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->is_custom (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4130,7 +4071,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_is_custom_skel (
@@ -4144,16 +4085,16 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4161,7 +4102,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4173,14 +4114,13 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_is_custom_ValueDef
: public TAO::Upcall_Command
{
@@ -4194,21 +4134,20 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->is_custom (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4217,7 +4156,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_is_custom_skel (
@@ -4231,18 +4170,18 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_is_custom
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4250,7 +4189,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4262,14 +4201,13 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_is_truncatable_ValueDef
: public TAO::Upcall_Command
{
@@ -4283,20 +4221,19 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->is_truncatable (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4305,7 +4242,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_get_is_truncatable_skel (
@@ -4319,16 +4256,16 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4336,7 +4273,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4348,14 +4285,13 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_is_truncatable_ValueDef
: public TAO::Upcall_Command
{
@@ -4369,21 +4305,20 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->is_truncatable (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4392,7 +4327,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::_set_is_truncatable_skel (
@@ -4406,18 +4341,18 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_is_truncatable
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4425,7 +4360,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4437,14 +4372,13 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class is_a_ValueDef
: public TAO::Upcall_Command
{
@@ -4458,27 +4392,26 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_->is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4487,7 +4420,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::is_a_skel (
@@ -4501,18 +4434,18 @@ void POA_CORBA::ValueDef::is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4520,7 +4453,7 @@ void POA_CORBA::ValueDef::is_a_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4532,14 +4465,13 @@ void POA_CORBA::ValueDef::is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_value_ValueDef
: public TAO::Upcall_Command
{
@@ -4553,20 +4485,19 @@ void POA_CORBA::ValueDef::is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef::FullValueDescription> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->describe_value (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4575,7 +4506,7 @@ void POA_CORBA::ValueDef::is_a_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::describe_value_skel (
@@ -4589,16 +4520,16 @@ void POA_CORBA::ValueDef::describe_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4606,7 +4537,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4618,14 +4549,13 @@ void POA_CORBA::ValueDef::describe_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_value_member_ValueDef
: public TAO::Upcall_Command
{
@@ -4639,44 +4569,44 @@ void POA_CORBA::ValueDef::describe_value_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ValueMemberDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::Visibility> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_value_member (
arg_1
@@ -4685,9 +4615,8 @@ void POA_CORBA::ValueDef::describe_value_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4696,7 +4625,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::create_value_member_skel (
@@ -4710,14 +4639,14 @@ void POA_CORBA::ValueDef::create_value_member_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4727,9 +4656,9 @@ void POA_CORBA::ValueDef::create_value_member_skel (
&_tao_type,
&_tao_access
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4737,7 +4666,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4749,14 +4678,13 @@ void POA_CORBA::ValueDef::create_value_member_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_attribute_ValueDef
: public TAO::Upcall_Command
{
@@ -4770,44 +4698,44 @@ void POA_CORBA::ValueDef::create_value_member_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
this->operation_details_,
this->args_,
5);
-
+
retval =
this->servant_->create_attribute (
arg_1
@@ -4816,9 +4744,8 @@ void POA_CORBA::ValueDef::create_value_member_skel (
, arg_4
, arg_5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4827,7 +4754,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::create_attribute_skel (
@@ -4841,14 +4768,14 @@ void POA_CORBA::ValueDef::create_attribute_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -4858,9 +4785,9 @@ void POA_CORBA::ValueDef::create_attribute_skel (
&_tao_type,
&_tao_mode
};
-
+
static size_t const nargs = 6;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -4868,7 +4795,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -4880,14 +4807,13 @@ void POA_CORBA::ValueDef::create_attribute_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_operation_ValueDef
: public TAO::Upcall_Command
{
@@ -4901,62 +4827,62 @@ void POA_CORBA::ValueDef::create_attribute_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
7);
-
+
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq> (
this->operation_details_,
this->args_,
8);
-
+
retval =
this->servant_->create_operation (
arg_1
@@ -4968,9 +4894,8 @@ void POA_CORBA::ValueDef::create_attribute_skel (
, arg_7
, arg_8
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -4979,7 +4904,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueDef::create_operation_skel (
@@ -4993,7 +4918,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -5003,7 +4928,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -5016,9 +4941,9 @@ void POA_CORBA::ValueDef::create_operation_skel (
&_tao_exceptions,
&_tao_contexts
};
-
+
static size_t const nargs = 9;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
@@ -5026,7 +4951,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5038,19 +4963,18 @@ void POA_CORBA::ValueDef::create_operation_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5064,27 +4988,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5094,7 +5017,7 @@ namespace POA_CORBA
void POA_CORBA::ValueDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5104,26 +5027,26 @@ void POA_CORBA::ValueDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
-
+
_is_a_ValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5135,14 +5058,13 @@ void POA_CORBA::ValueDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5156,20 +5078,19 @@ void POA_CORBA::ValueDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5179,7 +5100,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
void POA_CORBA::ValueDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5189,24 +5110,24 @@ void POA_CORBA::ValueDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
-
+
_non_existent_ValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5218,14 +5139,13 @@ void POA_CORBA::ValueDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5239,20 +5159,19 @@ void POA_CORBA::ValueDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5262,7 +5181,7 @@ void POA_CORBA::ValueDef::_non_existent_skel (
void POA_CORBA::ValueDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5272,24 +5191,24 @@ void POA_CORBA::ValueDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
-
+
_repository_id_ValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5301,14 +5220,13 @@ void POA_CORBA::ValueDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ValueDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -5318,41 +5236,40 @@ void POA_CORBA::ValueDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -5366,20 +5283,19 @@ void POA_CORBA::ValueDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5389,7 +5305,7 @@ void POA_CORBA::ValueDef::_interface_skel (
void POA_CORBA::ValueDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -5399,24 +5315,24 @@ void POA_CORBA::ValueDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueDef * const impl =
static_cast<POA_CORBA::ValueDef *> (servant);
-
+
_get_component_ValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5428,7 +5344,6 @@ void POA_CORBA::ValueDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ValueDef::_is_a (
@@ -5489,26 +5404,25 @@ void POA_CORBA::ValueDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ValueDef *
-POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ValueDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5665,14 +5579,14 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
static const signed short lookup[] =
{
- -14, -2, -20, -2, 4, 5, 6, -1, -22, -2, 7, -1, 169, 10,
- 154, 13, -124, -1, -25, -2, -28, -4, -36, -3, -41, -2, 16, 17,
- 18, -1, 19, -137, -132, -1, 24, -1, -126, -1, 27, -1, -128, 32,
- 33, -1, 34, -1, 35, -43, -2, -135, 39, 40, -1, -46, -2, -139,
- -1, -118, 45, -114, -11, -2, -1, 48, 49, -51, -2, 50, -111, -53,
- -3, -110, 56, -8, -2, 57, -1, 58, -1, -1, 59, -1, 60, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 61, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+ -14, -2, -20, -2, 4, 5, 6, -1, -22, -2, 7, -1, 169, 10,
+ 154, 13, -124, -1, -25, -2, -28, -4, -36, -3, -41, -2, 16, 17,
+ 18, -1, 19, -137, -132, -1, 24, -1, -126, -1, 27, -1, -128, 32,
+ 33, -1, 34, -1, 35, -43, -2, -135, 39, 40, -1, -46, -2, -139,
+ -1, -118, 45, -114, -11, -2, -1, 48, 49, -51, -2, 50, -111, -53,
+ -3, -110, 56, -8, -2, 57, -1, 58, -1, -1, 59, -1, 60, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 61, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5721,9 +5635,9 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -5733,7 +5647,7 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ExtValueDef::ExtValueDef (void)
@@ -5757,11 +5671,11 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_ext_initializers_ExtValueDef
: public TAO::Upcall_Command
{
@@ -5775,20 +5689,19 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExtInitializerSeq> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->ext_initializers (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5797,7 +5710,7 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
@@ -5811,16 +5724,16 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -5828,7 +5741,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5840,14 +5753,13 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_ext_initializers_ExtValueDef
: public TAO::Upcall_Command
{
@@ -5861,21 +5773,20 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->ext_initializers (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5884,7 +5795,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
@@ -5898,18 +5809,18 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_ext_initializers
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -5917,7 +5828,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -5929,14 +5840,13 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class describe_ext_value_ExtValueDef
: public TAO::Upcall_Command
{
@@ -5950,20 +5860,19 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef::ExtFullValueDescription> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->describe_ext_value (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -5972,7 +5881,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtValueDef::describe_ext_value_skel (
@@ -5986,16 +5895,16 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -6003,7 +5912,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6015,14 +5924,13 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class create_ext_attribute_ExtValueDef
: public TAO::Upcall_Command
{
@@ -6036,56 +5944,56 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
this->operation_details_,
this->args_,
1);
-
+
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
this->operation_details_,
this->args_,
2);
-
+
TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
this->operation_details_,
this->args_,
3);
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
4);
-
+
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
this->operation_details_,
this->args_,
5);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
6);
-
+
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
this->operation_details_,
this->args_,
7);
-
+
retval =
this->servant_->create_ext_attribute (
arg_1
@@ -6096,9 +6004,8 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
, arg_6
, arg_7
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6107,7 +6014,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
@@ -6121,7 +6028,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -6130,7 +6037,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
-
+
TAO::Argument * const args[] =
{
&retval,
@@ -6142,9 +6049,9 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
&_tao_get_exceptions,
&_tao_set_exceptions
};
-
+
static size_t const nargs = 8;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -6152,7 +6059,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6164,19 +6071,18 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ExtValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6190,27 +6096,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6220,7 +6125,7 @@ namespace POA_CORBA
void POA_CORBA::ExtValueDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6230,26 +6135,26 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
-
+
_is_a_ExtValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6261,14 +6166,13 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ExtValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6282,20 +6186,19 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6305,7 +6208,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
void POA_CORBA::ExtValueDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6315,24 +6218,24 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
-
+
_non_existent_ExtValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6344,14 +6247,13 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ExtValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6365,20 +6267,19 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6388,7 +6289,7 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
void POA_CORBA::ExtValueDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6398,24 +6299,24 @@ void POA_CORBA::ExtValueDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
-
+
_repository_id_ExtValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6427,14 +6328,13 @@ void POA_CORBA::ExtValueDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ExtValueDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -6444,41 +6344,40 @@ void POA_CORBA::ExtValueDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ExtValueDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -6492,20 +6391,19 @@ void POA_CORBA::ExtValueDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ExtValueDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6515,7 +6413,7 @@ void POA_CORBA::ExtValueDef::_interface_skel (
void POA_CORBA::ExtValueDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -6525,24 +6423,24 @@ void POA_CORBA::ExtValueDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ExtValueDef * const impl =
static_cast<POA_CORBA::ExtValueDef *> (servant);
-
+
_get_component_ExtValueDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6554,7 +6452,6 @@ void POA_CORBA::ExtValueDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ExtValueDef::_is_a (
@@ -6619,26 +6516,25 @@ void POA_CORBA::ExtValueDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ExtValueDef *
-POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtValueDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ExtValueDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6756,9 +6652,9 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
static const signed char lookup[] =
{
- -13, -2, -21, -2, 4, 5, -1, 55, 8, 51, 12, -1, -48, 15,
- 16, 17, -1, 18, 19, -1, 20, -1, -56, 23, -9, -3, -6, -2,
- -1, -1, -1, -1, -1, -1, -1, -1, 24,
+ -13, -2, -21, -2, 4, 5, -1, 55, 8, 51, 12, -1, -48, 15,
+ 16, 17, -1, 18, 19, -1, 20, -1, -56, 23, -9, -3, -6, -2,
+ -1, -1, -1, -1, -1, -1, -1, -1, 24,
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6807,9 +6703,9 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
int
CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (size_t)
{
- CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
+ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-
+
return 0;
}
@@ -6819,7 +6715,7 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
reinterpret_cast<size_t> (CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer)
);
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:103
POA_CORBA::ValueBoxDef::ValueBoxDef (void)
@@ -6842,11 +6738,11 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
{
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_original_type_def_ValueBoxDef
: public TAO::Upcall_Command
{
@@ -6860,20 +6756,19 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_->original_type_def (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueBoxDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6882,7 +6777,7 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
@@ -6896,16 +6791,16 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -6913,7 +6808,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -6925,14 +6820,13 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _set_original_type_def_ValueBoxDef
: public TAO::Upcall_Command
{
@@ -6946,21 +6840,20 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
this->operation_details_,
this->args_,
1);
-
+
this->servant_->original_type_def (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueBoxDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -6969,7 +6862,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/operation_ss.cpp:190
void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
@@ -6983,18 +6876,18 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< void>::ret_val retval;
TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_original_type_def
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -7002,7 +6895,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7014,19 +6907,18 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:169
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _is_a_ValueBoxDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7040,27 +6932,26 @@ namespace POA_CORBA
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_,
1);
-
+
retval =
this->servant_-> _is_a (
arg_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueBoxDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7070,7 +6961,7 @@ namespace POA_CORBA
void POA_CORBA::ValueBoxDef::_is_a_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7080,26 +6971,26 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+
TAO::Argument * const args[] =
{
&retval,
&_tao_repository_id
};
-
+
static size_t const nargs = 2;
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
-
+
_is_a_ValueBoxDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7111,14 +7002,13 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _non_existent_ValueBoxDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7132,20 +7022,19 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _non_existent (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueBoxDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7155,7 +7044,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
void POA_CORBA::ValueBoxDef::_non_existent_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7165,24 +7054,24 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
-
+
_non_existent_ValueBoxDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7194,14 +7083,13 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _repository_id_ValueBoxDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7215,20 +7103,19 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _repository_id (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueBoxDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7238,7 +7125,7 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
void POA_CORBA::ValueBoxDef::_repository_id_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7248,24 +7135,24 @@ void POA_CORBA::ValueBoxDef::_repository_id_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
-
+
_repository_id_ValueBoxDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7277,14 +7164,13 @@ void POA_CORBA::ValueBoxDef::_repository_id_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:513
void POA_CORBA::ValueBoxDef::_interface_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
ACE_ENV_ARG_DECL
@@ -7294,41 +7180,40 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
TAO_ORB_Core::ifr_client_adapter_name ()
);
-
+
if (_tao_adapter == 0)
{
ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
::CORBA::COMPLETED_NO));
}
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
- ::CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ ::CORBA::InterfaceDef_ptr _tao_retval =
+ impl->_get_interface ();
+
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
+
::CORBA::Boolean const _tao_result =
_tao_adapter->interfacedef_cdr_insert (
_tao_out,
_tao_retval
);
-
+
_tao_adapter->dispose (_tao_retval);
-
+
if (_tao_result == false)
{
ACE_THROW ( ::CORBA::MARSHAL ());
}
}namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_operation/upcall_command_ss.cpp:127
-
+
class _get_component_ValueBoxDef_Upcall_Command
: public TAO::Upcall_Command
{
@@ -7342,20 +7227,19 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
, args_ (args)
{
}
-
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
this->operation_details_,
this->args_);
-
+
retval =
this->servant_-> _get_component (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
}
-
+
private:
POA_CORBA::ValueBoxDef * const servant_;
TAO_Operation_Details const * const operation_details_;
@@ -7365,7 +7249,7 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
void POA_CORBA::ValueBoxDef::_component_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
ACE_ENV_ARG_DECL
@@ -7375,24 +7259,24 @@ void POA_CORBA::ValueBoxDef::_component_skel (
static ::CORBA::TypeCode_ptr const * const exceptions = 0;
static ::CORBA::ULong const nexceptions = 0;
#endif /* TAO_HAS_INTERCEPTORS */
-
+
TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+
TAO::Argument * const args[] =
{
&retval
};
-
+
static size_t const nargs = 1;
-
+
POA_CORBA::ValueBoxDef * const impl =
static_cast<POA_CORBA::ValueBoxDef *> (servant);
-
+
_get_component_ValueBoxDef_Upcall_Command command (
impl,
server_request.operation_details (),
args);
-
+
TAO::Upcall_Wrapper upcall_wrapper;
upcall_wrapper.upcall (server_request
, args
@@ -7404,7 +7288,6 @@ void POA_CORBA::ValueBoxDef::_component_skel (
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
::CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
@@ -7465,26 +7348,25 @@ void POA_CORBA::ValueBoxDef::_dispatch (
// be\be_visitor_interface/interface_ss.cpp:851
CORBA::ValueBoxDef *
-POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueBoxDef::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
-
+ TAO_Stub *stub = this->_create_stub ();
+
TAO_Stub_Auto_Ptr safe_stub (stub);
::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+
::CORBA::Boolean const _tao_opt_colloc =
stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+
ACE_NEW_RETURN (
tmp,
::CORBA::Object (stub, _tao_opt_colloc, this),
0
);
-
+
::CORBA::Object_var obj = tmp;
(void) safe_stub.release ();
-
+
typedef ::CORBA::ValueBoxDef STUB_SCOPED_NAME;
return
TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
index d50df786b6b..d3dd268bf91 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::FixedDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -95,7 +95,7 @@ POA_CORBA::FixedDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -113,17 +113,17 @@ POA_CORBA::FixedDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::FixedDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::FixedDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->FixedDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->FixedDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -139,7 +139,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -155,7 +155,7 @@ void POA_CORBA::FixedDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -171,7 +171,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -187,7 +187,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -205,7 +205,7 @@ void POA_CORBA::FixedDef_tie<T>::digits (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -221,7 +221,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -292,7 +292,7 @@ POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -304,7 +304,7 @@ POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -322,17 +322,17 @@ POA_CORBA::ValueMemberDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueMemberDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueMemberDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ValueMemberDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ValueMemberDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -348,7 +348,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -364,7 +364,7 @@ void POA_CORBA::ValueMemberDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -380,7 +380,7 @@ char * POA_CORBA::ValueMemberDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -398,7 +398,7 @@ void POA_CORBA::ValueMemberDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -414,7 +414,7 @@ char * POA_CORBA::ValueMemberDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -432,7 +432,7 @@ void POA_CORBA::ValueMemberDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -448,7 +448,7 @@ char * POA_CORBA::ValueMemberDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -466,7 +466,7 @@ void POA_CORBA::ValueMemberDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -482,7 +482,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -498,7 +498,7 @@ char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -514,7 +514,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -530,7 +530,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -552,7 +552,7 @@ void POA_CORBA::ValueMemberDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -568,7 +568,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -584,7 +584,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -602,7 +602,7 @@ void POA_CORBA::ValueMemberDef_tie<T>::type_def (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -618,7 +618,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -689,7 +689,7 @@ POA_CORBA::ValueDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -701,7 +701,7 @@ POA_CORBA::ValueDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -719,17 +719,17 @@ POA_CORBA::ValueDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ValueDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -745,7 +745,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -761,7 +761,7 @@ void POA_CORBA::ValueDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -779,7 +779,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -799,7 +799,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -823,7 +823,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -845,7 +845,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -867,7 +867,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -893,7 +893,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -917,7 +917,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -943,7 +943,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -967,7 +967,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -991,7 +991,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1015,7 +1015,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1051,7 +1051,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1075,7 +1075,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1099,7 +1099,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1121,7 +1121,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1145,7 +1145,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1169,7 +1169,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1205,7 +1205,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1221,7 +1221,7 @@ char * POA_CORBA::ValueDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1239,7 +1239,7 @@ void POA_CORBA::ValueDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1255,7 +1255,7 @@ char * POA_CORBA::ValueDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1273,7 +1273,7 @@ void POA_CORBA::ValueDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1289,7 +1289,7 @@ char * POA_CORBA::ValueDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1307,7 +1307,7 @@ void POA_CORBA::ValueDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1323,7 +1323,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1339,7 +1339,7 @@ char * POA_CORBA::ValueDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1355,7 +1355,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1371,7 +1371,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1393,7 +1393,7 @@ void POA_CORBA::ValueDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1409,7 +1409,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1425,7 +1425,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1443,7 +1443,7 @@ void POA_CORBA::ValueDef_tie<T>::supported_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1459,7 +1459,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1477,7 +1477,7 @@ void POA_CORBA::ValueDef_tie<T>::initializers (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1493,7 +1493,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1511,7 +1511,7 @@ void POA_CORBA::ValueDef_tie<T>::base_value (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1527,7 +1527,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1545,7 +1545,7 @@ void POA_CORBA::ValueDef_tie<T>::abstract_base_values (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1561,7 +1561,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1579,7 +1579,7 @@ void POA_CORBA::ValueDef_tie<T>::is_abstract (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1595,7 +1595,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1613,7 +1613,7 @@ void POA_CORBA::ValueDef_tie<T>::is_custom (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1629,7 +1629,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1647,7 +1647,7 @@ void POA_CORBA::ValueDef_tie<T>::is_truncatable (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1665,7 +1665,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1681,7 +1681,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1707,7 +1707,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1733,7 +1733,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1818,7 +1818,7 @@ POA_CORBA::ExtValueDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -1830,7 +1830,7 @@ POA_CORBA::ExtValueDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -1848,17 +1848,17 @@ POA_CORBA::ExtValueDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtValueDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ExtValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ExtValueDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1874,7 +1874,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1890,7 +1890,7 @@ void POA_CORBA::ExtValueDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1908,7 +1908,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1928,7 +1928,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1952,7 +1952,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1974,7 +1974,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -1996,7 +1996,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2022,7 +2022,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2046,7 +2046,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2072,7 +2072,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2096,7 +2096,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2120,7 +2120,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2144,7 +2144,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2180,7 +2180,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2204,7 +2204,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2228,7 +2228,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2250,7 +2250,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2274,7 +2274,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2298,7 +2298,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2334,7 +2334,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2350,7 +2350,7 @@ char * POA_CORBA::ExtValueDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2368,7 +2368,7 @@ void POA_CORBA::ExtValueDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2384,7 +2384,7 @@ char * POA_CORBA::ExtValueDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2402,7 +2402,7 @@ void POA_CORBA::ExtValueDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2418,7 +2418,7 @@ char * POA_CORBA::ExtValueDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2436,7 +2436,7 @@ void POA_CORBA::ExtValueDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2452,7 +2452,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2468,7 +2468,7 @@ char * POA_CORBA::ExtValueDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2484,7 +2484,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2500,7 +2500,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2522,7 +2522,7 @@ void POA_CORBA::ExtValueDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2538,7 +2538,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2554,7 +2554,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2572,7 +2572,7 @@ void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2588,7 +2588,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2606,7 +2606,7 @@ void POA_CORBA::ExtValueDef_tie<T>::initializers (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2622,7 +2622,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2640,7 +2640,7 @@ void POA_CORBA::ExtValueDef_tie<T>::base_value (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2656,7 +2656,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2674,7 +2674,7 @@ void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2690,7 +2690,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2708,7 +2708,7 @@ void POA_CORBA::ExtValueDef_tie<T>::is_abstract (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2724,7 +2724,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2742,7 +2742,7 @@ void POA_CORBA::ExtValueDef_tie<T>::is_custom (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2758,7 +2758,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2776,7 +2776,7 @@ void POA_CORBA::ExtValueDef_tie<T>::is_truncatable (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2794,7 +2794,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2810,7 +2810,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2836,7 +2836,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2862,7 +2862,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2894,7 +2894,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2910,7 +2910,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2928,7 +2928,7 @@ void POA_CORBA::ExtValueDef_tie<T>::ext_initializers (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -2944,7 +2944,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3027,7 +3027,7 @@ POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -3039,7 +3039,7 @@ POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -3057,17 +3057,17 @@ POA_CORBA::ValueBoxDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueBoxDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueBoxDef_tie<T>::_default_POA (void)
{
if (! ::CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ValueBoxDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ValueBoxDef::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3083,7 +3083,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3099,7 +3099,7 @@ void POA_CORBA::ValueBoxDef_tie<T>::destroy (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3115,7 +3115,7 @@ char * POA_CORBA::ValueBoxDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3133,7 +3133,7 @@ void POA_CORBA::ValueBoxDef_tie<T>::id (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3149,7 +3149,7 @@ char * POA_CORBA::ValueBoxDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3167,7 +3167,7 @@ void POA_CORBA::ValueBoxDef_tie<T>::name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3183,7 +3183,7 @@ char * POA_CORBA::ValueBoxDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3201,7 +3201,7 @@ void POA_CORBA::ValueBoxDef_tie<T>::version (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3217,7 +3217,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3233,7 +3233,7 @@ char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3249,7 +3249,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3265,7 +3265,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3287,7 +3287,7 @@ void POA_CORBA::ValueBoxDef_tie<T>::move (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3303,7 +3303,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
@@ -3319,7 +3319,7 @@ template <class T> ACE_INLINE
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:101
template <class T> ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index fd81da7b806..7f0e0ac536b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -47,7 +47,6 @@ TAO_IFR_Service_Loader::init (int argc,
command_line.get_ASCII_argv (),
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This function call initializes the IFR_Service Service
CORBA::Object_var object =
@@ -55,7 +54,6 @@ TAO_IFR_Service_Loader::init (int argc,
command_line.get_argc (),
command_line.get_TCHAR_argv ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 879525de273..f6a33cf6b81 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -71,7 +71,6 @@ TAO_IFR_Server::init_with_orb (int argc,
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
{
@@ -85,7 +84,6 @@ TAO_IFR_Server::init_with_orb (int argc,
this->root_poa_ =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int retval = OPTIONS::instance ()->parse_args (argc,
argv);
@@ -95,24 +93,21 @@ TAO_IFR_Server::init_with_orb (int argc,
return retval;
}
- retval = this->create_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = this->create_poa ();
if (retval != 0)
{
return retval;
}
- retval = this->open_config (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = this->open_config ();
if (retval != 0)
{
return retval;
}
- retval = this->create_repository (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = this->create_repository ();
if (retval != 0)
{
@@ -123,8 +118,7 @@ TAO_IFR_Server::init_with_orb (int argc,
|| OPTIONS::instance()->support_multicast_discovery ())
{
retval =
- this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->init_multicast_server ();
if (retval != 0)
{
@@ -140,7 +134,6 @@ TAO_IFR_Server::init_with_orb (int argc,
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -152,7 +145,6 @@ TAO_IFR_Server::fini (void)
this->root_poa_->destroy (1,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -165,14 +157,12 @@ TAO_IFR_Server::fini (void)
}
int
-TAO_IFR_Server::create_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::create_poa (void)
{
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
CORBA::PolicyList policies (5);
policies.length (5);
@@ -181,13 +171,11 @@ TAO_IFR_Server::create_poa (ACE_ENV_SINGLE_ARG_DECL)
policies[0] =
this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Lifespan Policy.
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Request Processing Policy.
policies[2] =
@@ -195,7 +183,6 @@ TAO_IFR_Server::create_poa (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::USE_DEFAULT_SERVANT
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
// Servant Retention Policy.
policies[3] =
@@ -203,7 +190,6 @@ TAO_IFR_Server::create_poa (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::NON_RETAIN
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
// Id Uniqueness Policy.
policies[4] =
@@ -211,23 +197,20 @@ TAO_IFR_Server::create_poa (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::MULTIPLE_ID
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
this->repo_poa_ =
this->root_poa_->create_POA ("repoPOA",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ policies[0]->destroy ();
return 0;
}
int
-TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::open_config (void)
{
if (OPTIONS::instance ()->using_registry ())
{
@@ -241,7 +224,6 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (this->config_,
ACE_Configuration_Win32Registry (root),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (-1);
#endif /* ACE_WIN32 */
return 0;
@@ -252,7 +234,6 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (heap,
ACE_Configuration_Heap,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (-1);
if (OPTIONS::instance ()->persistent ())
{
@@ -284,7 +265,7 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
}
int
-TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::create_repository (void)
{
TAO_ComponentRepository_i *impl = 0;
ACE_NEW_THROW_EX (
@@ -296,7 +277,6 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
),
CORBA::NO_MEMORY ()
);
- ACE_CHECK_RETURN (-1);
auto_ptr<TAO_ComponentRepository_i> safety (impl);
TAO_IFR_Service_Utils::repo_ = impl;
@@ -313,14 +293,12 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
),
CORBA::NO_MEMORY ()
);
- ACE_CHECK_RETURN (-1);
PortableServer::ServantBase_var tie_safety (impl_tie);
safety.release ();
this->repo_poa_->set_servant (impl_tie
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::ObjectId_var oid =
PortableServer::string_to_ObjectId ("");
@@ -331,18 +309,15 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
"IDL:omg.org/CORBA/ComponentIR/ComponentRepository:1.0"
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
CORBA::Repository_ptr repo_ref =
CORBA::Repository::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Initialize the repository.
int status = impl->repo_init (repo_ref,
this->repo_poa_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -354,17 +329,14 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
this->orb_->object_to_string (repo_ref
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (adapter.in ()))
{
@@ -375,14 +347,12 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
adapter->bind ("InterfaceRepository",
this->ifr_ior_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
// Add the repository to the ORB's table of initialized object references.
this->orb_->register_initial_reference ("InterfaceRepository",
repo_ref
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
FILE *output_file_ =
ACE_OS::fopen (OPTIONS::instance()->ior_output_file (),
@@ -399,7 +369,7 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
// Install ior multicast handler.
int
-TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::init_multicast_server (void)
{
#if defined (ACE_HAS_IP_MULTICAST)
// Get reactor instance from TAO.
@@ -437,7 +407,6 @@ TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (this->ior_multicast_,
TAO_IOR_Multicast (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (-1);
if (mde.length () != 0)
{
@@ -598,7 +567,6 @@ TAO_IFR_Service_Utils::pre_exist (
TAO_IFR_Service_Utils::id_exists (id,
repo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_IFR_Service_Utils::name_exists (checker,
key,
@@ -721,7 +689,6 @@ TAO_IFR_Service_Utils::name_exists (
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (kind == CORBA::dk_Interface)
@@ -731,7 +698,6 @@ TAO_IFR_Service_Utils::name_exists (
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (kind == CORBA::dk_Component)
@@ -741,35 +707,30 @@ TAO_IFR_Service_Utils::name_exists (
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_IFR_Service_Utils::check_subsection (checker,
"uses",
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_IFR_Service_Utils::check_subsection (checker,
"emits",
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_IFR_Service_Utils::check_subsection (checker,
"publishes",
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_IFR_Service_Utils::check_subsection (checker,
"consumes",
repo->config (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -873,7 +834,6 @@ TAO_IFR_Service_Utils::create_common (
container_key,
repo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (path);
ACE_Configuration *config = repo->config ();
@@ -1088,7 +1048,6 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r (
TAO_IFR_Service_Utils::gen_valuetype_tc_r (base_key,
repo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
}
CORBA::ValueMemberSeq vm_seq;
@@ -1097,7 +1056,6 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r (
key,
repo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
return
repo->tc_factory ()->create_value_tc (id.c_str (),
@@ -1168,8 +1126,7 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
TAO_IDLType_i *impl =
TAO_IFR_Service_Utils::path_to_idltype (holder,
repo);
- vm_seq[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ vm_seq[i].type = impl->type_i ();
repo->config ()->get_integer_value (member_key,
"access",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 2b91098a1ee..16c8edb7be2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -65,17 +65,17 @@ public:
protected:
/// Two persistent POAs, one using a servant locator.
- int create_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int create_poa (void);
/// Open an ACE_Configuration of the appropriate type.
- int open_config (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int open_config (void);
/// Create and initialize the repository.
- int create_repository (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int create_repository (void);
/// Enable the Interface Repository to answer multicast requests
/// for its IOR.
- int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int init_multicast_server (void);
/// Reference to our ORB.
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index 848677edd13..fa3a338254a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -49,8 +49,7 @@ TAO_IFR_Generic_Utils<T>::destroy_special (const char *section_name,
special_key);
T impl (repo);
impl.section_key (special_key);
- impl.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl.destroy_i ();
}
}
@@ -144,11 +143,9 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin (
T_impl impl (repo);
impl.section_key (key);
- desc.name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.name = impl.name_i ();
- desc.id = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.id = impl.id_i ();
ACE_TString holder;
repo->config ()->get_string_value (key,
@@ -156,8 +153,7 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin (
holder);
desc.defined_in = holder.fast_rep ();
- desc.version = impl.version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.version = impl.version_i ();
}
template<typename T_strseq>
@@ -321,7 +317,6 @@ TAO_Port_Utils<T>::create_entry (const char *id,
version,
sub_section
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (T::_nil ());
const char *tmp =
TAO_IFR_Service_Utils::reference_to_path (port_base_type);
@@ -351,7 +346,6 @@ TAO_Port_Utils<T>::create_entry (const char *id,
TAO_IFR_Service_Utils::path_to_ir_object (path,
repo
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (T::_nil ());
return T::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index 9846d186808..dc1e808aae5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -44,7 +44,7 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key)
}
void
-TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IRObject_i::update_key (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::Portable_Server::POA_Current_Impl *pc_impl =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index a6bbdc4adfa..e3f86156341 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -78,7 +78,7 @@ public:
// Plug in the section key.
protected:
- void update_key (ACE_ENV_SINGLE_ARG_DECL)
+ void update_key (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Set our key from the object ID via POACurrent.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 943a6082e1f..3c6e69a6a68 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -39,10 +39,9 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface (
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_ext_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_ext_interface_i ();
}
CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
@@ -141,7 +140,6 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
op.make_description (fifd->operations[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
// Restore our original section key.
@@ -201,7 +199,6 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
attr.fill_description (fifd->attributes[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
// Restore our original section key.
@@ -210,8 +207,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
this->section_key (key_holder);
CORBA::InterfaceDefSeq_var bases =
- iface.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ iface.base_interfaces_i ();
CORBA::ULong length = bases->length ();
CORBA::RepositoryIdSeq repo_ids (length);
@@ -237,8 +233,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
fifd->base_interfaces = repo_ids;
- fifd->type = iface.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ fifd->type = iface.type_i ();
return retval._retn ();
}
@@ -258,8 +253,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+ this->update_key ();
return this->create_ext_attribute_i (id,
name,
@@ -300,7 +294,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
version,
"attrs"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
// Store the path to the attribute's type definition.
char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -330,12 +323,10 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
CORBA::ExtAttributeDef_var retval =
CORBA::ExtAttributeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
return retval._retn ();
}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 9fd69d6cb63..971c23ee57f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -31,31 +31,29 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
}
CORBA::DefinitionKind
-TAO_InterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_InterfaceDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Interface;
}
void
-TAO_InterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our members.
- this->TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->TAO_Container_i::destroy_i ();
// These will get rid of the repo ids, which Contained_i::destroy()'s
// call to remove_section (recursive = 1) will not get, and also
@@ -67,7 +65,6 @@ TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special (
"ops",
@@ -75,39 +72,34 @@ TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
// Destroy ourself.
- this->TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->TAO_Contained_i::destroy_i ();
}
CORBA::Contained::Description *
-TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Contained::Description *desc_ptr = 0;
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval->kind = this->def_kind ();
CORBA::InterfaceDescription ifd;
ACE_TString holder;
@@ -131,8 +123,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ULong i = 0;
CORBA::InterfaceDefSeq_var bases =
- this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->base_interfaces_i ();
CORBA::ULong length = bases->length ();
CORBA::RepositoryIdSeq repo_ids (length);
@@ -153,8 +144,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_InterfaceDef_i impl (this->repo_);
impl.section_key (base_key);
- repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ repo_ids[i] = impl.id_i ();
}
ifd.base_interfaces = repo_ids;
@@ -163,19 +153,18 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -196,19 +185,18 @@ TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->base_interfaces_i ();
}
CORBA::InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -223,7 +211,6 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (seq,
CORBA::InterfaceDefSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
seq->length (size);
CORBA::InterfaceDefSeq_var retval = seq;
@@ -240,11 +227,9 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
@@ -257,8 +242,7 @@ TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfac
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->base_interfaces_i (base_interfaces
ACE_ENV_ARG_PARAMETER);
@@ -271,8 +255,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
{
// If we are an abstract interface, all our base interfaces must be
// abstract as well.
- CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::DefinitionKind def_kind = this->def_kind ();
if (def_kind == CORBA::dk_AbstractInterface)
{
@@ -280,8 +263,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
for (CORBA::ULong i = 0; i < length; ++i)
{
- def_kind = base_interfaces[i]->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ def_kind = base_interfaces[i]->def_kind ();
if (def_kind != CORBA::dk_AbstractInterface)
{
@@ -321,8 +303,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
TAO_InterfaceDef_i impl (this->repo_);
impl.section_key (base_key);
- name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ name = impl.name_i ();
// None of these names can clash with any we may already have.
TAO_Container_i::tmp_name_holder_ = name.in ();
@@ -331,7 +312,6 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
this->repo_,
this->def_kind ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
this->repo_->config ()->set_string_value (inherited_key,
@@ -347,8 +327,7 @@ TAO_InterfaceDef_i::is_a (const char *interface_id
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->is_a_i (interface_id
ACE_ENV_ARG_PARAMETER);
@@ -377,8 +356,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
// Is it one of our ancestors' types?
CORBA::InterfaceDefSeq_var bases =
- this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->base_interfaces_i ();
CORBA::ULong length = bases->length ();
@@ -400,7 +378,6 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
CORBA::Boolean success = impl.is_a_i (interface_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (success == 1)
{
@@ -412,19 +389,18 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
}
CORBA::InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_interface (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_interface_i ();
}
CORBA::InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_interface_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0;
@@ -514,7 +490,6 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
op.make_description (fifd->operations[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
// Restore our original section key.
@@ -574,7 +549,6 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
attr.make_description (fifd->attributes[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
// Restore our original section key.
@@ -583,8 +557,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key (key_holder);
CORBA::InterfaceDefSeq_var bases =
- this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->base_interfaces_i ();
CORBA::ULong length = bases->length ();
@@ -608,14 +581,12 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_InterfaceDef_i impl (this->repo_);
impl.section_key (base_key);
- repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ repo_ids[i] = impl.id_i ();
}
fifd->base_interfaces = repo_ids;
- fifd->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ fifd->type = this->type_i ();
return retval._retn ();
}
@@ -633,8 +604,7 @@ TAO_InterfaceDef_i::create_attribute (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+ this->update_key ();
return this->create_attribute_i (id,
name,
@@ -660,7 +630,6 @@ TAO_InterfaceDef_i::create_attribute_i (
this->check_inherited (name,
CORBA::dk_Attribute
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
TAO_Container_i::tmp_name_holder_ = name;
ACE_Configuration_Section_Key new_key;
@@ -678,7 +647,6 @@ TAO_InterfaceDef_i::create_attribute_i (
version,
"attrs"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
// Store the path to the attribute's type definition.
char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -698,12 +666,10 @@ TAO_InterfaceDef_i::create_attribute_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
CORBA::AttributeDef_var retval =
CORBA::AttributeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
return retval._retn ();
}
@@ -722,8 +688,7 @@ TAO_InterfaceDef_i::create_operation (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+ this->update_key ();
return this->create_operation_i (id,
name,
@@ -753,7 +718,6 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
this->check_inherited (name,
CORBA::dk_Operation
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
TAO_Container_i::tmp_name_holder_ = name;
ACE_Configuration_Section_Key new_key;
@@ -771,7 +735,6 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
version,
"ops"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
// Get the TypeCode for the return type.
ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
@@ -780,11 +743,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
this->repo_);
CORBA::TypeCode_var rettype =
- result_impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+ result_impl->type_i ();
- CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+ CORBA::TCKind kind = rettype->kind ();
// Oneway operations cannot have a non-void return type.
if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
@@ -915,12 +876,10 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
CORBA::OperationDef_var retval =
CORBA::OperationDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
return retval._retn ();
}
@@ -1047,7 +1006,6 @@ TAO_InterfaceDef_i::interface_contents (
limit_type,
exclude_inherited
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -1064,7 +1022,6 @@ TAO_InterfaceDef_i::name_clash (const char *name)
TAO_IFR_Service_Utils::repo_,
CORBA::dk_Interface
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index dab11360086..2d028365215 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
-ACE_RCSID (IFRService,
- LocalInterfaceDef_i,
+ACE_RCSID (IFRService,
+ LocalInterfaceDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,7 +25,7 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
}
CORBA::DefinitionKind
-TAO_LocalInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LocalInterfaceDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_LocalInterface;
@@ -38,8 +38,7 @@ TAO_LocalInterfaceDef_i::is_a (const char *interface_id
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->is_a_i (interface_id
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 731d9aaf511..8a264a124af 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -27,71 +27,63 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
}
CORBA::DefinitionKind
-TAO_ModuleDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ModuleDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Module;
}
void
-TAO_ModuleDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_ModuleDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our members.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
// Destroy ourself.
- TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Contained_i::destroy_i ();
}
CORBA::Contained::Description *
-TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Contained::Description *desc_ptr = 0;
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval->kind = this->def_kind ();
CORBA::ModuleDescription md;
- md.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ md.name = this->name_i ();
- md.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ md.id = this->id_i ();
ACE_TString container_id;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -100,8 +92,7 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
md.defined_in = container_id.c_str ();
- md.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ md.version = this->version_i ();
retval->value <<= md;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index e207ffe8823..7530a0d99d9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -26,26 +26,25 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void)
}
CORBA::DefinitionKind
-TAO_NativeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_NativeDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Native;
}
CORBA::TypeCode_ptr
-TAO_NativeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NativeDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NativeDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index ee94729fa59..5b5ce177be2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -29,7 +29,7 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void)
}
CORBA::DefinitionKind
-TAO_OperationDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Operation;
@@ -41,10 +41,9 @@ TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL )
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
@@ -55,38 +54,33 @@ TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL )
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval->kind = this->def_kind ();
CORBA::OperationDescription od;
this->make_description (od
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval->value <<= od;
- ACE_CHECK_RETURN (0);
return retval._retn ();
}
CORBA::TypeCode_ptr
-TAO_OperationDef_i::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->result_i ();
}
CORBA::TypeCode_ptr
-TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString result_path;
@@ -99,23 +93,22 @@ TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (result_path,
this->repo_);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_OperationDef_i::result_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->result_def_i ();
}
CORBA::IDLType_ptr
-TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString result_path;
@@ -127,7 +120,6 @@ TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (result_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -140,8 +132,7 @@ TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->result_def_i (result_def
ACE_ENV_ARG_PARAMETER);
@@ -161,19 +152,18 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def
}
CORBA::ParDescriptionSeq *
-TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::params (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->params_i ();
}
CORBA::ParDescriptionSeq *
-TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::params_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong i = 0;
@@ -217,7 +207,6 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (pd_seq,
CORBA::ParDescriptionSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
pd_seq->length (size);
@@ -256,18 +245,15 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (type_path,
this->repo_);
- retval[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval[i].type = impl->type_i ();
CORBA::Object_var obj =
TAO_IFR_Service_Utils::path_to_ir_object (type_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i].type_def = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
@@ -280,8 +266,7 @@ TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->params_i (params
ACE_ENV_ARG_PARAMETER);
@@ -340,19 +325,18 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params
}
CORBA::OperationMode
-TAO_OperationDef_i::mode (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::mode (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OP_NORMAL);
+ this->update_key ();
- return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->mode_i ();
}
CORBA::OperationMode
-TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::mode_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int mode;
@@ -370,8 +354,7 @@ TAO_OperationDef_i::mode (CORBA::OperationMode mode
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->mode_i (mode
ACE_ENV_ARG_PARAMETER);
@@ -388,19 +371,18 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
}
CORBA::ContextIdSeq *
-TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::contexts (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->contexts_i ();
}
CORBA::ContextIdSeq *
-TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::contexts_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Configuration_Section_Key contexts_key;
@@ -441,7 +423,6 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (ci_seq,
CORBA::ContextIdSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
ci_seq->length (size);
@@ -463,8 +444,7 @@ TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->contexts_i (contexts
ACE_ENV_ARG_PARAMETER);
@@ -505,10 +485,9 @@ TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL )
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->exceptions_i ();
}
CORBA::ExceptionDefSeq *
@@ -551,7 +530,6 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
ACE_NEW_THROW_EX (ed_seq,
CORBA::ExceptionDefSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
ed_seq->length (size);
@@ -572,11 +550,9 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
@@ -589,8 +565,7 @@ TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->exceptions_i (exceptions
ACE_ENV_ARG_PARAMETER);
@@ -617,11 +592,9 @@ TAO_OperationDef_i::make_description (
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- od.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.name = this->name_i ();
- od.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.id = this->id_i ();
ACE_TString container_id;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -630,24 +603,19 @@ TAO_OperationDef_i::make_description (
od.defined_in = container_id.c_str ();
- od.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.version = this->version_i ();
- od.result = this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.result = this->result_i ();
- od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.mode = this->mode_i ();
CORBA::ContextIdSeq_var cid_seq =
- this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->contexts_i ();
od.contexts = cid_seq.in ();
CORBA::ParDescriptionSeq_var pd_seq =
- this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->params_i ();
od.parameters = pd_seq.in ();
@@ -730,8 +698,7 @@ TAO_OperationDef_i::make_description (
TAO_ExceptionDef_i impl (this->repo_);
impl.section_key (type_key);
- od.exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ od.exceptions[i].type = impl.type_i ();
}
}
else
@@ -741,10 +708,10 @@ TAO_OperationDef_i::make_description (
}
CORBA::TypeCode_ptr
-TAO_OperationDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->result_i ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index f11a2850319..cd44958f558 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -171,7 +171,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- CORBA::TypeCode_ptr type_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ CORBA::TypeCode_ptr type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index f9789c4282b..600ccada59f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -3,8 +3,8 @@
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/PrimitiveDef_i.h"
-ACE_RCSID (IFRService,
- PrimitiveDef_i,
+ACE_RCSID (IFRService,
+ PrimitiveDef_i,
"$Id$")
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -22,21 +22,21 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
}
CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Primitive;
}
void
-TAO_PrimitiveDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
@@ -44,19 +44,18 @@ TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int pkind = 0;
@@ -116,19 +115,18 @@ TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::pk_null);
+ this->update_key ();
- return this->kind_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->kind_i ();
}
CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::kind_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int pkind = 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index f9bf6490763..af098640b65 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -27,26 +27,25 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
}
CORBA::DefinitionKind
-TAO_ProvidesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProvidesDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Provides;
}
CORBA::Contained::Description *
-TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ComponentIR::ProvidesDescription pd;
@@ -57,7 +56,6 @@ TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
ACE_TString base_type_id;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -76,19 +74,18 @@ TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceDef_ptr
-TAO_ProvidesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::interface_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+ this->update_key ();
- return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->interface_type_i ();
}
CORBA::InterfaceDef_ptr
-TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::interface_type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString holder;
@@ -102,7 +99,6 @@ TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
return CORBA::InterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -117,8 +113,7 @@ TAO_ProvidesDef_i::interface_type (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->interface_type_i (interface_type
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index 1a06feb5687..0ca5b1f2c99 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -4,8 +4,8 @@
#include "orbsvcs/IFRService/PublishesDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
-ACE_RCSID (IFRService,
- PublishesDef_i,
+ACE_RCSID (IFRService,
+ PublishesDef_i,
"$Id$")
TAO_PublishesDef_i::TAO_PublishesDef_i (
@@ -22,7 +22,7 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
}
CORBA::DefinitionKind
-TAO_PublishesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PublishesDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Publishes;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 028f07f18cc..4a14f2ed549 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -39,14 +39,14 @@ TAO_Repository_i::~TAO_Repository_i (void)
}
CORBA::DefinitionKind
-TAO_Repository_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Repository_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Repository;
}
void
-TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Repository_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
@@ -102,7 +102,6 @@ TAO_Repository_i::lookup_id_i (const char *search_id
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Contained::_nil ());
return CORBA::Contained::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -124,8 +123,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::TCKind kind = tc->kind ();
switch (kind)
{
@@ -136,16 +134,13 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::ULong length = tc->length ();
- CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::TypeCode_var ctype = tc->content_type ();
CORBA::TypeCode_var canon_ctype =
this->get_canonical_typecode_i (ctype.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
return this->tc_factory ()->create_array_tc (length,
canon_ctype.in ()
@@ -153,16 +148,13 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
}
case CORBA::tk_sequence:
{
- CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::ULong length = tc->length ();
- CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::TypeCode_var ctype = tc->content_type ();
CORBA::TypeCode_var canon_ctype =
this->get_canonical_typecode_i (ctype.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
return this->tc_factory ()->create_sequence_tc (length,
canon_ctype.in ()
@@ -181,8 +173,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::String_var id = tc->id ();
ACE_TString path;
int status =
@@ -208,7 +199,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
{
TAO_ExceptionDef_i impl (this->repo_);
impl.section_key (key);
- return impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl.type_i ();
}
else
{
@@ -216,7 +207,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
TAO_IFR_Service_Utils::path_to_idltype (path,
this);
impl->section_key (key);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
}
}
@@ -236,7 +227,6 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
obj_id.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::PrimitiveDef::_nil ());
return CORBA::PrimitiveDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -296,7 +286,6 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
obj_id.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::StringDef::_nil ());
return CORBA::StringDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -356,7 +345,6 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
obj_id.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::WstringDef::_nil ());
return CORBA::WstringDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -430,7 +418,6 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
obj_id.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::SequenceDef::_nil ());
return CORBA::SequenceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -504,7 +491,6 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
obj_id.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ArrayDef::_nil ());
return CORBA::ArrayDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -553,20 +539,17 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
CORBA::NO_MEMORY ());
}
- ACE_CHECK_RETURN (-1);
// Resolve and narrow the TypeCodeFactory.
CORBA::Object_var object =
this->orb_->resolve_initial_references ("TypeCodeFactory"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (!CORBA::is_nil (object.in ()))
{
this->tc_factory_ =
CORBA::TypeCodeFactory::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->tc_factory_.in ()))
ACE_ERROR_RETURN ((
@@ -590,14 +573,12 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
object =
this->orb_->resolve_initial_references ("POACurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (!CORBA::is_nil (object.in ()))
{
this->poa_current_ =
PortableServer::Current::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->poa_current_.in ()))
ACE_ERROR_RETURN ((
@@ -622,8 +603,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
return -1;
}
- int status = this->create_servants_and_poas (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int status = this->create_servants_and_poas ();
if (status != 0)
{
@@ -765,7 +745,7 @@ TAO_Repository_i::create_sections (void)
}
int
-TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Repository_i::create_servants_and_poas (void)
{
CORBA::PolicyList policies (5);
policies.length (5);
@@ -774,13 +754,11 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
policies[0] =
this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Lifespan Policy.
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Request Processing Policy.
policies[2] =
@@ -788,7 +766,6 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::USE_DEFAULT_SERVANT
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
// Servant Retention Policy.
policies[3] =
@@ -796,7 +773,6 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::NON_RETAIN
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
// Id Uniqueness Policy.
policies[4] =
@@ -804,11 +780,9 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::MULTIPLE_ID
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->root_poa_->the_POAManager ();
#define GEN_IR_OBJECT(name) \
this-> name ## _poa_ = \
@@ -816,7 +790,7 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
poa_manager.in (), \
policies \
ACE_ENV_ARG_PARAMETER); \
- ACE_CHECK_RETURN (-1); \
+\
TAO_ ## name ## _i * name ## _impl = 0; \
ACE_NEW_RETURN (name ## _impl, \
TAO_ ## name ## _i (this), \
@@ -833,7 +807,6 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
); \
this-> name ## _poa_->set_servant (this-> name ## _servant_ \
ACE_ENV_ARG_PARAMETER); \
- ACE_CHECK_RETURN (-1);
CONCRETE_IR_OBJECT_TYPES
@@ -845,8 +818,7 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
for (CORBA::ULong i = 0; i < length; ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ policy->destroy ();
}
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 06cbfdc2360..3c58bccb6b5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -198,7 +198,7 @@ public:
ACE_ENV_ARG_DECL);
// Called at startup to get everything initialized.
- virtual int create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int create_servants_and_poas (void);
// We create a default servant servant for each IR Object
// type and its corresponding POA.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index 5f7465b47fe..fb74b1d975b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -27,31 +27,29 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
}
CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Sequence;
}
void
-TAO_SequenceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Only if it is (w)string, fixed, array or sequence.
- this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_element_type ();
ACE_TString name;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -64,27 +62,24 @@ TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::TypeCode_var element_typecode =
- this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->element_type_i ();
- CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::ULong bound = this->bound_i ();
return this->repo_->tc_factory ()->create_sequence_tc (
bound,
@@ -94,19 +89,18 @@ TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::ULong
-TAO_SequenceDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::bound (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->bound_i ();
}
CORBA::ULong
-TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::bound_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int bound = 0;
@@ -139,19 +133,18 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->element_type_i ();
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -163,23 +156,22 @@ TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (element_path,
this->repo_);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->element_type_def_i ();
}
CORBA::IDLType_ptr
-TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -191,7 +183,6 @@ TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (element_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -204,8 +195,7 @@ TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->element_type_def_i (element_type_def
ACE_ENV_ARG_PARAMETER);
@@ -216,8 +206,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_element_type ();
char *element_path =
TAO_IFR_Service_Utils::reference_to_path (element_type_def);
@@ -256,8 +245,7 @@ TAO_SequenceDef_i::destroy_element_type (
TAO_IFR_Service_Utils::path_to_idltype (element_path,
this->repo_);
- impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->destroy_i ();
break;
}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index b8068cdb642..10eff46d8b3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -23,26 +23,25 @@ TAO_StringDef_i::~TAO_StringDef_i (void)
}
CORBA::DefinitionKind
-TAO_StringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_String;
}
void
-TAO_StringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString name;
@@ -56,23 +55,21 @@ TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::TypeCode_ptr
-TAO_StringDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_StringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::ULong bound = this->bound_i ();
return this->repo_->tc_factory ()->create_string_tc (
bound
@@ -81,19 +78,18 @@ TAO_StringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::ULong
-TAO_StringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::bound (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->bound_i ();
}
CORBA::ULong
-TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::bound_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int retval = 0;
@@ -111,8 +107,7 @@ TAO_StringDef_i::bound (CORBA::ULong bound
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->bound_i (bound
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index e4cef6229e6..5962494a08a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -29,51 +29,47 @@ TAO_StructDef_i::~TAO_StructDef_i (void)
}
CORBA::DefinitionKind
-TAO_StructDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StructDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Struct;
}
void
-TAO_StructDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_StructDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our members.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
// Destroy ourself.
- TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Contained_i::destroy_i ();
}
CORBA::TypeCode_ptr
-TAO_StructDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -105,8 +101,7 @@ TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
"name",
name);
- CORBA::StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::StructMemberSeq_var members = this->members_i ();
return this->repo_->tc_factory ()->create_struct_tc (id.c_str (),
name.c_str (),
@@ -115,19 +110,18 @@ TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::StructMemberSeq *
-TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::members (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->members_i ();
}
CORBA::StructMemberSeq *
-TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::members_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -196,7 +190,6 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (members,
CORBA::StructMemberSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
members->length (size);
@@ -222,11 +215,9 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->repo_->config ()->expand_path (this->repo_->root_key (),
path,
@@ -240,8 +231,7 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), 0);
}
- retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval[k].type = impl->type_i ();
// If this struct contains a nested struct (of another type) at
// some level, the above code will have changed the section key
@@ -259,8 +249,7 @@ TAO_StructDef_i::members (const CORBA::StructMemberSeq &members
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->members_i (members
ACE_ENV_ARG_PARAMETER);
@@ -272,8 +261,7 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our old members, both refs and defns.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
CORBA::ULong count = members.length ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 3261a380750..bf8052c6d64 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -26,39 +26,34 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
}
CORBA::Contained::Description *
-TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_TypedefDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_TypedefDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Contained::Description *desc_ptr = 0;
ACE_NEW_THROW_EX (desc_ptr,
CORBA::Contained::Description,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval->kind = this->def_kind ();
CORBA::TypeDescription td;
- ACE_CHECK_RETURN (0);
- td.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ td.name = this->name_i ();
- td.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ td.id = this->id_i ();
ACE_TString container_id;
@@ -68,11 +63,9 @@ TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
td.defined_in = container_id.c_str ();
- td.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ td.version = this->version_i ();
- td.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ td.type = this->type_i ();
retval->value <<= td;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index efc0446c718..a683ee73fb1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -32,51 +32,47 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void)
}
CORBA::DefinitionKind
-TAO_UnionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnionDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Union;
}
void
-TAO_UnionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_UnionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our members.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
// Destroy ourself.
- TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Contained_i::destroy_i ();
}
CORBA::TypeCode_ptr
-TAO_UnionDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -108,11 +104,9 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
"name",
name);
- CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::TypeCode_var tc = this->discriminator_type_i ();
- CORBA::UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::UnionMemberSeq_var members = this->members_i ();
return this->repo_->tc_factory ()->create_union_tc (id.c_str (),
name.c_str (),
@@ -122,19 +116,18 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->discriminator_type_i ();
}
CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString disc_path;
@@ -150,23 +143,22 @@ TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
}
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->discriminator_type_def_i ();
}
CORBA::IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString disc_path;
@@ -178,7 +170,6 @@ TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (disc_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -193,8 +184,7 @@ TAO_UnionDef_i::discriminator_type_def (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->discriminator_type_def_i (discriminator_type_def
ACE_ENV_ARG_PARAMETER);
@@ -216,19 +206,18 @@ TAO_UnionDef_i::discriminator_type_def_i (
}
CORBA::UnionMemberSeq *
-TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::members (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->members_i ();
}
CORBA::UnionMemberSeq *
-TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::members_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -279,7 +268,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (members,
CORBA::UnionMemberSeq (size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
members->length (size);
CORBA::UnionMemberSeq_var retval = members;
@@ -305,7 +293,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
this->fetch_label (next_key,
retval[k]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->repo_->config ()->get_string_value (next_key,
"path",
@@ -314,11 +301,9 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
obj = TAO_IFR_Service_Utils::path_to_ir_object (path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
impl = TAO_IFR_Service_Utils::path_to_idltype (path,
this->repo_);
@@ -327,8 +312,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), 0 );
}
- retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ retval[k].type = impl->type_i ();
// If this union contains a nested union (of another type) at
// some level, the above code will have changed the section key
@@ -346,8 +330,7 @@ TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->members_i (members
ACE_ENV_ARG_PARAMETER);
@@ -359,8 +342,7 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy our old members, both refs and defns.
- TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Container_i::destroy_i ();
ACE_TString section_name;
ACE_Configuration_Section_Key refs_key;
@@ -429,11 +411,9 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
value);
CORBA::TypeCode_var tc =
- this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->discriminator_type_i ();
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = tc->kind ();
switch (kind)
{
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index 833a7fd0c6a..b32ebb03d35 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -25,26 +25,25 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
}
CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UsesDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Uses;
}
CORBA::Contained::Description *
-TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ComponentIR::UsesDescription ud;
@@ -55,15 +54,13 @@ TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
ACE_TString base_type_id;
this->repo_->config ()->get_string_value (this->section_key_,
"base_type",
base_type_id);
ud.interface_type = base_type_id.fast_rep ();
- ud.is_multiple = this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ud.is_multiple = this->is_multiple_i ();
CORBA::Contained::Description *retval = 0;
ACE_NEW_RETURN (retval,
@@ -76,19 +73,18 @@ TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceDef_ptr
-TAO_UsesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::interface_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+ this->update_key ();
- return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->interface_type_i ();
}
CORBA::InterfaceDef_ptr
-TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::interface_type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString holder;
@@ -102,7 +98,6 @@ TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
return CORBA::InterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -117,8 +112,7 @@ TAO_UsesDef_i::interface_type (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->interface_type_i (interface_type
ACE_ENV_ARG_PARAMETER);
@@ -161,19 +155,18 @@ TAO_UsesDef_i::interface_type_i (
}
CORBA::Boolean
-TAO_UsesDef_i::is_multiple (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::is_multiple (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->is_multiple_i ();
}
CORBA::Boolean
-TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UsesDef_i::is_multiple_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong val = 0;
@@ -192,8 +185,7 @@ TAO_UsesDef_i::is_multiple (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->is_multiple_i (is_multiple
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index c8a710dcc23..6398e72e4d9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -29,26 +29,25 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
}
CORBA::DefinitionKind
-TAO_ValueBoxDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueBoxDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_ValueBox;
}
CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString id;
@@ -70,8 +69,7 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (boxed_type_path,
this->repo_);
- CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::TypeCode_var tc = impl->type_i ();
return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (),
name.c_str (),
@@ -80,19 +78,18 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->original_type_def_i ();
}
CORBA::IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString boxed_type_path;
@@ -104,7 +101,6 @@ TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (boxed_type_path,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -117,8 +113,7 @@ TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->original_type_def_i (original_type_def
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index d4ff826a40b..69e9baa58db 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -29,30 +29,28 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void)
}
CORBA::DefinitionKind
-TAO_ValueDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Value;
}
void
-TAO_ValueDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->TAO_Container_i::destroy_i ();
// These will get rid of the repo ids, which Contained_i::destroy()'s
// call to remove_section (recursive = 1) will not get, and also
@@ -64,7 +62,6 @@ TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special (
"ops",
@@ -72,23 +69,21 @@ TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
}
CORBA::Contained::Description *
-TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ValueDescription *vd = 0;
@@ -99,7 +94,6 @@ TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->fill_value_description (safe_vd.inout ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Contained::Description *cd = 0;
ACE_NEW_RETURN (cd,
@@ -112,19 +106,18 @@ TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_ValueDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
/// Since valuetype type codes may encapsultate the type code of a
@@ -138,19 +131,18 @@ TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::supported_interfaces (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->supported_interfaces_i ();
}
CORBA::InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::supported_interfaces_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::InterfaceDefSeq *seq = 0;
@@ -193,11 +185,9 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
@@ -212,8 +202,7 @@ TAO_ValueDef_i::supported_interfaces (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->supported_interfaces_i (supported_interfaces
ACE_ENV_ARG_PARAMETER);
@@ -285,7 +274,6 @@ TAO_ValueDef_i::supported_interfaces_i (
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
stringified = TAO_IFR_Service_Utils::int_to_string (i);
supported_id = supported_interfaces[i]->_interface_repository_id ();
@@ -296,19 +284,18 @@ TAO_ValueDef_i::supported_interfaces_i (
}
CORBA::InitializerSeq *
-TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::initializers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->initializers_i ();
}
CORBA::InitializerSeq *
-TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::initializers_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::InitializerSeq *iseq = 0;
@@ -387,19 +374,16 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
retval[i].members[j].type =
- impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ impl->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i].members[j].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -413,8 +397,7 @@ TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->initializers_i (initializers
ACE_ENV_ARG_PARAMETER);
@@ -436,19 +419,18 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers
}
CORBA::ValueDef_ptr
-TAO_ValueDef_i::base_value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::base_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+ this->update_key ();
- return this->base_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->base_value_i ();
}
CORBA::ValueDef_ptr
-TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::base_value_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString holder;
@@ -469,7 +451,6 @@ TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
return CORBA::ValueDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -482,8 +463,7 @@ TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->base_value_i (base_value
ACE_ENV_ARG_PARAMETER);
@@ -518,7 +498,6 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->repo_->config ()->set_string_value (
this->section_key_,
@@ -528,19 +507,18 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
}
CORBA::ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::abstract_base_values (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->abstract_base_values_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->abstract_base_values_i ();
}
CORBA::ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::abstract_base_values_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ValueDefSeq *vd_seq = 0;
@@ -583,11 +561,9 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
retval[i] = CORBA::ValueDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return retval._retn ();
@@ -602,8 +578,7 @@ TAO_ValueDef_i::abstract_base_values (
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->abstract_base_values_i (abstract_base_values
ACE_ENV_ARG_PARAMETER);
@@ -659,7 +634,6 @@ TAO_ValueDef_i::abstract_base_values_i (
this->repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
base_id = abstract_base_values[i]->_interface_repository_id ();
stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -670,19 +644,18 @@ TAO_ValueDef_i::abstract_base_values_i (
}
CORBA::Boolean
-TAO_ValueDef_i::is_abstract (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_abstract (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->is_abstract_i ();
}
CORBA::Boolean
-TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_abstract_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong is_it = 0;
@@ -699,8 +672,7 @@ TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->is_abstract (is_abstract
ACE_ENV_ARG_PARAMETER);
@@ -718,19 +690,18 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract
}
CORBA::Boolean
-TAO_ValueDef_i::is_custom (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_custom (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->is_custom_i ();
}
CORBA::Boolean
-TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_custom_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong is_it = 0;
@@ -747,8 +718,7 @@ TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->is_custom_i (is_custom
ACE_ENV_ARG_PARAMETER);
@@ -766,19 +736,18 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom
}
CORBA::Boolean
-TAO_ValueDef_i::is_truncatable (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_truncatable (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->is_truncatable_i ();
}
CORBA::Boolean
-TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_truncatable_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong is_it = 0;
@@ -795,8 +764,7 @@ TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->is_truncatable_i (is_truncatable
ACE_ENV_ARG_PARAMETER);
@@ -820,8 +788,7 @@ TAO_ValueDef_i::is_a (const char *id
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
return this->is_a_i (id
ACE_ENV_ARG_PARAMETER);
@@ -895,7 +862,6 @@ TAO_ValueDef_i::is_a_i (const char *id
impl.section_key (base_key);
success = impl.is_a_i (id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (success)
{
@@ -907,19 +873,18 @@ TAO_ValueDef_i::is_a_i (const char *id
}
CORBA::ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_value_i ();
}
CORBA::ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_value_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ValueDef::FullValueDescription *fv_desc = 0;
@@ -1010,16 +975,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->operations[i].result =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
this->repo_->config ()->get_integer_value (op_key,
"mode",
val);
fv_desc->operations[i].mode = static_cast<CORBA::OperationMode> (val);
CORBA::TCKind kind =
- fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ fv_desc->operations[i].result->kind ();
if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
&& kind != CORBA::tk_void)
@@ -1073,8 +1036,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->operations[i].parameters[j].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (
@@ -1082,12 +1044,10 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
this->repo_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
fv_desc->operations[i].parameters[j].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->repo_->config ()->get_integer_value (param_key,
"mode",
@@ -1154,8 +1114,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
// Use the TAO_IDLType_i fetched above.
fv_desc->operations[i].exceptions[j].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
}
}
}
@@ -1213,8 +1172,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->attributes[i].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
this->repo_->config ()->expand_path (this->repo_->root_key (),
holder,
@@ -1284,19 +1242,16 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
fv_desc->members[i].type =
- idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ idl_type->type_i ();
obj =
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
fv_desc->members[i].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
@@ -1365,12 +1320,10 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
fv_desc->initializers[i].members[j].type_def =
CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
}
}
@@ -1398,8 +1351,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
"base_value",
holder);
fv_desc->base_value = holder.fast_rep ();
- fv_desc->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ fv_desc->type = this->type_i ();
return retval._retn ();
}
@@ -1415,8 +1367,7 @@ TAO_ValueDef_i::create_value_member (const char *id,
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueMemberDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
+ this->update_key ();
return this->create_value_member_i (id,
name,
@@ -1451,7 +1402,6 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
version,
"members"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
// Store the path to the attribute's type definition.
char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -1471,12 +1421,10 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
CORBA::ValueMemberDef_var retval =
CORBA::ValueMemberDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
return retval._retn ();
}
@@ -1494,8 +1442,7 @@ TAO_ValueDef_i::create_attribute (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+ this->update_key ();
return this->create_attribute_i (id,
name,
@@ -1532,7 +1479,6 @@ TAO_ValueDef_i::create_attribute_i (
version,
"attrs"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
// Store the path to the attribute's type definition.
char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -1552,12 +1498,10 @@ TAO_ValueDef_i::create_attribute_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
CORBA::AttributeDef_var retval =
CORBA::AttributeDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
return retval._retn ();
}
@@ -1578,8 +1522,7 @@ TAO_ValueDef_i::create_operation (
{
TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+ this->update_key ();
return this->create_operation_i (id,
name,
@@ -1622,7 +1565,6 @@ TAO_ValueDef_i::create_operation_i (
version,
"ops"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
// Get the TypeCode for the return type.
ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
@@ -1631,11 +1573,9 @@ TAO_ValueDef_i::create_operation_i (
this->repo_);
CORBA::TypeCode_var rettype =
- result_impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+ result_impl->type_i ();
- CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+ CORBA::TCKind kind = rettype->kind ();
// Oneway operations cannot have a non-void return type.
if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
@@ -1771,12 +1711,10 @@ TAO_ValueDef_i::create_operation_i (
path.c_str (),
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
CORBA::OperationDef_var retval =
CORBA::OperationDef::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
return retval._retn ();
}
@@ -1792,7 +1730,6 @@ TAO_ValueDef_i::name_clash (const char *name)
TAO_IFR_Service_Utils::repo_,
CORBA::dk_Value
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -1807,18 +1744,14 @@ void
TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
ACE_ENV_ARG_DECL)
{
- desc.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.name = this->name_i ();
- desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.id = this->id_i ();
- CORBA::ULong tmp = this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULong tmp = this->is_abstract_i ();
desc.is_abstract = static_cast<CORBA::Boolean> (tmp);
- tmp = this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tmp = this->is_custom_i ();
desc.is_custom = static_cast<CORBA::Boolean> (tmp);
ACE_TString holder;
@@ -1827,8 +1760,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
holder);
desc.defined_in = holder.fast_rep ();
- desc.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc.version = this->version_i ();
TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
"supported",
@@ -1844,8 +1776,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
desc.abstract_base_values
);
- tmp = this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tmp = this->is_truncatable_i ();
desc.is_truncatable = static_cast<CORBA::Boolean> (tmp);
this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index bb6b101ddd0..05bcce93f17 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -28,26 +28,25 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
}
CORBA::DefinitionKind
-TAO_ValueMemberDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_ValueMember;
}
CORBA::Contained::Description *
-TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::describe (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->describe_i ();
}
CORBA::Contained::Description *
-TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::describe_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ValueMember vm;
@@ -58,10 +57,8 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
this->section_key_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (0);
- vm.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ vm.type = this->type_i ();
ACE_TString holder;
this->repo_->config ()->get_string_value (this->section_key_,
@@ -71,11 +68,9 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
vm.type_def = CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::ULong val = 0;
this->repo_->config ()->get_integer_value (this->section_key_,
@@ -94,19 +89,18 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString holder;
@@ -116,23 +110,22 @@ TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IDLType_i *impl =
TAO_IFR_Service_Utils::path_to_idltype (holder,
this->repo_);
- return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i ();
}
CORBA::IDLType_ptr
-TAO_ValueMemberDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_def (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+ this->update_key ();
- return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_def_i ();
}
CORBA::IDLType_ptr
-TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_def_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString holder;
@@ -143,7 +136,6 @@ TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_IFR_Service_Utils::path_to_ir_object (holder,
this->repo_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
return CORBA::IDLType::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
@@ -156,8 +148,7 @@ TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->type_def_i (type_def
ACE_ENV_ARG_PARAMETER);
@@ -175,19 +166,18 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def
}
CORBA::Visibility
-TAO_ValueMemberDef_i::access (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::access (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->access_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->access_i ();
}
CORBA::Visibility
-TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::access_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong val = 0;
@@ -204,8 +194,7 @@ TAO_ValueMemberDef_i::access (CORBA::Visibility access
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->access_i (access
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 252050a2855..44e756538e6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -25,26 +25,25 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
}
CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::def_kind (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Wstring;
}
void
-TAO_WstringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
- this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i ();
}
void
-TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::destroy_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString name;
@@ -58,42 +57,39 @@ TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::TypeCode_ptr
-TAO_WstringDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ this->update_key ();
- return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i ();
}
CORBA::TypeCode_ptr
-TAO_WstringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::type_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+ CORBA::ULong bound = this->bound_i ();
return this->repo_->tc_factory ()->create_wstring_tc (bound
ACE_ENV_ARG_PARAMETER);
}
CORBA::ULong
-TAO_WstringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::bound (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->update_key ();
- return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->bound_i ();
}
CORBA::ULong
-TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::bound_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int retval = 0;
@@ -111,8 +107,7 @@ TAO_WstringDef_i::bound (CORBA::ULong bound
{
TAO_IFR_WRITE_GUARD;
- this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->update_key ();
this->bound_i (bound
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index ffaf522468e..f4b283bc00c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -60,7 +60,7 @@ TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void)
}
CosLoadBalancing::Location *
-TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Load_Average_Monitor::the_location (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Location * location;
@@ -71,13 +71,12 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return location;
}
CosLoadBalancing::LoadList *
-TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Load_Average_Monitor::loads (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Float load = 0;
@@ -221,7 +220,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
CosLoadBalancing::LoadList_var load_list = tmp;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 48a8267e189..e1627c2b007 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -110,7 +110,7 @@ TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void)
}
CosLoadBalancing::Location *
-TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Utilization_Monitor::the_location (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Location * location;
@@ -121,13 +121,12 @@ TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return location;
}
CosLoadBalancing::LoadList *
-TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Utilization_Monitor::loads (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Float load = 0;
@@ -145,7 +144,6 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
CosLoadBalancing::LoadList_var load_list = tmp;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index abfe60c3f23..52cd589b7b7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -37,13 +37,11 @@ TAO_LB_ClientComponent::register_orb_initializer (void)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
PortableInterceptor::ORBInitializer_var initializer = tmp;
PortableInterceptor::register_orb_initializer (initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 10ef40d2a54..664f0aa669b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -31,13 +31,11 @@ TAO_LB_ClientORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ClientRequestInterceptor_var client_interceptor = tmp;
info->add_client_request_interceptor (client_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index 870a88577d2..b6169e415f3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -18,7 +18,7 @@ TAO_LB_ClientRequestInterceptor::name (
}
void
-TAO_LB_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ClientRequestInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -31,8 +31,7 @@ TAO_LB_ClientRequestInterceptor::send_request (
PortableInterceptor::ForwardRequest))
{
/*
- CORBA::Object_var t = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Object_var t = ri->target ();
*/
// A ServiceContext with an empty payload (i.e. zero length
@@ -74,7 +73,6 @@ TAO_LB_ClientRequestInterceptor::send_request (
ri->add_request_service_context (service_context,
replace
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 124a845a989..19c5318134a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -68,10 +68,10 @@ public:
*/
//@{
/// Return the name of this ClientRequestInterceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_request (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 3e6d76a10aa..2f90d572291 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -113,13 +113,11 @@ TAO_LB_Component::register_orb_initializer (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
PortableInterceptor::ORBInitializer_var initializer = tmp;
PortableInterceptor::register_orb_initializer (initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 3f555d17a5c..51f6c4e2090 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -30,14 +30,14 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
}
char *
-TAO_LB_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_IORInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO_LB_IORInterceptor");
}
void
-TAO_LB_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_IORInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Force the LoadManager reference to be released since the ORB's
@@ -64,12 +64,10 @@ TAO_LB_IORInterceptor::components_established (
0,
this->orb_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Save a copy of the current ObjectReferenceFactory.
PortableInterceptor::ObjectReferenceFactory_var old_orf =
- info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ info->current_factory ();
PortableInterceptor::ObjectReferenceFactory * tmp;
ACE_NEW_THROW_EX (tmp,
@@ -84,13 +82,11 @@ TAO_LB_IORInterceptor::components_established (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ObjectReferenceFactory_var orf = tmp;
info->current_factory (orf.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -102,8 +98,7 @@ TAO_LB_IORInterceptor::adapter_manager_state_changed (
{
if (state == PortableInterceptor::ACTIVE)
{
- this->register_load_alert (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->register_load_alert ();
}
}
@@ -116,13 +111,12 @@ TAO_LB_IORInterceptor::adapter_state_changed (
{
if (state == PortableInterceptor::ACTIVE)
{
- this->register_load_alert (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->register_load_alert ();
}
}
void
-TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_IORInterceptor::register_load_alert (void)
{
{
ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
@@ -136,7 +130,7 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
// By now, the RootPOA has been fully initialized, so it is safe
// to activate the LoadAlert object.
CosLoadBalancing::LoadAlert_var la =
- this->load_alert_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->load_alert_._this ();
ACE_TRY_CHECK_EX (foo);
{
@@ -153,7 +147,6 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
"LoadAlert::_this()");
}
ACE_ENDTRY;
- ACE_CHECK;
ACE_TRY
{
@@ -164,7 +157,6 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
this->lm_->register_load_alert (location,
this->la_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosLoadBalancing::LoadAlertAlreadyPresent, ex)
{
@@ -183,7 +175,6 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY_THROW (CORBA::INTERNAL ());
}
ACE_ENDTRY;
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 6b93c951912..ded72a5e5f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -71,11 +71,11 @@ public:
*/
//@{
/// Return the name of this IORInterceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Cleanup resources acquired by this IORInterceptor.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Add the tagged components to the IOR.
@@ -112,7 +112,7 @@ public:
private:
/// Create and register the LoadAlert object with the LoadManager.
- void register_load_alert (ACE_ENV_SINGLE_ARG_DECL);
+ void register_load_alert (void);
private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 00c4fa6203d..cc06f8ac8d2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -53,14 +53,14 @@ TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void)
}
char *
-TAO_LB_LeastLoaded::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LeastLoaded::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("LeastLoaded");
}
CosLoadBalancing::Properties *
-TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LeastLoaded::get_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Properties * props = 0;
@@ -71,7 +71,6 @@ TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return props;
}
@@ -167,13 +166,11 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
CosLoadBalancing::LoadList_var loads =
load_manager->get_loads (the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->push_loads (the_location,
loads.in (),
loads[0]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return loads._retn ();
}
@@ -195,7 +192,6 @@ TAO_LB_LeastLoaded::next_member (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (locations->length () == 0)
ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -210,7 +206,6 @@ TAO_LB_LeastLoaded::next_member (
locations.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (found_location)
{
@@ -254,7 +249,6 @@ TAO_LB_LeastLoaded::analyze_loads (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (locations->length () == 0)
ACE_THROW (CORBA::TRANSIENT ());
@@ -275,14 +269,12 @@ TAO_LB_LeastLoaded::analyze_loads (
CosLoadBalancing::LoadList_var current_loads =
load_manager->get_loads (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::Load load;
this->push_loads (loc,
current_loads.in (),
load
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/*
ACE_DEBUG ((LM_DEBUG,
"EFFECTIVE_LOAD == %f\n"
@@ -313,7 +305,6 @@ TAO_LB_LeastLoaded::analyze_loads (
// LoadManager.
load_manager->enable_alert (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -321,7 +312,6 @@ TAO_LB_LeastLoaded::analyze_loads (
// shedding at given location.
load_manager->disable_alert (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -331,12 +321,11 @@ TAO_LB_LeastLoaded::analyze_loads (
// next location.
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
PortableServer::POA_ptr
-TAO_LB_LeastLoaded::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LeastLoaded::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
@@ -370,7 +359,6 @@ TAO_LB_LeastLoaded::get_location (
CosLoadBalancing::LoadList_var current_loads =
load_manager->get_loads (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
found_load = 1;
@@ -379,7 +367,6 @@ TAO_LB_LeastLoaded::get_location (
current_loads.in (),
load
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/*
ACE_DEBUG ((LM_DEBUG,
"LOC = %u"
@@ -496,7 +483,6 @@ TAO_LB_LeastLoaded::get_location (
// next location.
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
// ACE_DEBUG ((LM_DEBUG,
@@ -547,7 +533,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
this->extract_float_property (property,
critical_threshold
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ct = &property;
}
@@ -558,7 +543,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
this->extract_float_property (property,
reject_threshold
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else if (ACE_OS::strcmp (property.nam[0].id.in (),
@@ -567,7 +551,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
this->extract_float_property (property,
tolerance
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Valid tolerance values are greater than or equal to one.
if (tolerance < 1)
@@ -581,7 +564,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
this->extract_float_property (property,
dampening
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Dampening range is [0,1).
if (dampening < 0 || dampening >= 1)
@@ -595,7 +577,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
this->extract_float_property (property,
per_balance_load
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index a7843028c66..3c79ae6a5b8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -87,7 +87,7 @@ public:
* Methods required by the CosLoadBalancing::Strategy interface.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index a57212dbce6..56b62f8a780 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -22,7 +22,7 @@ TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
}
void
-TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert::enable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
@@ -31,7 +31,7 @@ TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_LB_LoadAlert::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert::disable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index f5345ef7f07..d4f2ecb6ddc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -43,11 +43,11 @@ public:
/// Forward requests back to the load manager via the object group
/// reference.
- virtual void enable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void enable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Stop forwarding requests, and begin accepting them again.
- virtual void disable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void disable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
@@ -64,7 +64,7 @@ public:
* reference counting.
*/
virtual ~TAO_LB_LoadAlert (void);
-
+
private:
/// Has this LoadAlert servant been alerted of a high load condition
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index ca2bf1b5116..f85bbc721fa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -14,7 +14,7 @@ TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
}
void
-TAO_LB_LoadAlert_Handler::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert_Handler::enable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -32,7 +32,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep (
}
void
-TAO_LB_LoadAlert_Handler::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert_Handler::disable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index d19518ce96d..15a7c1c7e30 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -43,7 +43,7 @@ class TAO_LB_LoadAlert_Handler
{
public:
- virtual void enable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void enable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void enable_alert_excep (
@@ -51,7 +51,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void disable_alert (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void disable_alert_excep (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index c6a0d0c3fa3..ab0d9693771 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -51,14 +51,14 @@ TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void)
}
char *
-TAO_LB_LoadAverage::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAverage::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("LoadAverage");
}
CosLoadBalancing::Properties *
-TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadAverage::get_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Properties * props = 0;
@@ -69,7 +69,6 @@ TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return props;
}
@@ -165,13 +164,11 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
CosLoadBalancing::LoadList_var loads =
load_manager->get_loads (the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->push_loads (the_location,
loads.in (),
loads[0]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return loads._retn ();
}
@@ -193,7 +190,6 @@ TAO_LB_LoadAverage::next_member (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (locations->length () == 0)
ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -221,7 +217,6 @@ TAO_LB_LoadAverage::analyze_loads (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (locations->length () == 0)
ACE_THROW (CORBA::TRANSIENT ());
@@ -248,14 +243,12 @@ TAO_LB_LoadAverage::analyze_loads (
CosLoadBalancing::LoadList_var current_loads =
load_manager->get_loads (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::Load load;
this->push_loads (loc,
current_loads.in (),
load
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// @@ Jai, please use the compound "+=" operator here. It
// is more efficient in this case.
@@ -275,7 +268,6 @@ TAO_LB_LoadAverage::analyze_loads (
//
}
ACE_ENDTRY;
- ACE_CHECK;
}
avg_load.value = total_load.value / len;
@@ -360,13 +352,12 @@ TAO_LB_LoadAverage::analyze_loads (
//
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
PortableServer::POA_ptr
-TAO_LB_LoadAverage::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAverage::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
@@ -389,7 +380,6 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
this->extract_float_property (property,
tolerance
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Valid tolerance values are greater than or equal to one.
if (tolerance < 1)
@@ -403,7 +393,6 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
this->extract_float_property (property,
dampening
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Dampening range is [0,1).
if (dampening < 0 || dampening >= 1)
@@ -417,7 +406,6 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
this->extract_float_property (property,
per_balance_load
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 4af286ee527..b2fb8a4d9f8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -69,7 +69,7 @@ public:
* Methods required by the CosLoadBalancing::Strategy interface.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 10b42090791..30fd71fe937 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -93,7 +93,6 @@ TAO_LB_LoadManager::push_loads (
PortableGroup::ObjectGroups_var groups =
this->object_group_manager_.groups_at_location (the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const CORBA::ULong len = groups->length ();
@@ -107,7 +106,6 @@ TAO_LB_LoadManager::push_loads (
PortableGroup::Properties_var properties =
this->get_properties (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableGroup::Value value;
CosLoadBalancing::Strategy_ptr strategy;
@@ -126,7 +124,6 @@ TAO_LB_LoadManager::push_loads (
strategy->analyze_loads (object_group,
this->lm_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -134,7 +131,6 @@ TAO_LB_LoadManager::push_loads (
// Ignore all exceptions.
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
@@ -152,7 +148,6 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
CosLoadBalancing::LoadList_var loads = tmp;
@@ -218,7 +213,6 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location
// member selection.
load_alert->sendc_enable_alert (this->load_alert_handler_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else
@@ -275,7 +269,6 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location
// member selection.
load_alert->sendc_disable_alert (this->load_alert_handler_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else
@@ -353,7 +346,6 @@ TAO_LB_LoadManager::remove_load_alert (
// object is no longer under the control of the LoadManager.
this->disable_alert (the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
@@ -491,7 +483,6 @@ TAO_LB_LoadManager::set_default_properties (
PortableGroup::Properties new_props (props);
this->preprocess_properties (new_props
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->property_manager_.set_default_properties (new_props
ACE_ENV_ARG_PARAMETER);
@@ -531,7 +522,6 @@ TAO_LB_LoadManager::set_type_properties (
PortableGroup::Properties new_overrides (overrides);
this->preprocess_properties (new_overrides
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->property_manager_.set_type_properties (type_id,
new_overrides
@@ -576,7 +566,6 @@ TAO_LB_LoadManager::set_properties_dynamically (
PortableGroup::Properties new_overrides (overrides);
this->preprocess_properties (new_overrides
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->property_manager_.set_properties_dynamically (object_group,
new_overrides
@@ -739,21 +728,18 @@ TAO_LB_LoadManager::create_object (
PortableGroup::InvalidProperty,
PortableGroup::CannotMeetCriteria))
{
-// this->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-// ACE_CHECK_RETURN (CORBA::Object::_nil ());
+// this->init ();
PortableGroup::Criteria new_criteria (the_criteria);
this->preprocess_properties (new_criteria
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CORBA::Object_ptr obj =
this->generic_factory_.create_object (type_id,
new_criteria,
factory_creation_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return obj;
@@ -837,7 +823,6 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
PortableGroup::Properties_var properties =
this->get_properties (object_group.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Prefer custom load balancing strategies over built-in ones.
PortableGroup::Value value;
@@ -886,7 +871,6 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableServer::ServantManager_var member_locator = tmp;
@@ -897,13 +881,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
root_poa->create_request_processing_policy (
PortableServer::USE_SERVANT_MANAGER
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::ServantRetentionPolicy_var retention =
root_poa->create_servant_retention_policy (
PortableServer::NON_RETAIN
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the PolicyList containing the policies necessary for
// the POA to support ServantLocators.
@@ -919,8 +901,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
// Create the child POA with the above ServantManager policies.
// The ServantManager will be the MemberLocator.
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa->the_POAManager ();
// The child POA's name will consist of a string that includes
// the current time in milliseconds in hexidecimal format (only
@@ -945,26 +926,21 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
poa_manager.in (),
policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ request->destroy ();
- retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ retention->destroy ();
// Now set the MemberLocator as the child POA's Servant
// Manager.
this->poa_->set_servant_manager (member_locator.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->object_group_manager_.poa (this->poa_.in ());
this->generic_factory_.poa (this->poa_.in ());
// Activate the child POA.
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
this->reactor_ = reactor;
this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
@@ -972,13 +948,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
if (CORBA::is_nil (this->lm_ref_.in ()))
{
- this->lm_ref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->lm_ref_ = this->_this ();
orb->register_initial_reference ("LoadManager",
this->lm_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (this->load_alert_handler_.in ()))
@@ -991,13 +965,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableServer::ServantBase_var safe_handler = handler;
this->load_alert_handler_ =
- handler->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ handler->_this ();
}
this->built_in_balancing_strategy_info_name_.length (1);
@@ -1044,7 +1016,6 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
CosLoadBalancing::Strategy_var strategy =
this->make_strategy (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (strategy.in ()))
{
@@ -1091,13 +1062,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (rr_servant,
TAO_LB_RoundRobin (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = rr_servant;
this->round_robin_ =
- rr_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+ rr_servant->_this ();
}
}
@@ -1118,13 +1087,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (rnd_servant,
TAO_LB_Random (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = rnd_servant;
this->random_ =
- rnd_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+ rnd_servant->_this ();
}
}
@@ -1152,13 +1119,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (ll_servant,
TAO_LB_LeastLoaded (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = ll_servant;
this->least_loaded_ =
- ll_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+ ll_servant->_this ();
}
}
@@ -1171,15 +1136,13 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (ll_servant,
TAO_LB_LeastLoaded (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = ll_servant;
ll_servant->init (info->props
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
- return ll_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return ll_servant->_this ();
}
}
else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0)
@@ -1199,13 +1162,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (lm_servant,
TAO_LB_LoadMinimum (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = lm_servant;
this->load_minimum_ =
- lm_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+ lm_servant->_this ();
}
}
@@ -1218,15 +1179,13 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (lm_servant,
TAO_LB_LoadMinimum (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = lm_servant;
lm_servant->init (info->props
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
- return lm_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return lm_servant->_this ();
}
}
else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0)
@@ -1246,13 +1205,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (la_servant,
TAO_LB_LoadAverage (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = la_servant;
this->load_average_ =
- la_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+ la_servant->_this ();
}
}
@@ -1265,15 +1222,13 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
ACE_NEW_THROW_EX (la_servant,
TAO_LB_LoadAverage (this->root_poa_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
PortableServer::ServantBase_var s = la_servant;
la_servant->init (info->props
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
- return la_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return la_servant->_this ();
}
}
return CosLoadBalancing::Strategy::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index b271606a0fb..c394e740d43 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -52,14 +52,14 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
}
char *
-TAO_LB_LoadMinimum::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("LoadMinimum");
}
CosLoadBalancing::Properties *
-TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadMinimum::get_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Properties * props = 0;
@@ -70,7 +70,6 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return props;
}
@@ -166,13 +165,11 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
CosLoadBalancing::LoadList_var loads =
load_manager->get_loads (the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->push_loads (the_location,
loads.in (),
loads[0]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return loads._retn ();
}
@@ -194,7 +191,6 @@ TAO_LB_LoadMinimum::next_member (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (locations->length () == 0)
ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -209,7 +205,6 @@ TAO_LB_LoadMinimum::next_member (
locations.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (found_location)
{
@@ -259,7 +254,6 @@ TAO_LB_LoadMinimum::analyze_loads (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (locations->length () == 0)
ACE_THROW (CORBA::TRANSIENT ());
@@ -288,14 +282,12 @@ TAO_LB_LoadMinimum::analyze_loads (
CosLoadBalancing::LoadList_var current_loads =
load_manager->get_loads (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::Load load;
this->push_loads (loc,
current_loads.in (),
load
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
total_load.value = total_load.value + load.value;
tmp[i] = load;
@@ -318,7 +310,6 @@ TAO_LB_LoadMinimum::analyze_loads (
//
}
ACE_ENDTRY;
- ACE_CHECK;
}
avg_load.value = total_load.value / len;
@@ -400,13 +391,12 @@ TAO_LB_LoadMinimum::analyze_loads (
//
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
PortableServer::POA_ptr
-TAO_LB_LoadMinimum::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
@@ -440,7 +430,6 @@ TAO_LB_LoadMinimum::get_location (
CosLoadBalancing::LoadList_var current_loads =
load_manager->get_loads (loc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
found_load = 1;
@@ -449,7 +438,6 @@ TAO_LB_LoadMinimum::get_location (
current_loads.in (),
load
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/*
ACE_DEBUG ((LM_DEBUG,
"LOC == %u"
@@ -555,7 +543,6 @@ TAO_LB_LoadMinimum::get_location (
// next location.
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
// ACE_DEBUG ((LM_DEBUG,
@@ -599,7 +586,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
this->extract_float_property (property,
tolerance
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Valid tolerance values are greater than or equal to one.
if (tolerance < 1)
@@ -613,7 +599,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
this->extract_float_property (property,
dampening
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Dampening range is [0,1).
if (dampening < 0 || dampening >= 1)
@@ -627,7 +612,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
this->extract_float_property (property,
per_balance_load
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index c979845aa0c..dd1cb712c76 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -88,7 +88,7 @@ public:
* Methods required by the CosLoadBalancing::Strategy interface.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 31c4e10977e..5cf5ab748b7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -32,7 +32,6 @@ TAO_LB_MemberLocator::preinvoke (
CORBA::Object_var member =
this->load_manager_->next_member (oid
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
// ACE_DEBUG ((LM_DEBUG,
@@ -56,7 +55,6 @@ TAO_LB_MemberLocator::preinvoke (
"LoadManager::next_member()");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index e7e7eeb4443..82fbebf223c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -41,15 +41,12 @@ TAO_LB_ORBInitializer::post_init (
CORBA::Object_var obj =
info->resolve_initial_references ("LoadManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosLoadBalancing::LoadManager_var lm =
CosLoadBalancing::LoadManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::String_var orbid = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var orbid = info->orb_id ();
PortableInterceptor::IORInterceptor_ptr tmp;
ACE_NEW_THROW_EX (tmp,
@@ -64,13 +61,11 @@ TAO_LB_ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::IORInterceptor_var ior_interceptor = tmp;
info->add_ior_interceptor (ior_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// ----------------
@@ -82,13 +77,11 @@ TAO_LB_ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var sr_interceptor = sri;
info->add_server_request_interceptor (sr_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 8898f4ff5c3..f8fdc8189aa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -68,7 +68,6 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
// Clean up all object groups we created.
this->lm_->delete_object (this->fcids_[i].in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -98,7 +97,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
this->old_orf_->make_object (repository_id,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableGroup::ObjectGroup_var object_group;
@@ -109,7 +107,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
index,
object_group.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (found_group)
{
@@ -124,7 +121,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
this->location_,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
{
@@ -158,7 +154,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
CORBA::Object::_nil ());
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
this->registered_members_[index] = 1;
}
@@ -209,7 +204,6 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
criteria,
fcid.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::ULong const len = this->fcids_.size ();
this->fcids_.size (len + 1); // Incremental growth. Yuck!
@@ -220,7 +214,6 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
group =
this->orb_->string_to_object (this->object_groups_[index]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
if (this->table_.bind (repository_id, group) != 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 5e8cdf226ec..53c9b33e1ae 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -54,13 +54,11 @@ TAO_LB_Pull_Handler::handle_timeout (
// LoadManager prevents nil load monitor references from
// being registered.
CosLoadBalancing::LoadList_var load_list =
- monitor->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ monitor->loads ();
this->load_manager_->push_loads (location,
load_list.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG,
// "LOCATION = %s\tLOAD = %f\n",
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 56c39655f2d..eac615d5efb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -28,14 +28,14 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
}
char *
-TAO_LB_Random::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_Random::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("Random");
}
CosLoadBalancing::Properties *
-TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_Random::get_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Properties * props = 0;
@@ -46,7 +46,6 @@ TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (props);
return props;
}
@@ -91,7 +90,6 @@ TAO_LB_Random::next_member (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return TAO_LB_Random::_tao_next_member (object_group,
load_manager,
@@ -109,7 +107,7 @@ TAO_LB_Random::analyze_loads (
}
PortableServer::POA_ptr
-TAO_LB_Random::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_Random::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index af5bea2b038..12d0ef5dac7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -50,7 +50,7 @@ public:
* Methods required by the CosLoadBalancing::Strategy interface.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index ab865f8020e..5acd2861bb1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -25,14 +25,14 @@ TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void)
}
char *
-TAO_LB_RoundRobin::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_RoundRobin::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("RoundRobin");
}
CosLoadBalancing::Properties *
-TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_RoundRobin::get_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// There are no RoundRobin properties. Return an empty property
@@ -46,7 +46,6 @@ TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (props);
return props;
}
@@ -91,7 +90,6 @@ TAO_LB_RoundRobin::next_member (
const PortableGroup::ObjectGroupId id =
load_manager->get_object_group_id (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
monitor,
@@ -106,7 +104,6 @@ TAO_LB_RoundRobin::next_member (
PortableGroup::Locations_var locations =
load_manager->locations_of_members (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
const CORBA::ULong len = locations->length ();
@@ -128,7 +125,6 @@ TAO_LB_RoundRobin::next_member (
load_manager->get_member_ref (object_group,
locations[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Increment index to point to next location.
i++;
@@ -163,7 +159,7 @@ TAO_LB_RoundRobin::analyze_loads (
}
PortableServer::POA_ptr
-TAO_LB_RoundRobin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_RoundRobin::_default_POA (void)
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index a96a1120223..712924ca4c6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -51,7 +51,7 @@ public:
* Methods required by the CosLoadBalancing::Strategy interface.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 10bb3303a39..75813c76a50 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -23,14 +23,14 @@ TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void)
}
char *
-TAO_LB_ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ServerRequestInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor");
}
void
-TAO_LB_ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ServerRequestInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -44,8 +44,7 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
{
if (this->load_alert_.alerted ())
{
- CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var op = ri->operation ();
if (ACE_OS::strcmp (op.in (), "_get_loads") == 0 // LoadMonitor
|| ACE_OS::strcmp (op.in (), "disable_alert") == 0 // LoadAlert
@@ -58,7 +57,6 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
IOP::ServiceContext_var service_context =
ri->get_request_service_context (CosLoadBalancing::LOAD_MANAGED
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/*
// Use TAO-specific "compiled marshaling" instead of
@@ -109,7 +107,6 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
#else
// Force the client to try another profile since this location
// is currently overloaded.
@@ -169,8 +166,7 @@ TAO_LB_ServerRequestInterceptor::send_other (
// LoadAlert object that its member is overloaded, for example.
const PortableInterceptor::ReplyStatus status =
- ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ri->reply_status ();
if (status == PortableInterceptor::LOCATION_FORWARD)
ACE_DEBUG ((LM_INFO,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index a3a94008a27..3330d8ddee0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -63,10 +63,10 @@ public:
* ServerRequestInterceptors.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index b8704fe0988..5353a4cb052 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -21,29 +21,24 @@ TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb,
ACE_ENV_ARG_DECL)
{
TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
PortableServer::ObjectId_var oid =
this->factory_poa_->activate_object (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
CORBA::Object_var obj =
this->factory_poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
// narrow and store the result..
this->log_mgr_ =
DsLogAdmin::LogMgr::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
DsLogAdmin::BasicLogFactory_var v_return =
DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
return v_return._retn ();
}
@@ -62,17 +57,14 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
0,
id_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
DsLogAdmin::LogId id = id_out;
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
#endif
// narrow to BasicLog
@@ -98,16 +90,13 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
max_size,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
#endif
// narrow to BasicLog
@@ -136,10 +125,8 @@ TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id
this->log_mgr_.in (),
id),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
- basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ basic_log_i->init ();
return basic_log_i;
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index fa4c1f0af22..e76571c0c1d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -32,17 +32,14 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id
DsLogAdmin::BasicLogFactory_var basicLogFactory =
DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
DsLogAdmin::BasicLog_var log =
basicLogFactory->create (DsLogAdmin::halt, 0, id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
// Copy the attributes from the log.
this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
@@ -55,39 +52,33 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
DsLogAdmin::BasicLogFactory_var basicLogFactory =
DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
DsLogAdmin::BasicLog_var log =
basicLogFactory->create_with_id (id, DsLogAdmin::halt, 0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
// Copy the attributes from the log.
this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
}
void
-TAO_BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_BasicLog_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Remove ourselves from the list of logs.
this->logmgr_i_.remove (this->logid_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Deregister with POA.
PortableServer::ObjectId_var id =
this->poa_->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->poa_->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index e1a51484192..df98a3dcc26 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -72,7 +72,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Destroy the log object and all contained records.
- void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 5e005ee70c6..f94861e8e70 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
: log_ (log)
-{
+{
}
TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void)
@@ -63,11 +63,10 @@ ACE_THROW_SPEC ((
//
// I have submitted a defect report to the OMG for clarification.
// --jtc
- ACE_TRY
+ ACE_TRY
{
// log the RecordList.
this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (DsLogAdmin::LogFull, ex)
{
@@ -89,12 +88,12 @@ ACE_THROW_SPEC ((
}
void
-TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Event_LogConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->supplier_proxy_->disconnect_push_supplier ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index fac7eb9bbb9..6ff0db91682 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -71,7 +71,7 @@ public:
private:
/// Disconnect from EventLog.
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ void disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 901af607cc1..a66770656f6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -18,18 +18,15 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
ACE_TRY
{
PortableServer::POA_var defPOA =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->_default_POA ();
TAO_CEC_EventChannel_Attributes attr (defPOA.in (), defPOA.in ());
ACE_NEW_THROW_EX (impl,
TAO_CEC_EventChannel (attr),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
- impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl->activate ();
}
ACE_CATCHANY
{
@@ -38,7 +35,6 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
"EventLogFactory_i constructor.");
}
ACE_ENDTRY;
- ACE_CHECK;
}
TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void)
@@ -59,18 +55,15 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */
PortableServer::ObjectId_var oid =
this->poa_->activate_object (ec.get ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ());
ec.release ();
CORBA::Object_var obj =
this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ());
ec_return =
CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ());
return ec_return._retn ();
}
@@ -81,41 +74,33 @@ TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb,
ACE_ENV_ARG_DECL)
{
TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
this->event_channel_ = init (this->poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
this->consumer_admin_ =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+ this->event_channel_->for_consumers ();
ACE_NEW_THROW_EX (this->notifier_,
TAO_EventLogNotification(this->event_channel_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
PortableServer::ObjectId_var oid =
this->factory_poa_->activate_object (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
CORBA::Object_var obj =
this->factory_poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
// narrow and store the result..
this->log_mgr_ =
DsLogAdmin::LogMgr::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
DsEventLogAdmin::EventLogFactory_var v_return =
DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
return v_return._retn ();
}
@@ -136,17 +121,14 @@ TAO_EventLogFactory_i::create (
& thresholds,
id_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
DsLogAdmin::LogId id = id_out;
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
#endif
// narrow to EventLog
@@ -155,7 +137,6 @@ TAO_EventLogFactory_i::create (
// @@ JTC - squelch exception?
notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
return event_log._retn();
}
@@ -177,16 +158,13 @@ TAO_EventLogFactory_i::create_with_id (
max_size,
& thresholds
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
#endif
// narrow to EventLog
@@ -195,7 +173,6 @@ TAO_EventLogFactory_i::create_with_id (
// @@ JTC - squelch exception?
notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
return event_log._retn ();
}
@@ -222,32 +199,29 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
id
),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
- event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ event_log_i->init ();
//dhanvey
//initialise the LogConsumer object
- event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ event_log_i->activate ();
return event_log_i;
}
CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EventLogFactory_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLogFactory_i::obtain_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->obtain_push_supplier ();
}
CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLogFactory_i::obtain_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->obtain_pull_supplier ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 130274497d7..0c6f3a27609 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -21,16 +21,16 @@ TAO_EventLogNotification::~TAO_EventLogNotification (void)
}
void
-TAO_EventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLogNotification::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->consumer_->disconnect_push_consumer ();
}
void
TAO_EventLogNotification::obtain_proxy_consumer()
-{
- CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
+{
+ CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
event_channel_->for_suppliers ();
consumer_ = supplier_admin->obtain_push_consumer ();
@@ -42,7 +42,7 @@ TAO_EventLogNotification::obtain_proxy_consumer()
}
void
-TAO_EventLogNotification::send_notification (const CORBA::Any& any
+TAO_EventLogNotification::send_notification (const CORBA::Any& any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index 88306c2eac7..cfb54245804 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -56,7 +56,7 @@ public:
~TAO_EventLogNotification (void);
/// The skeleton methods.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 6c6853cf891..bc0a85a9974 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -23,7 +23,7 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
ACE_DECLARE_NEW_CORBA_ENV;
// Create an instance of the event channel.
- TAO_CEC_EventChannel_Attributes attr (this->poa_.in(),
+ TAO_CEC_EventChannel_Attributes attr (this->poa_.in(),
this->poa_.in());
ACE_NEW_THROW_EX (this->event_channel_,
@@ -47,15 +47,12 @@ ACE_THROW_SPEC ((CORBA::SystemException))
DsEventLogAdmin::EventLogFactory_var eventLogFactory =
DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
DsEventLogAdmin::EventLog_var log =
eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
@@ -69,15 +66,12 @@ ACE_THROW_SPEC ((CORBA::SystemException))
DsEventLogAdmin::EventLogFactory_var eventLogFactory =
DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
DsEventLogAdmin::EventLog_var log =
eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
@@ -85,55 +79,49 @@ ACE_THROW_SPEC ((CORBA::SystemException))
void
-TAO_EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Send event to indicate the log has been deleted.
notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Remove ourselves from the list of logs.
this->logmgr_i_.remove (this->logid_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Deregister with POA.
PortableServer::ObjectId_var id =
this->log_poa_->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->log_poa_->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_EventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::activate (void)
{
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
// Create the PushConsumer that will log the events.
this->my_log_consumer_ = new TAO_Event_LogConsumer (this);
- ACE_CHECK;
this->my_log_consumer_->connect (consumer_admin.in ());
}
CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->for_consumers ();
}
CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->for_suppliers ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 545591ad31a..43f5f543dbd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -82,22 +82,22 @@ public:
/// Destroy the log object and all contained records.
void
- destroy (ACE_ENV_SINGLE_ARG_DECL)
+ destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Activate the EventLog.
void
- activate (ACE_ENV_SINGLE_ARG_DECL);
+ activate (void);
// = The CosEventChannelAdmin::EventChannel interface methods.
CosEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 0cf09c84c7b..19eb6da3148 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -45,7 +45,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
if (position < current_position_)
{
@@ -60,7 +59,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
// Use an Interpreter to build an expression tree.
TAO_Log_Constraint_Interpreter interpreter (constraint_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Sequentially iterate over all the records and pick the ones that
// meet the constraints.
@@ -70,7 +68,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
ACE_NEW_THROW_EX (rec_list,
DsLogAdmin::RecordList (how_many),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
rec_list->length (how_many);
CORBA::ULong count = 0;
@@ -101,8 +98,7 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
if (count == 0 && this->iter_ == this->iter_end_)
{
// destroy this object..
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (rec_list);
+ this->destroy ();
}
return rec_list;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index aa90c47cea0..ecfeb356013 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -93,25 +93,25 @@ TAO_Hash_LogRecordStore::close (void)
}
CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_current_size (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_current_size (void)
{
return this->current_size_;
}
CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_n_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_n_records (void)
{
return this->num_records_;
}
CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_gauge (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_gauge (void)
{
return this->gauge_;
}
void
-TAO_Hash_LogRecordStore::reset_gauge (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::reset_gauge (void)
{
this->gauge_ = 0;
}
@@ -224,7 +224,7 @@ TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter
}
int
-TAO_Hash_LogRecordStore::purge_old_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::purge_old_records (void)
{
CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U;
@@ -288,14 +288,12 @@ TAO_Hash_LogRecordStore::set_records_attribute (
DsLogAdmin::InvalidAttribute))
{
this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// TODO: validate attributes here.
// Use an Interpreter to build an expression tree.
TAO_Log_Constraint_Interpreter interpreter (constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Create iterators
LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -328,7 +326,6 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id
DsLogAdmin::LogRecord rec;
int retval = this->retrieve_i (id, rec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (retval == -1)
{
@@ -340,14 +337,13 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id
ACE_NEW_THROW_EX (nvlist,
DsLogAdmin::NVList (rec.attr_list),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return nvlist;
}
int
-TAO_Hash_LogRecordStore::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Hash_LogRecordStore::flush (void)
{
return 0;
}
@@ -386,7 +382,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
// Use an Interpreter to build an expression tree.
TAO_Log_Constraint_Interpreter interpreter (constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Sequentially iterate over all the records and pick the ones that
// meet the constraints.
@@ -396,7 +391,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
ACE_NEW_THROW_EX (rec_list,
DsLogAdmin::RecordList (how_many),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
rec_list->length(how_many);
// Create iterators
@@ -448,7 +442,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
constraint,
this->max_rec_list_len_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (rec_list);
// Transfer ownership to the POA.
PortableServer::ServantBase_var safe_iter_query = iter_query;
@@ -476,7 +469,6 @@ TAO_Hash_LogRecordStore::query (const char *grammar,
DsLogAdmin::InvalidConstraint))
{
this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return this->query_i (constraint,
iter_out,
@@ -528,12 +520,10 @@ TAO_Hash_LogRecordStore::match (const char* grammar,
DsLogAdmin::InvalidConstraint))
{
this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Use an Interpreter to build an expression tree.
TAO_Log_Constraint_Interpreter interpreter (constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Create iterators
LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -565,12 +555,10 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar,
DsLogAdmin::InvalidConstraint))
{
this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Use an Interpreter to build an expression tree.
TAO_Log_Constraint_Interpreter interpreter (constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Create iterators
LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -617,7 +605,7 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i
}
CORBA::ULong
-TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::remove_old_records (void)
{
if (this->max_record_life_ == 0) {
return 0;
@@ -639,7 +627,6 @@ TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
// Use an Interpreter to build an expression tree.
TAO_Log_Constraint_Interpreter interpreter (out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Create iterators
LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -689,7 +676,7 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar
DsLogAdmin::AdministrativeState
-TAO_Hash_LogRecordStore::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_administrative_state (void) const
{
return this->admin_state_;
}
@@ -703,13 +690,12 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta
DsLogAdmin::CapacityAlarmThresholdList*
-TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const
{
DsLogAdmin::CapacityAlarmThresholdList* ret_val;
ACE_NEW_THROW_EX (ret_val,
DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return ret_val;
}
@@ -724,7 +710,7 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci
DsLogAdmin::ForwardingState
-TAO_Hash_LogRecordStore::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_forwarding_state (void) const
{
return this->forward_state_;
}
@@ -737,7 +723,7 @@ TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state
}
DsLogAdmin::TimeInterval
-TAO_Hash_LogRecordStore::get_interval (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_interval (void) const
{
return this->interval_;
}
@@ -751,7 +737,7 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval
DsLogAdmin::LogFullActionType
-TAO_Hash_LogRecordStore::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_log_full_action (void) const
{
return this->log_full_action_;
}
@@ -764,13 +750,12 @@ TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType acti
}
DsLogAdmin::QoSList *
-TAO_Hash_LogRecordStore::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_log_qos (void) const
{
DsLogAdmin::QoSList* ret_val = 0;
ACE_NEW_THROW_EX (ret_val,
DsLogAdmin::QoSList (this->log_qos_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return ret_val;
}
@@ -783,7 +768,7 @@ TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos
}
CORBA::ULong
-TAO_Hash_LogRecordStore::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_max_record_life (void) const
{
return this->max_record_life_;
}
@@ -796,7 +781,7 @@ TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life
}
CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_max_size (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_max_size (void) const
{
return this->max_size_;
}
@@ -809,13 +794,12 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size
}
DsLogAdmin::WeekMask*
-TAO_Hash_LogRecordStore::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_week_mask (void)
{
DsLogAdmin::WeekMask* ret_val = 0;
ACE_NEW_THROW_EX (ret_val,
DsLogAdmin::WeekMask (this->weekmask_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return ret_val;
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index d4518fd3825..b570f667d12 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -87,7 +87,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Gets the administrative state of the log
virtual DsLogAdmin::AdministrativeState
- get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_administrative_state (void) const;
/// Sets the administrative state of the log
virtual void
@@ -96,7 +96,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Get the capacity alarm thresholds
virtual DsLogAdmin::CapacityAlarmThresholdList*
- get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_capacity_alarm_thresholds (void) const;
/// Set the capacity alarm thresholds
virtual void
@@ -105,7 +105,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Gets the forwarding state
virtual DsLogAdmin::ForwardingState
- get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_forwarding_state (void) const;
/// Sets the forwarding state
virtual void
@@ -114,7 +114,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Get the log duration
virtual DsLogAdmin::TimeInterval
- get_interval (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_interval (void) const;
/// Set the log duration.
virtual void
@@ -123,7 +123,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Gets the log full action
virtual DsLogAdmin::LogFullActionType
- get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_log_full_action (void) const;
/// Sets the log full action
virtual void
@@ -132,7 +132,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Get the list of the QoS properties supported by the log.
virtual DsLogAdmin::QoSList*
- get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_log_qos (void) const;
/// Set the list of the QoS properties supported by the log.
virtual void
@@ -141,7 +141,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Gets the max record life
virtual CORBA::ULong
- get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_max_record_life (void) const;
/// Sets the max record life
virtual void
@@ -150,44 +150,44 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Get the current set value of the max size of the log data.
virtual CORBA::ULongLong
- get_max_size (ACE_ENV_SINGLE_ARG_DECL) const;
+ get_max_size (void) const;
/// Set the max size of log data. size == 0, => infinite.
virtual void
set_max_size (CORBA::ULongLong size
ACE_ENV_ARG_DECL);
-
+
/// Get the weekly scheduling parameters
virtual DsLogAdmin::WeekMask*
- get_week_mask (ACE_ENV_SINGLE_ARG_DECL);
-
+ get_week_mask (void);
+
/// Set the weekly scheduling parameters.
virtual void
set_week_mask (const DsLogAdmin::WeekMask & masks
ACE_ENV_ARG_DECL);
-
+
// = LogRecordStore status methods
/// Gets the current size of the log data.
virtual CORBA::ULongLong
- get_current_size (ACE_ENV_SINGLE_ARG_DECL);
+ get_current_size (void);
/// Get the number of records in the log right now.
virtual CORBA::ULongLong
- get_n_records (ACE_ENV_SINGLE_ARG_DECL);
+ get_n_records (void);
// = LogRecordStore gauge
-
+
/// Gets the current value of the "gauge" that measures the total
/// size of the records written to the log.
virtual CORBA::ULongLong
- get_gauge(ACE_ENV_SINGLE_ARG_DECL);
+ get_gauge(void);
/// Resets the "gauge" to 0
virtual void
- reset_gauge(ACE_ENV_SINGLE_ARG_DECL);
+ reset_gauge(void);
// = Record logging, retrieval, update and removal methods.
@@ -199,7 +199,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Deletes "old" records from the store.
virtual int
- purge_old_records (ACE_ENV_SINGLE_ARG_DECL);
+ purge_old_records (void);
/// Set single record attributes.
virtual void
@@ -233,7 +233,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
/// Ensure changes have been flushed to persistent media
/// Returns 0 on success, -1 on failure.
virtual int
- flush (ACE_ENV_SINGLE_ARG_DECL);
+ flush (void);
/// Returns all records in the log that match the given constraint
/// <c>.
@@ -280,8 +280,8 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::ULong
- remove_old_records (ACE_ENV_SINGLE_ARG_DECL);
-
+ remove_old_records (void);
+
/// Read-Write Lock
virtual ACE_SYNCH_RW_MUTEX& lock();
@@ -310,7 +310,7 @@ protected:
/// Returns 0 on success, -1 on failure.
int remove_i (DsLogAdmin::RecordId id
ACE_ENV_ARG_DECL);
-
+
/// Remove the record from the LogRecordStore.
void remove_i (LOG_RECORD_STORE_ITER iter
ACE_ENV_ARG_DECL);
@@ -384,7 +384,7 @@ protected:
/// The days of the week that the log should be operational
DsLogAdmin::WeekMask weekmask_;
-
+
ACE_Reactor* reactor_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 458cfca4155..f7dc9d0419f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -22,7 +22,7 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore()
DsLogAdmin::LogList*
-TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogStore::list_logs (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -31,7 +31,6 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
DsLogAdmin::LogList* list;
@@ -42,7 +41,6 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (list,
DsLogAdmin::LogList (len),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
list->length (len);
@@ -64,7 +62,7 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
}
DsLogAdmin::LogIdList*
-TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogStore::list_logs_by_id (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -73,7 +71,6 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
DsLogAdmin::LogIdList* list;
@@ -84,7 +81,6 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (list,
DsLogAdmin::LogIdList (len),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
list->length (len);
@@ -137,7 +133,6 @@ TAO_Hash_LogStore::exists (DsLogAdmin::LogId id
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (false);
return (this->hash_map_.find (id) == 0);
}
@@ -151,14 +146,13 @@ TAO_Hash_LogStore::remove (DsLogAdmin::LogId id
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (-1);
TAO_Hash_LogRecordStore* recordstore;
int retval = this->hash_map_.unbind (id, recordstore);
- if (retval == 0)
+ if (retval == 0)
{
- delete recordstore;
+ delete recordstore;
}
return retval;
@@ -176,7 +170,6 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
DsLogAdmin::LogId id;
@@ -193,7 +186,6 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
thresholds
),
CORBA::NO_MEMORY ());
- ACE_CHECK;
auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
@@ -217,7 +209,6 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
if (this->hash_map_.find (id) == 0)
{
@@ -233,7 +224,6 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
thresholds
),
CORBA::NO_MEMORY ());
- ACE_CHECK;
auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
@@ -254,7 +244,6 @@ TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id
guard,
lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
TAO_Hash_LogRecordStore* recordstore = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index 7c43c34a8a7..af4b79881c3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -53,14 +53,14 @@ public:
/// Lists all logs created by the log factory.
virtual DsLogAdmin::LogList *
- list_logs (ACE_ENV_SINGLE_ARG_DECL)
+ list_logs (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
/// Lists all log ids.
virtual DsLogAdmin::LogIdList *
- list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+ list_logs_by_id (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 139e85e262c..2e999252b50 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -16,9 +16,9 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa,
: poa_ (PortableServer::POA::_duplicate (poa)),
reactor_ (reactor)
{
- if (this->timeout_ != ACE_Time_Value::zero)
+ if (this->timeout_ != ACE_Time_Value::zero)
{
- this->timer_id_ =
+ this->timer_id_ =
this->reactor_->schedule_timer (this, 0, this->timeout_);
}
}
@@ -29,24 +29,22 @@ TAO_Iterator_i::~TAO_Iterator_i (void)
// cancel timer
if (this->timer_id_ != -1)
{
- this->reactor_->cancel_timer (this->timer_id_);
+ this->reactor_->cancel_timer (this->timer_id_);
}
}
void
-TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Iterator_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ObjectId_var oid =
this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Goodbye cruel world...
// deactivate from the poa.
this->poa_->deactivate_object (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return;
}
@@ -56,8 +54,7 @@ TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*)
{
ACE_TRY_NEW_ENV
{
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 84042063697..303c6163e59 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -43,7 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
*
* @brief Iterator to get LogRecords for the log via a query.
*/
-class TAO_Log_Serv_Export TAO_Iterator_i
+class TAO_Log_Serv_Export TAO_Iterator_i
: public virtual POA_DsLogAdmin::Iterator,
public ACE_Event_Handler
{
@@ -65,7 +65,7 @@ public:
DsLogAdmin::InvalidParam)) = 0;
/// This destroys the iterator.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
@@ -77,10 +77,10 @@ protected:
/// Timeout
static ACE_Time_Value timeout_;
-
+
/// Timer ID
long timer_id_;
-
+
virtual int handle_timeout (const ACE_Time_Value&, const void *);
};
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index a5f60cf3c05..02bfbb96fac 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -32,7 +32,6 @@ TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
if (!logmgr_i_.exists(id ACE_ENV_ARG_PARAMETER))
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
- ACE_CHECK_RETURN(0);
return logmgr_i_.create_log_servant (id ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 199e5154fa8..5b03a1d8640 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -34,8 +34,7 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
this->poa_ = PortableServer::POA::_duplicate (poa);
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->poa_->the_POAManager ();
{
TAO::Utils::PolicyList_Destroyer policies(1);
@@ -45,13 +44,11 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
policies[0] =
this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->factory_poa_ = this->poa_->create_POA ("factory_POA",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -63,31 +60,26 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
policies[0] =
this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policies[1] =
this->poa_->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
policies.length(4);
policies[2] =
this->poa_->create_servant_retention_policy (PortableServer::RETAIN
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policies[3] =
this->poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif
this->log_poa_ = this->factory_poa_->create_POA ("log_POA",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
@@ -99,7 +91,6 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
this->log_poa_->set_servant_manager(servant_activator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif
// Load Log Strategy
@@ -140,14 +131,12 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
this->log_poa_->create_reference_with_id (oid.in (),
intf.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
// Use _unchecked_narrow() because this may be called from a servant
// activator's incarnate() method. A plain _narrow() will result in
// infinate recursion.
DsLogAdmin::Log_var log =
DsLogAdmin::Log::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn();
}
@@ -159,7 +148,6 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id
PortableServer::ServantBase* servant = 0;
servant = create_log_servant (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
PortableServer::ServantBase_var safe_servant = servant;
// Transfer ownership to the POA.
@@ -171,28 +159,27 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id
this->log_poa_->activate_object_with_id (oid.in (),
servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return create_log_reference (id ACE_ENV_ARG_PARAMETER);
}
DsLogAdmin::LogList*
-TAO_LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LogMgr_i::list_logs (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->logstore_->list_logs (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->logstore_->list_logs ();
}
DsLogAdmin::LogIdList*
-TAO_LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LogMgr_i::list_logs_by_id (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->logstore_->list_logs_by_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->logstore_->list_logs_by_id ();
}
@@ -241,7 +228,7 @@ TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action,
if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt)
ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
- if (thresholds)
+ if (thresholds)
{
// @@ JTC - validate thresholds here
}
@@ -251,7 +238,6 @@ TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action,
thresholds,
id_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -265,7 +251,7 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt)
ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
- if (thresholds)
+ if (thresholds)
{
// @@ JTC - validate thresholds here
}
@@ -275,7 +261,6 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
max_size,
thresholds
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CORBA::ORB_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index a75417898c8..4f85f5d0125 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -52,14 +52,14 @@ public:
/// Lists all log object references.
DsLogAdmin::LogList *
- list_logs (ACE_ENV_SINGLE_ARG_DECL)
+ list_logs (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
/// Lists all log ids.
DsLogAdmin::LogIdList *
- list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+ list_logs_by_id (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -75,7 +75,7 @@ public:
/// Returns true if log exists, otherwise false
bool exists (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL);
-
+
/// Remove the given entry from the container.
int remove (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL);
@@ -88,7 +88,7 @@ public:
///
/// @return object id
///
- virtual PortableServer::ObjectId*
+ virtual PortableServer::ObjectId*
create_objectid (DsLogAdmin::LogId id);
/// @brief Create log reference
@@ -99,7 +99,7 @@ public:
///
/// @return object reference
///
- virtual DsLogAdmin::Log_ptr
+ virtual DsLogAdmin::Log_ptr
create_log_reference (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL);
@@ -111,7 +111,7 @@ public:
///
/// @return object reference
///
- virtual DsLogAdmin::Log_ptr
+ virtual DsLogAdmin::Log_ptr
create_log_object (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL);
@@ -134,8 +134,8 @@ public:
virtual PortableServer::ServantBase*
create_log_servant (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL) = 0;
-
- /// @brief Get log record store
+
+ /// @brief Get log record store
///
/// Get/Create a log record store for log channel @a id.
///
@@ -156,7 +156,7 @@ protected:
///
/// Creates factory and log channel POAs, and obtains the LogStore
/// from a dynamically loaded Log_Persistence_Strategy (if one was
- /// specified in the service config file, otherwise the default
+ /// specified in the service config file, otherwise the default
/// Hash_Persistence_Strategy is used.)
///
/// @param orb ORB
@@ -179,7 +179,7 @@ protected:
CORBA::ULongLong max_size,
const DsLogAdmin::CapacityAlarmThresholdList* thresholds
ACE_ENV_ARG_DECL);
-
+
/// ORB.
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index e7f422dd36b..49ffdd604fa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -40,7 +40,6 @@ TAO_LogNotification::object_creation (DsLogAdmin::LogId id
this->send_notification (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -64,7 +63,6 @@ TAO_LogNotification::object_deletion (DsLogAdmin::LogId id
this->send_notification (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -83,7 +81,6 @@ TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num,
this->send_notification (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -116,7 +113,6 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
this->send_notification (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -138,7 +134,6 @@ TAO_LogNotification::capacity_alarm_threshold_value_change (
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -159,7 +154,6 @@ TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log,
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -180,7 +174,6 @@ TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log,
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -201,7 +194,6 @@ TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log,
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -222,7 +214,6 @@ TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log,
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -243,7 +234,6 @@ TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log,
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -264,7 +254,6 @@ TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log,
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -286,7 +275,6 @@ TAO_LogNotification::quality_of_service_value_change (
oldV,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -317,7 +305,6 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
this->send_notification (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -336,7 +323,6 @@ TAO_LogNotification::administrative_state_change (
DsLogNotification::administrativeState,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -355,7 +341,6 @@ TAO_LogNotification::operational_state_change (
DsLogNotification::operationalState,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -373,7 +358,6 @@ TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
DsLogNotification::forwardingState,
newV
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -405,7 +389,6 @@ TAO_LogNotification::threshold_alarm (
this->send_notification (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 4e630b0ea46..a0d84000b77 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -50,12 +50,12 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Close the record store.
virtual int close (void) = 0;
-
+
// = Log Parameters
/// Gets the administrative state of the log
virtual DsLogAdmin::AdministrativeState
- get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+ get_administrative_state (void) const = 0;
/// Sets the administrative state of the log
virtual void
@@ -64,7 +64,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Get the capacity alarm thresholds
virtual DsLogAdmin::CapacityAlarmThresholdList*
- get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+ get_capacity_alarm_thresholds (void) const = 0;
/// Set the capacity alarm thresholds
virtual void
@@ -73,8 +73,8 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Gets the forwarding state
virtual DsLogAdmin::ForwardingState
- get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
+ get_forwarding_state (void) const = 0;
+
/// Sets the forwarding state
virtual void
set_forwarding_state (DsLogAdmin::ForwardingState state
@@ -82,17 +82,17 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Get the log duration
virtual DsLogAdmin::TimeInterval
- get_interval (ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
+ get_interval (void) const = 0;
+
/// Set the log duration.
virtual void
set_interval (const DsLogAdmin::TimeInterval& interval
ACE_ENV_ARG_DECL) = 0;
-
+
/// Get the log full action
virtual DsLogAdmin::LogFullActionType
- get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
+ get_log_full_action (void) const = 0;
+
/// Set the log full action
virtual void
set_log_full_action(DsLogAdmin::LogFullActionType action
@@ -100,7 +100,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Get the list of the QoS properties supported by the log.
virtual DsLogAdmin::QoSList*
- get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+ get_log_qos (void) const = 0;
/// Set the list of the QoS properties supported by the log.
virtual void
@@ -109,7 +109,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Gets the max record life
virtual CORBA::ULong
- get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+ get_max_record_life (void) const = 0;
/// Sets the max record life
virtual void
@@ -118,7 +118,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Get the current set value of the max size of the log data.
virtual CORBA::ULongLong
- get_max_size (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+ get_max_size (void) const = 0;
/// Set the max size of log data. size == 0, => infinite.
virtual void
@@ -127,47 +127,47 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Get the weekly scheduling parameters
virtual DsLogAdmin::WeekMask*
- get_week_mask (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
+ get_week_mask (void) = 0;
+
/// Set the weekly scheduling parameters.
virtual void
set_week_mask (const DsLogAdmin::WeekMask& masks
ACE_ENV_ARG_DECL) = 0;
-
+
// = LogRecordStore status methods
/// Gets the current size of the log data.
virtual CORBA::ULongLong
- get_current_size (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ get_current_size (void) = 0;
/// Get the number of records in the log right now.
virtual CORBA::ULongLong
- get_n_records (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ get_n_records (void) = 0;
// = LogRecordStore gauge
-
+
/// Gets the current value of the "gauge" that measures the total
/// size of the records written to the log.
virtual CORBA::ULongLong
- get_gauge(ACE_ENV_SINGLE_ARG_DECL) = 0;
+ get_gauge(void) = 0;
/// Resets the "gauge" to 0
virtual void
- reset_gauge(ACE_ENV_SINGLE_ARG_DECL) = 0;
+ reset_gauge(void) = 0;
// = Record logging, retrieval, update and removal methods.
- /// Insert rec into storage.
+ /// Insert rec into storage.
/// Returns 0 on success -1 on failure and 1 if the log is full.
virtual int
log (const DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL) = 0;
/// Deletes "old" records from the store.
virtual int
- purge_old_records (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ purge_old_records (void) = 0;
/// Set single record attributes.
virtual void
@@ -201,7 +201,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
/// Ensure changes have been flushed to persistent media
/// Returns 0 on success, -1 on failure
virtual int
- flush (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ flush (void) = 0;
/// Returns all records in the log that match the given constraint
@@ -250,16 +250,16 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
virtual CORBA::ULong
- remove_old_records (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ remove_old_records (void) = 0;
/// Read-Write Lock
virtual ACE_SYNCH_RW_MUTEX& lock() = 0;
-
+
protected:
/// Constructor.
TAO_LogRecordStore (void);
-
+
private:
};
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
index 78773abffb9..5e62df949d5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -37,14 +37,14 @@ public:
/// Lists all logs created by the log factory.
virtual DsLogAdmin::LogList *
- list_logs (ACE_ENV_SINGLE_ARG_DECL)
+ list_logs (void)
ACE_THROW_SPEC ((
CORBA::SystemException
)) = 0;
/// Lists all log ids.
virtual DsLogAdmin::LogIdList *
- list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+ list_logs_by_id (void)
ACE_THROW_SPEC ((
CORBA::SystemException
)) = 0;
@@ -58,12 +58,12 @@ public:
)) = 0;
/// Returns true if log exists, otherwise false
- virtual bool
+ virtual bool
exists (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL) = 0;
/// Remove the given entry from the hash table.
- virtual int
+ virtual int
remove (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL) = 0;
@@ -76,14 +76,14 @@ public:
ACE_ENV_ARG_DECL) = 0;
/// @brief Create log
- virtual void
+ virtual void
create_with_id (DsLogAdmin::LogId id,
DsLogAdmin::LogFullActionType full_action,
CORBA::ULongLong max_size,
const DsLogAdmin::CapacityAlarmThresholdList* thresholds
ACE_ENV_ARG_DECL) = 0;
- /// @brief Get log record store
+ /// @brief Get log record store
///
/// Get/Create a log record store for log channel @a id.
///
@@ -94,7 +94,7 @@ public:
ACE_ENV_ARG_DECL) = 0;
protected:
- // Constructor
+ // Constructor
TAO_LogStore() {}
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index d153bbe2714..ab9f366a6bb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -52,14 +52,13 @@ TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&,
{
ACE_TRY_NEW_ENV
{
- this->log_->remove_old_records(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->log_->remove_old_records();
}
ACE_CATCHANY
{
}
ACE_ENDTRY;
-
+
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index e741de09004..6281d19c48d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -21,10 +21,9 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
ACE_NEW_THROW_EX (this->root_,
TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 1),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
else
- {
+ {
// root_ is set in this base class call.
if (TAO_ETCL_Interpreter::build_tree (constraints) != 0)
ACE_THROW (DsLogAdmin::InvalidConstraint ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 6c8b55d4d88..127f17c5b86 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -144,7 +144,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
TAO_DynUnion_i dyn_union;
dyn_union.init (this->current_member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::TypeCode_var tc = this->current_member_->type ();
@@ -156,12 +155,10 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
{
CORBA::Any disc_any;
CORBA::TypeCode_var disc_tc =
- tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tc->discriminator_type ();
CORBA::TCKind disc_kind =
TAO_DynAnyFactory::unalias (disc_tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
switch (disc_kind)
{
@@ -213,18 +210,14 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
disc_tc.in (),
disc_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
dyn_union.set_discriminator (dyn_any.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var u_member =
- dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_union.member ();
this->current_member_ =
- u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ u_member->to_any ();
break;
}
@@ -232,8 +225,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
{
const char *name = (const char *) disc_val;
CORBA::ULong count =
- tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tc->member_count ();
const char *member_name = 0;
CORBA::ULong i = 0;
@@ -242,7 +234,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
{
member_name = tc->member_name (i
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ACE_OS::strcmp (name, member_name) == 0)
{
@@ -255,7 +246,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
// return -1;
this->current_member_ = tc->member_label (i
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
@@ -292,7 +282,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
int
@@ -306,7 +295,6 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
CORBA::TypeCode_var tc = this->current_member_->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var member;
CORBA::Boolean success = 0;
@@ -319,11 +307,9 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
TAO_DynEnum_i dyn_enum;
dyn_enum.init (this->current_member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_enum.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
{
@@ -331,8 +317,7 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
}
member =
- dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_enum.current_component ();
break;
}
@@ -341,19 +326,16 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
TAO_DynStruct_i dyn_struct;
dyn_struct.init (this->current_member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_struct.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
{
return -1;
}
- member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ member = dyn_struct.current_component ();
break;
}
@@ -364,8 +346,7 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
return -1;
}
- CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var value = member->to_any ();
TAO_ETCL_Constraint *comp = pos->component ();
@@ -386,7 +367,6 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
int
@@ -444,7 +424,6 @@ TAO_Log_Constraint_Visitor::visit_component_array (
CORBA::TypeCode_var tc = this->current_member_->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var member;
CORBA::Boolean success = 0;
@@ -457,19 +436,16 @@ TAO_Log_Constraint_Visitor::visit_component_array (
TAO_DynEnum_i dyn_array;
dyn_array.init (this->current_member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_array.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
{
return -1;
}
- member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ member = dyn_array.current_component ();
break;
}
@@ -478,11 +454,9 @@ TAO_Log_Constraint_Visitor::visit_component_array (
TAO_DynStruct_i dyn_sequence;
dyn_sequence.init (this->current_member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_sequence.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
{
@@ -490,8 +464,7 @@ TAO_Log_Constraint_Visitor::visit_component_array (
}
member =
- dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_sequence.current_component ();
break;
}
@@ -501,8 +474,7 @@ TAO_Log_Constraint_Visitor::visit_component_array (
return -1;
}
- CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var value = member->to_any ();
TAO_ETCL_Constraint *comp = array->component ();
@@ -523,7 +495,6 @@ TAO_Log_Constraint_Visitor::visit_component_array (
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
int
@@ -541,8 +512,7 @@ TAO_Log_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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::ULong length = tc->length ();
TAO_ETCL_Literal_Constraint lit (length);
this->queue_.enqueue_head (lit);
@@ -556,14 +526,11 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
TAO_DynUnion_i dyn_union;
dyn_union.init (this->current_member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var disc =
- dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_union.get_discriminator ();
- CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var disc_any = disc->to_any ();
TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
this->queue_.enqueue_head (lit);
@@ -571,8 +538,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
}
case TAO_ETCL_TYPE_ID:
{
- const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ const char *name = tc->name ();
TAO_ETCL_Literal_Constraint lit (name);
this->queue_.enqueue_head (lit);
@@ -580,8 +546,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
}
case TAO_ETCL_REPOS_ID:
{
- const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ const char *id = tc->id ();
TAO_ETCL_Literal_Constraint lit (id);
this->queue_.enqueue_head (lit);
@@ -596,7 +561,6 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
int
@@ -669,8 +633,7 @@ TAO_Log_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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Long default_index = tc->default_index ();
// No default index.
if (default_index == -1)
@@ -692,7 +655,6 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
int
@@ -1017,14 +979,12 @@ TAO_Log_Constraint_Visitor::visit_in (
CORBA::TypeCode_var tc = component->type ();
kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
return return_value;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (return_value);
CORBA::Boolean result = 0;
@@ -1087,7 +1047,6 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
CORBA::TypeCode_var type = any->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the array elements must be
// of the same simple type.
@@ -1102,11 +1061,9 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
TAO_DynSequence_i dyn_seq;
dyn_seq.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::AnySeq_var any_seq =
- dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_seq.get_elements ();
CORBA::ULong length = any_seq->length ();
@@ -1125,7 +1082,6 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -1142,7 +1098,6 @@ TAO_Log_Constraint_Visitor::array_does_contain (
CORBA::TypeCode_var type = any->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the array elements must be
// of the same simple type.
@@ -1157,11 +1112,9 @@ TAO_Log_Constraint_Visitor::array_does_contain (
TAO_DynArray_i dyn_array;
dyn_array.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::AnySeq_var any_seq =
- dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_array.get_elements ();
CORBA::ULong length = any_seq->length ();
@@ -1180,7 +1133,6 @@ TAO_Log_Constraint_Visitor::array_does_contain (
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -1197,11 +1149,9 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
TAO_DynStruct_i dyn_struct;
dyn_struct.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::NameValuePairSeq_var members =
- dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_struct.get_members ();
CORBA::ULong length = members->length ();
CORBA::TypeCode_var tc;
@@ -1212,7 +1162,6 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
tc = members[i].value.type ();
kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the struct member must be
// of the same simple type.
@@ -1237,7 +1186,6 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -1254,19 +1202,15 @@ TAO_Log_Constraint_Visitor::union_does_contain (
TAO_DynUnion_i dyn_union;
dyn_union.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var cc =
- dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_union.current_component ();
- CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var member = cc->to_any ();
CORBA::TypeCode_var tc = member->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the union member must be
// of the same simple type.
@@ -1287,7 +1231,6 @@ TAO_Log_Constraint_Visitor::union_does_contain (
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index 122d35c486c..cc058cb2e49 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -45,14 +45,13 @@ TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *)
{
ACE_TRY_NEW_ENV
{
- log_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ log_->flush ();
}
ACE_CATCHANY
{
}
ACE_ENDTRY;
-
+
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 4cbbd3b86b2..3503452940a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -43,34 +43,29 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
}
void
-TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::init (void)
{
this->log_ =
logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->recordstore_ =
logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->recordstore_->open () ==-1)
ACE_THROW (CORBA::UNKNOWN ());
// fetch the capacity alarm thresholds from the log record store
DsLogAdmin::CapacityAlarmThresholdList_var thresholds =
- this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_capacity_alarm_thresholds ();
// initialize the internal representation
this->thresholds_ = thresholds.in ();
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->reset_capacity_alarm_threshold ();
// fetch the log QoS from the log record store
DsLogAdmin::QoSList_var qos =
- this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_log_qos ();
// initialize the internal representation.
this->reset_log_qos (qos.in ());
@@ -78,18 +73,15 @@ TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
// fetch the week mask from the log record store
DsLogAdmin::WeekMask_var week_mask =
- this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_week_mask ();
// initialize the internal representation
this->reset_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// fetch the maximum record life from the log record store
CORBA::ULong max_record_life =
- this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_max_record_life ();
// if set, activate the compaction handler
if (max_record_life != 0)
@@ -105,28 +97,27 @@ TAO_Log_i::~TAO_Log_i (void)
}
DsLogAdmin::LogMgr_ptr
-TAO_Log_i::my_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Log_i::my_factory (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ());
}
DsLogAdmin::LogId
-TAO_Log_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Log_i::id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return logid_;
}
DsLogAdmin::QoSList*
-TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_log_qos (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// @@ The current revision of the specification (formal/03-07-01)
// states that get_log_qos() returns a list of the QoS properties
@@ -136,7 +127,7 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
// have submitted a defect report to the OMG for clarification.
// --jtc
- return this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_log_qos ();
}
void
@@ -149,7 +140,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
// @@ The current revision of the specification (formal/03-07-01)
// does not clearly define the semantics to follow when the QoSList
@@ -164,8 +154,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
validate_log_qos (qos);
DsLogAdmin::QoSList_var old_qos =
- this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_log_qos ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -179,7 +168,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
return;
this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
reset_log_qos (qos);
@@ -190,22 +178,20 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
old_qos.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
CORBA::ULong
-TAO_Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_max_record_life (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
return
- this->recordstore_->get_max_record_life(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->recordstore_->get_max_record_life();
}
void
@@ -217,11 +203,9 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
CORBA::ULong old_life =
- this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_max_record_life ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -235,7 +219,6 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
return;
this->recordstore_->set_max_record_life (life ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (life != 0)
this->log_compaction_handler_.schedule();
@@ -249,21 +232,19 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
old_life,
life
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
CORBA::ULongLong
-TAO_Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_max_size (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return recordstore_->get_max_size ();
}
void
@@ -276,11 +257,9 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
CORBA::ULongLong old_size =
- this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_max_size ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -297,15 +276,13 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
if (size != 0)
{
CORBA::ULongLong current_size =
- this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_current_size ();
if (size < current_size)
ACE_THROW (DsLogAdmin::InvalidParam ());
}
this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -314,7 +291,6 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
old_size,
size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// @@ The current revision of the specification (formal/03-07-01)
@@ -332,47 +308,43 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
// clarified when/if the OMG charters a RTF for the log service.
// --jtc
//
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->reset_capacity_alarm_threshold ();
}
CORBA::ULongLong
-TAO_Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_current_size (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_current_size ();
}
CORBA::ULongLong
-TAO_Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_n_records (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_n_records ();
}
DsLogAdmin::LogFullActionType
-TAO_Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_log_full_action (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_log_full_action();
}
void
@@ -385,14 +357,12 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt)
ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
DsLogAdmin::LogFullActionType old_action =
- this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_log_full_action ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -406,7 +376,6 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
return;
this->recordstore_->set_log_full_action (action ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -415,7 +384,6 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
old_action,
action
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// @@ The current revision of the specification (formal/03-07-01)
@@ -433,21 +401,19 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
// clarified when/if the OMG charters a RTF for the log service.
// --jtc
//
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->reset_capacity_alarm_threshold ();
}
DsLogAdmin::AdministrativeState
-TAO_Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_administrative_state (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_administrative_state ();
}
void
@@ -459,11 +425,9 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
DsLogAdmin::AdministrativeState old_state =
- this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_administrative_state ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -477,7 +441,6 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
return;
this->recordstore_->set_administrative_state (state ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -485,22 +448,20 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
this->logid_,
state
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
DsLogAdmin::ForwardingState
-TAO_Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_forwarding_state (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
return
- this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->recordstore_->get_forwarding_state ();
}
void
@@ -512,11 +473,9 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
DsLogAdmin::ForwardingState old_state =
- this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_forwarding_state ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -530,7 +489,6 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
return;
this->recordstore_->set_forwarding_state (state ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -538,12 +496,11 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
this->logid_,
state
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
DsLogAdmin::OperationalState
-TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Log_i::get_operational_state (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// No locks are necessary, since op_state_ is set in ::init() and
@@ -552,16 +509,15 @@ TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
DsLogAdmin::TimeInterval
-TAO_Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_interval (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_interval ();
}
void
@@ -575,7 +531,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
// validate interval
if (interval.start != 0)
@@ -585,8 +540,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
}
DsLogAdmin::TimeInterval old_interval =
- this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_interval ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -600,7 +554,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
return;
this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -611,7 +564,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
old_interval.start,
interval.start
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (interval.stop != old_interval.stop)
@@ -621,26 +573,24 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
old_interval.stop,
interval.stop
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
DsLogAdmin::AvailabilityStatus
-TAO_Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_availability_status (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->get_availability_status_i ();
}
DsLogAdmin::AvailabilityStatus
-TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_availability_status_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// The log is considered "on duty" if all the following are true:
@@ -650,12 +600,10 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
// * current time falls within one (or more) of the log
// scheduling times.
- const CORBA::Boolean s = this->scheduled (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (this->avail_status_);
+ const CORBA::Boolean s = this->scheduled ();
DsLogAdmin::AdministrativeState admin_state =
- this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (this->avail_status_);
+ this->recordstore_->get_administrative_state ();
if (this->op_state_ == DsLogAdmin::enabled
&& admin_state == DsLogAdmin::unlocked
@@ -671,16 +619,15 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
}
DsLogAdmin::CapacityAlarmThresholdList*
-TAO_Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_capacity_alarm_thresholds (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_capacity_alarm_thresholds ();
}
void
@@ -695,19 +642,16 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
const CORBA::Boolean validated =
TAO_Log_i::validate_capacity_alarm_thresholds (threshs
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!validated)
ACE_THROW (DsLogAdmin::InvalidThreshold ());
DsLogAdmin::CapacityAlarmThresholdList_var old_threshs =
- this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_capacity_alarm_thresholds ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -722,7 +666,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
this->recordstore_->set_capacity_alarm_thresholds (threshs
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -731,7 +674,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
old_threshs.in (),
threshs
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// @@ The current revision of the specification (formal/03-07-01)
@@ -750,21 +692,19 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
// --jtc
//
this->thresholds_ = threshs;
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->reset_capacity_alarm_threshold ();
}
DsLogAdmin::WeekMask*
-TAO_Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_week_mask (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->recordstore_->get_week_mask ();
}
void
@@ -779,14 +719,11 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
validate_week_mask (masks ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
DsLogAdmin::WeekMask_var old_masks =
- this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_week_mask ();
// @@ The current revision of the specification (formal/03-07-01) is
// unclear whether an AttributeValueChange event should be sent if a
@@ -800,10 +737,8 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
return;
this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (notifier_)
{
@@ -812,7 +747,6 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
old_masks.in (),
masks
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -829,7 +763,6 @@ TAO_Log_i::query (const char *grammar,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
return this->recordstore_->query (grammar,
constraint,
@@ -848,7 +781,6 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
return this->recordstore_->retrieve (from_time,
how_many,
@@ -868,13 +800,11 @@ TAO_Log_i::match (const char* grammar,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
const CORBA::ULong count =
this->recordstore_->match (grammar,
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return count;
}
@@ -891,25 +821,21 @@ TAO_Log_i::delete_records (const char *grammar,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
const CORBA::ULong count =
this->recordstore_->delete_records (grammar,
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
- if (count > 0)
+ if (count > 0)
{
if (avail_status_.log_full)
{
const CORBA::ULongLong current_size =
- this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->recordstore_->get_current_size ();
const CORBA::ULongLong max_size =
- this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->recordstore_->get_max_size ();
if (current_size < max_size)
{
@@ -917,10 +843,9 @@ TAO_Log_i::delete_records (const char *grammar,
}
}
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->reset_capacity_alarm_threshold ();
}
-
+
return count;
}
@@ -933,23 +858,19 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
const CORBA::ULong count =
this->recordstore_->delete_records_by_id (ids ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (count > 0)
{
if (avail_status_.log_full)
{
const CORBA::ULongLong current_size =
- this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->recordstore_->get_current_size ();
const CORBA::ULongLong max_size =
- this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->recordstore_->get_max_size ();
if (current_size < max_size)
{
@@ -957,8 +878,7 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
}
}
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->reset_capacity_alarm_threshold ();
}
return count;
@@ -983,7 +903,6 @@ TAO_Log_i::write_records (const DsLogAdmin::Anys &records
}
this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -999,15 +918,12 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
DsLogAdmin::LogFullActionType log_full_action =
- this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_log_full_action ();
DsLogAdmin::AdministrativeState admin_state =
- this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_administrative_state ();
// @@ The current revision of the specification (formal/03-07-01)
// does not explicitly specify the preference of exceptions to be
@@ -1019,8 +935,7 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
// specific LogLocked and LogDisabled exceptions will be thrown.
DsLogAdmin::AvailabilityStatus avail_stat =
- this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_availability_status_i ();
if (admin_state == DsLogAdmin::locked)
{
@@ -1040,9 +955,8 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
for (CORBA::ULong i = 0; i < reclist.length (); i++)
{
// retval == 1 => log store reached max size.
-
+
int retval = this->recordstore_->log (reclist[i] ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (retval == 1)
{
@@ -1057,9 +971,9 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
// the policy is to wrap. for this we need to delete a few
// records. let the record store decide how many.
- if (this->recordstore_->purge_old_records (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+ if (this->recordstore_->purge_old_records () == -1)
ACE_THROW (CORBA::PERSIST_STORE ());
-
+
// Now, we want to attempt to write the same record again
// so decrement the index to balance the inc. in the for loop.
--i;
@@ -1067,9 +981,8 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
else if (retval == 0)
{
num_written++;
-
- this->check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+
+ this->check_capacity_alarm_threshold ();
}
else
{
@@ -1090,7 +1003,6 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->recordstore_->set_record_attribute (id, attr_list
ACE_ENV_ARG_PARAMETER);
@@ -1110,7 +1022,6 @@ TAO_Log_i::set_records_attribute (const char *grammar,
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
return this->recordstore_->set_records_attribute (grammar,
constraint,
@@ -1128,29 +1039,27 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id
guard,
this->recordstore_->lock (),
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
-
+
return this->recordstore_->get_record_attribute (id
ACE_ENV_ARG_PARAMETER);
}
void
-TAO_Log_i::flush (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::flush (void)
ACE_THROW_SPEC ((CORBA::SystemException,
DsLogAdmin::UnsupportedQoS))
{
/// XXX locks?
- this->recordstore_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->recordstore_->flush ();
}
CORBA::Boolean
-TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::scheduled (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
DsLogAdmin::TimeInterval interval =
- this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->recordstore_->get_interval ();
TimeBase::TimeT current_time;
ACE_Time_Value now = ACE_OS::gettimeofday ();
@@ -1203,97 +1112,76 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log
ACE_THROW_SPEC ((CORBA::SystemException))
{
const DsLogAdmin::LogFullActionType log_full_action =
- this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_log_full_action ();
log->set_log_full_action (log_full_action
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const CORBA::ULongLong max_size =
- this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_max_size ();
log->set_max_size (max_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
DsLogAdmin::QoSList_var log_qos =
- this->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_log_qos ();
log->set_log_qos (log_qos.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const CORBA::ULong max_record_life =
- this->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_max_record_life ();
log->set_max_record_life (max_record_life
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const DsLogAdmin::AdministrativeState adminstrative_state =
- this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_administrative_state ();
log->set_administrative_state (adminstrative_state
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const DsLogAdmin::ForwardingState forwarding_state =
- this->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_forwarding_state ();
log->set_forwarding_state (forwarding_state
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const DsLogAdmin::TimeInterval interval =
- this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_interval ();
log->set_interval (interval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
DsLogAdmin::CapacityAlarmThresholdList_var capacity_list =
- this->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_capacity_alarm_thresholds ();
log->set_capacity_alarm_thresholds (capacity_list.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
DsLogAdmin::WeekMask_var week_mask =
- this->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_week_mask ();
log->set_week_mask (week_mask.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::remove_old_records (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const CORBA::ULong count =
- this->recordstore_->remove_old_records (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->remove_old_records ();
if (count > 0)
{
if (avail_status_.log_full)
{
const CORBA::ULongLong current_size =
- this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_current_size ();
const CORBA::ULongLong max_size =
- this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_max_size ();
if (current_size < max_size)
{
@@ -1301,31 +1189,27 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
}
}
- this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->reset_capacity_alarm_threshold ();
}
}
void
-TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::check_capacity_alarm_threshold (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const CORBA::ULongLong max_size =
- this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_max_size ();
if (max_size != 0 && this->thresholds_.length () > 0)
{
const DsLogAdmin::LogFullActionType log_full_action =
- this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
+ this->recordstore_->get_log_full_action ();
+
CORBA::ULongLong current_size =
((log_full_action == DsLogAdmin::wrap)
- ? this->recordstore_->get_gauge (ACE_ENV_SINGLE_ARG_PARAMETER)
- : this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
-
+ ? this->recordstore_->get_gauge ()
+ : this->recordstore_->get_current_size ());
+
const CORBA::UShort percent =
static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U) /
(double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
@@ -1347,7 +1231,6 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
percent,
severity
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -1374,24 +1257,21 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::reset_capacity_alarm_threshold (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const CORBA::ULongLong max_size =
- this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_max_size ();
if (max_size != 0 && this->thresholds_.length() > 0)
{
const DsLogAdmin::LogFullActionType log_full_action =
- this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_log_full_action ();
if (log_full_action == DsLogAdmin::halt)
{
const CORBA::ULongLong current_size =
- this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->recordstore_->get_current_size ();
const CORBA::UShort percent =
static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
@@ -1440,12 +1320,12 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
// I have submitted a defect report to the OMG for clarification.
//
// In the mean time, the last property found in the QoSList takes
- // presidence.
+ // presidence.
// --jtc
DsLogAdmin::QoSType qostype = DsLogAdmin::QoSNone;
- for (CORBA::ULong i = 0; i < qos.length (); ++i)
+ for (CORBA::ULong i = 0; i < qos.length (); ++i)
{
qostype = qos[i];
}
@@ -1459,7 +1339,7 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
}
void
-TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos
+TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS))
{
@@ -1488,7 +1368,7 @@ TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos
}
void
-TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks
+TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks
ACE_ENV_ARG_DECL_NOT_USED)
{
CORBA::ULong count = 0;
@@ -1580,9 +1460,9 @@ operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
return false;
}
- for (CORBA::ULong i = 0; i < length; ++i)
+ for (CORBA::ULong i = 0; i < length; ++i)
{
- if (rhs[i] != lhs[i])
+ if (rhs[i] != lhs[i])
{
return false;
}
@@ -1733,10 +1613,10 @@ operator==(const DsLogAdmin::WeekMask& rhs,
{
return false;
}
-
+
for (CORBA::ULong i = 0; i < length; ++i)
{
- if (rhs[i] != lhs[i])
+ if (rhs[i] != lhs[i])
{
return false;
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 38d0ffa0e54..f49b44d0f53 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -62,7 +62,7 @@ public:
~TAO_Log_i ();
/// Initlialize the Log.
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
/**
* @name DsLogAdmin::Log Methods
@@ -71,16 +71,16 @@ public:
*/
//@{
/// Return the factory of the log.
- DsLogAdmin::LogMgr_ptr my_factory (ACE_ENV_SINGLE_ARG_DECL)
+ DsLogAdmin::LogMgr_ptr my_factory (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the id of the log.
- DsLogAdmin::LogId id (ACE_ENV_SINGLE_ARG_DECL)
+ DsLogAdmin::LogId id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Get the list of the QoS properties supported by the log.
DsLogAdmin::QoSList*
- get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
+ get_log_qos (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the list of the QoS properties supported by the log.
@@ -91,7 +91,7 @@ public:
/// Get the record life in seconds (0 infinite).
CORBA::ULong
- get_max_record_life (ACE_ENV_SINGLE_ARG_DECL)
+ get_max_record_life (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the record life in seconds (0 infinite).
@@ -102,7 +102,7 @@ public:
/// Get the maximum size in octets.
CORBA::ULongLong
- get_max_size (ACE_ENV_SINGLE_ARG_DECL)
+ get_max_size (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the maximum size in octets.
@@ -114,17 +114,17 @@ public:
/// Get the current size of the log in octets.
CORBA::ULongLong
- get_current_size (ACE_ENV_SINGLE_ARG_DECL)
+ get_current_size (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the number of records in the log.
CORBA::ULongLong
- get_n_records (ACE_ENV_SINGLE_ARG_DECL)
+ get_n_records (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Get the action to be taken when the log reaches its maximum size.
DsLogAdmin::LogFullActionType
- get_log_full_action (ACE_ENV_SINGLE_ARG_DECL)
+ get_log_full_action (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the action to be taken when the log reaches its maximum size.
@@ -136,7 +136,7 @@ public:
/// Get the administrative state of the log.
DsLogAdmin::AdministrativeState
- get_administrative_state (ACE_ENV_SINGLE_ARG_DECL)
+ get_administrative_state (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the administrative state of the log.
@@ -150,7 +150,7 @@ public:
/// @@@ Of course! get_forwarding_state() is virtual in the base
/// class dictated by the IDL! -Ossama
virtual DsLogAdmin::ForwardingState
- get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL)
+ get_forwarding_state (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the forwarding state of the log.
@@ -162,12 +162,12 @@ public:
/// Get the operational state of the log.
DsLogAdmin::OperationalState
- get_operational_state (ACE_ENV_SINGLE_ARG_DECL)
+ get_operational_state (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Get the log duration
DsLogAdmin::TimeInterval
- get_interval (ACE_ENV_SINGLE_ARG_DECL)
+ get_interval (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the log duration.
@@ -180,12 +180,12 @@ public:
/// Get the availability status
DsLogAdmin::AvailabilityStatus
- get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
+ get_availability_status (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Get the capacity alarm threshold
DsLogAdmin::CapacityAlarmThresholdList*
- get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
+ get_capacity_alarm_thresholds (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -205,7 +205,7 @@ public:
/// Get the weekly scheduling parameters
DsLogAdmin::WeekMask*
- get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+ get_week_mask (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the weekly scheduling parameters.
@@ -315,25 +315,25 @@ public:
/// Causes all pending events to be written to storage. Raises
/// DsLogAdmin::UnsupportedQos
void
- flush (ACE_ENV_SINGLE_ARG_DECL)
+ flush (void)
ACE_THROW_SPEC ((CORBA::SystemException,
DsLogAdmin::UnsupportedQoS));
//@}
/// Remove records that have exceeded max_record_life_.
- void remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
+ void remove_old_records (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
/// Get the availability status
/// @note must be called with locks held
DsLogAdmin::AvailabilityStatus
- get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
+ get_availability_status_i (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Tells if the Log is scheduled to run now.
/// @note must be called with locks held
- CORBA::Boolean scheduled (ACE_ENV_SINGLE_ARG_DECL)
+ CORBA::Boolean scheduled (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Copy the attributes of the log being passed.
@@ -342,11 +342,11 @@ protected:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Check if threshold reached.
- void check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+ void check_capacity_alarm_threshold (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Reset capacity alarm threshold.
- void reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+ void reset_capacity_alarm_threshold (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Check that valid threshold values have been given.
@@ -394,7 +394,7 @@ protected:
/// The log's factory's object reference
DsLogAdmin::LogMgr_var factory_;
- /// The log's id
+ /// The log's id
DsLogAdmin::LogId logid_;
/// The log's operational state
@@ -438,7 +438,7 @@ protected:
static const ACE_Time_Value log_flush_interval_;
};
-bool TAO_Log_Serv_Export
+bool TAO_Log_Serv_Export
operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
const DsLogAdmin::CapacityAlarmThresholdList& lhs);
@@ -489,11 +489,11 @@ operator!=(const DsLogAdmin::TimeInterval& rhs,
bool TAO_Log_Serv_Export
operator==(const DsLogAdmin::WeekMaskItem& rhs,
const DsLogAdmin::WeekMaskItem& lhs);
-
+
bool TAO_Log_Serv_Export
operator!=(const DsLogAdmin::WeekMaskItem& rhs,
const DsLogAdmin::WeekMaskItem& lhs);
-
+
bool TAO_Log_Serv_Export
operator==(const DsLogAdmin::WeekMask& rhs,
const DsLogAdmin::WeekMask& lhs);
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 97f1a9803f1..7e5fa4d9a17 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -24,12 +24,10 @@ TAO_Notify_LogConsumer::connect (
{
// Activate the consumer with the default_POA_
CosNotifyComm::PushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -37,22 +35,19 @@ TAO_Notify_LogConsumer::connect (
this->proxy_supplier_ =
CosNotifyChannelAdmin::ProxyPushSupplier::
_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
proxy_supplier_->connect_any_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_LogConsumer::disconnect (void)
{
this->proxy_supplier_->
- disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disconnect_push_supplier();
}
void
@@ -107,11 +102,10 @@ TAO_Notify_LogConsumer::push
//
// I have submitted a defect report to the OMG for clarification.
// --jtc
- ACE_TRY
+ ACE_TRY
{
// log the RecordList.
this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (DsLogAdmin::LogFull, ex)
{
@@ -134,7 +128,7 @@ TAO_Notify_LogConsumer::push
void
TAO_Notify_LogConsumer::disconnect_push_consumer
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index c464e91f8d4..bd9e1802acc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -62,7 +62,7 @@ public:
void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
/// Disconnect from NotifyLog.
- virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect (void);
protected:
/// Destructor.
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 32af058cd1c..30dd0c98c71 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -40,7 +40,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChan
added[0].type_name = CORBA::string_dup ("*");
this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_NEW_THROW_EX (this->notifier_,
TAO_NotifyLogNotification(this->event_channel_.in ()),
@@ -58,29 +57,24 @@ TAO_NotifyLogFactory_i::activate (CORBA::ORB_ptr orb,
ACE_ENV_ARG_DECL)
{
TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
PortableServer::ObjectId_var oid =
this->factory_poa_->activate_object (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
CORBA::Object_var obj =
this->factory_poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
// narrow and store the result..
this->log_mgr_ =
DsLogAdmin::LogMgr::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
DsNotifyLogAdmin::NotifyLogFactory_var v_return =
DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
return v_return._retn ();
}
@@ -111,17 +105,14 @@ TAO_NotifyLogFactory_i::create (
& thresholds,
id_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
DsLogAdmin::LogId id = id_out;
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
#endif
// narrow to NotifyLog
@@ -130,7 +121,6 @@ TAO_NotifyLogFactory_i::create (
// @@ JTC - squelch exception?
notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
return notify_log._retn ();
}
@@ -162,16 +152,13 @@ TAO_NotifyLogFactory_i::create_with_id (
max_size,
& thresholds
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
#endif
// narrow to NotifyLog
@@ -180,7 +167,6 @@ TAO_NotifyLogFactory_i::create_with_id (
// @@ JTC - squelch exception?
notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
return notify_log._retn();
}
@@ -207,29 +193,26 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id
id
),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
- notify_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ notify_log_i->init ();
//initialise the LogConsumer object
- notify_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ notify_log_i->activate ();
return notify_log_i;
}
CosNotifyChannelAdmin::AdminID
-TAO_NotifyLogFactory_i::MyID (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::MyID (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->MyID (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->MyID ();
}
CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::MyChannel (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -238,21 +221,21 @@ TAO_NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_NotifyLogFactory_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::MyOperator (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->MyOperator ();
}
CosNotifyFilter::MappingFilter_ptr
-TAO_NotifyLogFactory_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::priority_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->priority_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->priority_filter ();
}
void
@@ -265,12 +248,12 @@ TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filt
}
CosNotifyFilter::MappingFilter_ptr
-TAO_NotifyLogFactory_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::lifetime_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->lifetime_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->lifetime_filter ();
}
void
@@ -283,21 +266,21 @@ TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filt
}
CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NotifyLogFactory_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::pull_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->pull_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->pull_suppliers ();
}
CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NotifyLogFactory_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::push_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->push_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->push_suppliers ();
}
CosNotifyChannelAdmin::ProxySupplier_ptr
@@ -343,7 +326,7 @@ TAO_NotifyLogFactory_i::obtain_push_supplier (
CORBA::SystemException
))
{
- return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->obtain_push_supplier ();
}
@@ -357,11 +340,11 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier (
))
{
- return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->obtain_pull_supplier ();
}
void
-TAO_NotifyLogFactory_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_NotifyLogFactory_i::destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -383,12 +366,12 @@ TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq
}
CosNotification::QoSProperties*
-TAO_NotifyLogFactory_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->get_qos ();
}
void
@@ -442,21 +425,21 @@ TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DEC
}
CosNotifyFilter::FilterIDSeq*
-TAO_NotifyLogFactory_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return consumer_admin_->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return consumer_admin_->get_all_filters ();
}
void
-TAO_NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ consumer_admin_->remove_all_filters ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index bbe8127c077..c76098a88ac 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -104,22 +104,22 @@ public:
// = Methods from CosNotifyChannelAdmin::ConsumerAdmin.
- CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyChannelAdmin::AdminID MyID (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- CosNotifyChannelAdmin::EventChannel_ptr MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- CosNotifyFilter::MappingFilter_ptr priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyFilter::MappingFilter_ptr priority_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -128,7 +128,7 @@ public:
CORBA::SystemException
));
- CosNotifyFilter::MappingFilter_ptr lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyFilter::MappingFilter_ptr lifetime_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -137,11 +137,11 @@ public:
CORBA::SystemException
));
- CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -183,7 +183,7 @@ public:
CORBA::SystemException
));
- void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ void destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -198,7 +198,7 @@ public:
));
/// CosNotification::QoSAdmin.
- CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotification::QoSProperties* get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -229,11 +229,11 @@ public:
CosNotifyFilter::FilterNotFound,
CORBA::SystemException
));
- CosNotifyFilter::FilterIDSeq* get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ CosNotifyFilter::FilterIDSeq* get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ void remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -241,7 +241,7 @@ public:
protected:
virtual CORBA::RepositoryId
create_repositoryid ();
-
+
virtual PortableServer::ServantBase*
create_log_servant (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 1a3762a4d51..f8feede1227 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -16,34 +16,30 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification (
event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
{
ACE_DECLARE_NEW_CORBA_ENV;
-
+
CosNotifyComm::PushSupplier_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
ACE_ASSERT (!CORBA::is_nil (objref.in ()));
CosNotifyChannelAdmin::AdminID adminID;
- CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
+ CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
this->event_channel_->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, adminID);
ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
// narrow
this->proxy_consumer_ =
CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
proxy_consumer_->connect_any_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void)
@@ -56,7 +52,7 @@ TAO_NotifyLogNotification::send_notification (const CORBA::Any& any)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
+{
this->proxy_consumer_->push (any);
}
@@ -75,14 +71,14 @@ TAO_NotifyLogNotification::subscription_change
void
TAO_NotifyLogNotification::disconnect_push_supplier
- (ACE_ENV_SINGLE_ARG_DECL)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_push_consumer();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index db13c800447..05c9b970d77 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -52,20 +52,16 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
{
DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
- CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+ CosNotification::QoSProperties* qos = get_qos ();
- CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+ CosNotification::AdminProperties* admin = get_admin ();
DsNotifyLogAdmin::NotifyLog_var log =
notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
static_cast<const CosNotification::AdminProperties> (*admin), id);
this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
}
@@ -78,50 +74,42 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
{
DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
- CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+ CosNotification::QoSProperties* qos = get_qos ();
- CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+ CosNotification::AdminProperties* admin = get_admin ();
DsNotifyLogAdmin::NotifyLog_var log =
notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
static_cast<const CosNotification::AdminProperties> (*admin));
this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
}
void
-TAO_NotifyLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Remove ourselves from the list of logs.
this->logmgr_i_.remove (this->logid_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Deregister with POA.
PortableServer::ObjectId_var id =
this->poa_->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->poa_->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::activate (void)
{
CosNotifyChannelAdmin::AdminID adminid = 0;
@@ -130,18 +118,15 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_admin_ =
this->event_channel_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
CosNotifyFilter::FilterFactory_var ffact =
- this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->default_filter_factory ();
// setup a filter at the consumer admin
CosNotifyFilter::Filter_var ca_filter =
ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
@@ -152,10 +137,8 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Setup the CA to receive all type of events
CosNotification::EventTypeSeq added(1);
@@ -167,7 +150,6 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
added[0].type_name = CORBA::string_dup ("*");
this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_NEW_THROW_EX (this->my_log_consumer_,
TAO_Notify_LogConsumer (this),
@@ -178,7 +160,7 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
//IDL to C++
CosNotifyFilter::Filter_ptr
-TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -200,7 +182,7 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */
}
CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::MyFactory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -210,30 +192,30 @@ TAO_NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::default_consumer_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->default_consumer_admin ();
}
CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NotifyLog_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::default_supplier_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->default_supplier_admin ();
}
CosNotifyFilter::FilterFactory_ptr
-TAO_NotifyLog_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::default_filter_factory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->default_filter_factory ();
}
CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -277,30 +259,30 @@ TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_AR
}
CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NotifyLog_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_all_consumeradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->get_all_consumeradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->get_all_consumeradmins ();
}
CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NotifyLog_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_all_supplieradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->get_all_supplieradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->get_all_supplieradmins ();
}
CosNotification::AdminProperties*
-TAO_NotifyLog_i::get_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->get_admin ();
}
void
@@ -314,7 +296,7 @@ TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin ACE_EN
}
CosNotification::QoSProperties*
-TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -349,12 +331,12 @@ TAO_NotifyLog_i::validate_qos (
}
CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::for_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->for_consumers();
}
CosEventChannelAdmin::SupplierAdmin_ptr
@@ -365,7 +347,7 @@ TAO_NotifyLog_i::for_suppliers (
CORBA::SystemException
))
{
- return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->for_suppliers();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 81218cf3962..d28cb229b6b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -83,16 +83,16 @@ public:
/// Destroy the log object and all contained records.
void
- destroy (ACE_ENV_SINGLE_ARG_DECL)
+ destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Activate the NotifyLog.
void
- activate (ACE_ENV_SINGLE_ARG_DECL);
+ activate (void);
// = Methods from CosNotifyChannelAdmin::EventChannel.
CosNotifyFilter::Filter_ptr
- get_filter (ACE_ENV_SINGLE_ARG_DECL)
+ get_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -103,25 +103,25 @@ public:
));
CosNotifyChannelAdmin::EventChannelFactory_ptr
- MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+ MyFactory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosNotifyChannelAdmin::ConsumerAdmin_ptr
- default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+ default_consumer_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosNotifyChannelAdmin::SupplierAdmin_ptr
- default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+ default_supplier_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosNotifyFilter::FilterFactory_ptr
- default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+ default_filter_factory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -155,19 +155,19 @@ public:
));
CosNotifyChannelAdmin::AdminIDSeq*
- get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+ get_all_consumeradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosNotifyChannelAdmin::AdminIDSeq*
- get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+ get_all_supplieradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosNotification::AdminProperties*
- get_admin (ACE_ENV_SINGLE_ARG_DECL)
+ get_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -179,7 +179,7 @@ public:
));
CosNotification::QoSProperties*
- get_qos (ACE_ENV_SINGLE_ARG_DECL)
+ get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -199,13 +199,13 @@ public:
// = Methods from DsEventLogAdmin::EventLog.
CosEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
CosEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 08a2cfd036e..ec298fc21e1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -53,12 +53,11 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DE
this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Rtec_LogConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->supplier_proxy_->disconnect_push_supplier (
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index 05fdb9d65f4..676f984c689 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -69,7 +69,7 @@ public:
private:
/// Disconnect from EventLog.
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// This method will call TAO_Log_i::log() to write
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index bffeb96ecf4..bb267fc1758 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -38,12 +38,10 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
ACE_ENV_ARG_DECL)
{
TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POA_var defPOA =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->_default_POA ();
TAO_EC_Event_Channel_Attributes attr (defPOA.in (), defPOA.in ());
@@ -51,27 +49,23 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
ACE_NEW_THROW_EX (impl,
TAO_EC_Event_Channel (attr),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (-1);
auto_ptr <TAO_EC_Event_Channel> ec (impl);
- impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ impl->activate ();
PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ec.release ();
CORBA::Object_var objec =
poa_->id_to_reference (oidec.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->event_channel_ = RtecEventChannelAdmin::EventChannel::_narrow (objec.in ());
- this->consumer_admin_ = this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->consumer_admin_ = this->event_channel_->for_consumers();
ACE_NEW_THROW_EX (this->notifier_,
TAO_RTEventLogNotification(this->event_channel_.in ()),
@@ -80,30 +74,26 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
}
RTEventLogAdmin::EventLogFactory_ptr
-TAO_RTEventLogFactory_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLogFactory_i::activate (void)
{
RTEventLogAdmin::EventLogFactory_var v_return;
PortableServer::ObjectId_var oid =
this->factory_poa_->activate_object (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (v_return._retn ());
CORBA::Object_var obj =
this->factory_poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (v_return._retn ());
// narrow and store the result..
this->log_mgr_ =
DsLogAdmin::LogMgr::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (v_return._retn ());
v_return =
RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLogFactory::_nil ());
return v_return._retn ();
}
@@ -127,17 +117,14 @@ TAO_RTEventLogFactory_i::create (
& thresholds,
id_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
DsLogAdmin::LogId id = id_out;
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
#endif
// narrow to EventLog
@@ -146,7 +133,6 @@ TAO_RTEventLogFactory_i::create (
// @@ JTC - squelch exception?
notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
return event_log._retn();
}
@@ -171,16 +157,13 @@ TAO_RTEventLogFactory_i::create_with_id (
max_size,
& thresholds
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
#if (TAO_HAS_MINIMUM_POA == 0)
DsLogAdmin::Log_var log =
this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
#else
DsLogAdmin::Log_var log =
this->create_log_object (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
#endif
// narrow to EventLog
@@ -189,7 +172,6 @@ TAO_RTEventLogFactory_i::create_with_id (
// @@ JTC - squelch exception?
notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
return event_log._retn ();
}
@@ -216,14 +198,11 @@ TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
id
),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
- event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ event_log_i->init ();
//initialise the LogConsumer object
- event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ event_log_i->activate ();
return event_log_i;
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index d416bd028ec..335f2d86a52 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -68,7 +68,7 @@ public:
/// Activate this servant
RTEventLogAdmin::EventLogFactory_ptr
- activate (ACE_ENV_SINGLE_ARG_DECL);
+ activate (void);
/// Used to create a RTEventLog.
RTEventLogAdmin::EventLog_ptr create (
@@ -110,7 +110,7 @@ public:
protected:
virtual CORBA::RepositoryId
create_repositoryid ();
-
+
virtual PortableServer::ServantBase*
create_log_servant (DsLogAdmin::LogId id
ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index d3ceeb987e8..8c43975ff2f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -31,7 +31,7 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification (
{
ACE_DECLARE_NEW_CORBA_ENV;
- obtainProxyConsumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ obtainProxyConsumer ();
}
TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void)
@@ -40,14 +40,14 @@ TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void)
}
void
-TAO_RTEventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RTEventLogNotification::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// No-Op.
}
void
-TAO_RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLogNotification::obtainProxyConsumer (void)
{
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
event_channel_->for_suppliers();
@@ -55,7 +55,7 @@ TAO_RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL)
consumer_ = supplier_admin->obtain_push_consumer();
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->_this ();
// Simple publication, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index 785efe87c79..a2530fe0783 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -58,7 +58,7 @@ public:
~TAO_RTEventLogNotification (void);
/// The skeleton methods.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
@@ -66,7 +66,7 @@ protected:
/// Used to connect this PushSupplier to the EventChannel
/// that will log these events.
- void obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL);
+ void obtainProxyConsumer (void);
// Send the event on the event channel.
virtual void send_notification (const CORBA::Any& any)
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 3aacac1ff86..425c5807ad7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -54,15 +54,12 @@ TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
{
RTEventLogAdmin::EventLogFactory_var eventLogFactory =
RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
RTEventLogAdmin::EventLog_var log =
eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_,
id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
}
@@ -73,58 +70,50 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
{
RTEventLogAdmin::EventLogFactory_var eventLogFactory =
RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
RTEventLogAdmin::EventLog_var log =
eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0,
thresholds_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
return log._retn ();
}
void
-TAO_RTEventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLog_i::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Remove ourselves from the list of logs.
this->logmgr_i_.remove (this->logid_
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ACE_ENV_ARG_PARAMETER);
// Deregister with POA.
PortableServer::ObjectId_var id =
this->log_poa_->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->log_poa_->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_RTEventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLog_i::activate (void)
{
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
this->my_log_consumer_ = new TAO_Rtec_LogConsumer (this);
this->my_log_consumer_->connect (consumer_admin.in ());
}
RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_RTEventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLog_i::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->for_consumers();
}
RtecEventChannelAdmin::SupplierAdmin_ptr
@@ -135,7 +124,7 @@ TAO_RTEventLog_i::for_suppliers (
CORBA::SystemException
))
{
- return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->event_channel_->for_suppliers();
}
RtecEventChannelAdmin::Observer_Handle
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 6dc0b4975b3..fca0ae6e58f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -81,20 +81,20 @@ public:
/// Destroy the log object and all contained records.
void
- destroy (ACE_ENV_SINGLE_ARG_DECL)
+ destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Activate the RTEventLog.
void
- activate (ACE_ENV_SINGLE_ARG_DECL);
+ activate (void);
// = The RtecEventChannelAdmin::EventChannel interface methods.
RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::Observer_Handle
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
index 71f0e444678..52effe3ddb0 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -403,7 +403,6 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos
ACE_TRY_NEW_ENV
{
any.replace (Metrics::_tc_QoSData, &qos_data_, 0, ACE_TRY_ENV);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -442,7 +441,6 @@ TAO_Metrics_Logger::set_identities (const Metrics::ProbeIdentity_Set &
{
this->set_identity (probe_identities [i]
ACE_ENV_ARG_DECL);
- ACE_CHECK;
}
}
@@ -460,7 +458,6 @@ TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identit
ACE_NEW_THROW_EX (name,
CORBA::String_var (probe_identity.probe_name),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// What is this used for? BRM
auto_ptr<CORBA::String_var> name_ptr (name);
@@ -839,7 +836,6 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se
ACE_TRY_NEW_ENV
{
any.replace (Metrics::_tc_UtilData, &util_data_, 0, ACE_TRY_ENV);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
index 08b866de338..d9fcdb2975d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
@@ -152,7 +152,6 @@ push (const RtecEventComm::EventSet & data,
// Push to the actual consumer.
consumer_.push (data, ACE_TRY_ENV);
- ACE_CHECK;
// Record the end of the upcall in the cache, and report whether
// the deadline was made or missed to the monitor.
@@ -170,12 +169,10 @@ push (const RtecEventComm::EventSet & data,
if (result == 0)
{
monitor_.report_made_deadline (this->handle_, ACE_TRY_ENV);
- ACE_CHECK;
}
else if (result == 1)
{
monitor_.report_missed_deadline (this->handle_, ACE_TRY_ENV);
- ACE_CHECK;
}
# if defined (METRICS_MONITOR_ERROR_OUTPUT_ENABLED)
else
@@ -203,7 +200,6 @@ push (const RtecEventComm::EventSet & data,
// the cache and the missed deadline to the monitor.
cache_.report_upcall_cancellation (this->handle_);
monitor_.report_missed_deadline (this->handle_, ACE_TRY_ENV);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
index af64c20b061..3f4cbe72fa2 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -62,7 +62,6 @@ TAO_Metrics_Utils::set_mission_state (int i, Metrics::QoSLogger_ptr logger)
{
logger->send_banner (banner
ACE_ENV_ARG_DECL);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -88,7 +87,6 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
{
CORBA::Object_var obj =
orb->string_to_object (logger_ior_str);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
{
@@ -104,7 +102,6 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
else
{
logger = Metrics::QoSLogger::_narrow (obj.in ());
- ACE_TRY_CHECK;
if (CORBA::is_nil (logger.in ()))
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index bee9ae0c932..51db42e913c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -34,7 +34,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~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 (ACE_ENV_SINGLE_ARG_PARAMETER);
+ context_->interface ()->_remove_ref ();
}
// Return the Default POA of this Servant
@@ -58,7 +58,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
ACE_NEW_THROW_EX (binding,
CosNaming::Binding,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
b = binding;
@@ -66,7 +65,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// Check to make sure this object is still valid.
if (this->destroyed_)
@@ -76,8 +74,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
// self-destruct.
if (context_->destroyed ())
{
- destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ destroy ();
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
}
@@ -115,13 +112,11 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
ACE_NEW_THROW_EX (bl,
CosNaming::BindingList (0),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
// Obtain the lock.
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// Check to make sure this object is still valid.
if (this->destroyed_)
@@ -131,8 +126,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
// self-destruct.
if (context_->destroyed ())
{
- destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ destroy ();
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
}
@@ -173,14 +167,13 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
}
template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object is still valid.
if (this->destroyed_)
@@ -192,11 +185,9 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var id =
poa_->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa_->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
template <class ITERATOR, class TABLE_ENTRY> int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 6bed837d729..23bbbfd4c3d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -67,7 +67,7 @@ public:
~TAO_Bindings_Iterator (void);
/// Returns the Default POA of this Servant object
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
// = Idl methods.
@@ -88,7 +88,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// This operation destroys the iterator.
- void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// = Helper method.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 3cb59bd6da9..5c076bbfc44 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -79,12 +79,10 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
// Resolve the name.
CORBA::Object_var context = resolve (comp_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Try narrowing object reference to the NamingContext type.
result = CosNaming::NamingContext::_narrow (context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
{
@@ -97,7 +95,6 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
if (CORBA::is_nil (result.in ()))
{
@@ -123,7 +120,6 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -144,7 +140,6 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
{
CosNaming::NamingContext_var context =
this->get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name simple_name;
simple_name.length (1);
@@ -152,7 +147,6 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
ACE_TRY
{
context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
{
@@ -186,7 +180,6 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -207,7 +200,6 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
{
CosNaming::NamingContext_var context =
get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name simple_name;
simple_name.length (1);
@@ -215,7 +207,6 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
ACE_TRY
{
context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
{
@@ -251,7 +242,6 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -276,7 +266,6 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
{
CosNaming::NamingContext_var context =
get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name simple_name;
simple_name.length (1);
@@ -284,7 +273,6 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
ACE_TRY
{
context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
{
@@ -318,7 +306,6 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -339,7 +326,6 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
{
CosNaming::NamingContext_var context =
get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name simple_name;
simple_name.length (1);
@@ -347,7 +333,6 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
ACE_TRY
{
context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
{
@@ -381,7 +366,6 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
{
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -426,7 +410,6 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
// Narrow to NamingContext.
context = CosNaming::NamingContext::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
else
// The first name component wasn't bound to a NamingContext.
@@ -462,7 +445,6 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
CORBA::Object_ptr resolved_ref;
resolved_ref = context->resolve (rest_of_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return resolved_ref;
}
ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
@@ -485,7 +467,6 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -506,7 +487,6 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
{
CosNaming::NamingContext_var context =
get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name simple_name;
simple_name.length (1);
@@ -514,7 +494,6 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
ACE_TRY
{
context->unbind (simple_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
{
@@ -541,7 +520,6 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -564,7 +542,6 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
{
CosNaming::NamingContext_var context =
get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
CosNaming::Name simple_name;
simple_name.length (1);
@@ -579,8 +556,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
CosNaming::NamingContext::_nil ();
// Create new context.
- result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+ result = new_context ();
// Bind the new context to the name.
ACE_TRY
@@ -588,7 +564,6 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
bind_context (n,
result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -599,7 +574,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY_EX(DESTROY)
{
- result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ result->destroy ();
ACE_TRY_CHECK_EX(DESTROY);
}
ACE_CATCHANY
@@ -611,18 +586,16 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
return result._retn ();
}
void
-TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_Naming_Context::destroy (void)
{
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -650,11 +623,9 @@ TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var id =
PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
- ACE_CHECK;
poa->deactivate_object (id.in ()
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 21fb9d571f3..2b5c6a26183 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -218,7 +218,7 @@ public:
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void destroy (void);
/// Returns the Default POA of this Servant object
virtual PortableServer::POA_ptr _default_POA (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index ac7c42f87d0..c9b7f15e84d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -32,7 +32,6 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
{
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -41,7 +40,6 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -49,7 +47,6 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 809c1795a42..c272071a325 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -109,10 +109,10 @@ TAO_Naming_Context::unbind (const CosNaming::Name &n
}
CosNaming::NamingContext_ptr
-TAO_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Context::new_context (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return impl_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl_->new_context ();
}
CosNaming::NamingContext_ptr
@@ -128,11 +128,11 @@ TAO_Naming_Context::bind_new_context (const CosNaming::Name &n
}
void
-TAO_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Context::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosNaming::NamingContext::NotEmpty))
{
- impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ impl_->destroy ();
}
void
@@ -452,7 +452,6 @@ TAO_Naming_Context::to_url (const char * addr,
size_t no_char =
TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// The 'corbaname:' tag is to be prepended at the starting of the
@@ -526,7 +525,6 @@ TAO_Naming_Context::resolve_str (const char * n
// Get the unstrigified name.
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 () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 54140eb5e57..f79adf8dc28 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -175,7 +175,7 @@ public:
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosNaming::NamingContext::NotEmpty));
@@ -220,8 +220,7 @@ public:
*/
virtual char * to_url ( const char * addr,
const char * sn
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
- )
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNaming::NamingContextExt::InvalidAddress,
@@ -232,9 +231,7 @@ public:
* Similar to <resolve> as in the CosNaming::NamingContext interface.
* It accepts a strigified name as an argument instead of a Name.
*/
- virtual CORBA::Object_ptr resolve_str (const char * n
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
- )
+ virtual CORBA::Object_ptr resolve_str (const char * n)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNaming::NamingContext::NotFound,
@@ -243,7 +240,7 @@ public:
));
/// Returns the Default POA of this Servant object
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual PortableServer::POA_ptr _default_POA (void);
private:
@@ -379,7 +376,7 @@ public:
* same naming server in which the operation was invoked. The
* context is not bound.
*/
- virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual CosNaming::NamingContext_ptr new_context (void) = 0;
/**
* This operation creates a new context and binds it to the name
@@ -398,7 +395,7 @@ public:
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void destroy (void) = 0;
/**
* Returns at most the requested number of bindings <how_many> in
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 6426cb81819..b91e73189d3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -47,7 +47,6 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
command_line.get_ASCII_argv(),
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This function call initializes the Naming Service
CORBA::Object_var object =
@@ -55,7 +54,6 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
command_line.get_argc(),
command_line.get_TCHAR_argv ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -80,13 +78,11 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- int result;
-
// Initializes the Naming Service. Returns -1
// on an error.
- result = this->naming_server_.init_with_orb (argc,
- argv,
- orb);
+ int result = this->naming_server_.init_with_orb (argc,
+ argv,
+ orb);
if (result == -1)
return CORBA::Object::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 9f9543ce3f9..967fdc302fc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -50,8 +50,7 @@ public:
/// ORB and the command line parameters.
virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
int argc,
- ACE_TCHAR *argv[]
- ACE_ENV_ARG_DECL)
+ ACE_TCHAR *argv[])
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 3c20b3b646f..c5ac13bfa05 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -119,7 +119,6 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
orb->resolve_initial_references ("NameService",
timeout
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (naming_obj.in ()))
{
@@ -133,12 +132,10 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->naming_service_ior_ =
orb->object_to_string (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -148,7 +145,6 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
if (TAO_debug_level > 0)
@@ -287,7 +283,6 @@ TAO_Naming_Server::init_with_orb (int argc,
// Get the POA from the ORB.
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
{
@@ -307,15 +302,12 @@ TAO_Naming_Server::init_with_orb (int argc,
// Get the POA object.
this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get the POA_Manager.
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
int numPolicies = 2;
#if (TAO_HAS_MINIMUM_POA == 0)
@@ -336,13 +328,11 @@ TAO_Naming_Server::init_with_orb (int argc,
policies[0] =
this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Lifespan policy
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
if (this->use_servant_activator_)
@@ -351,13 +341,11 @@ TAO_Naming_Server::init_with_orb (int argc,
policies[2] =
this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Servant Retention Policy
policies[3] =
this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
#endif /* TAO_HAS_MINIMUM_POA */
@@ -369,7 +357,6 @@ TAO_Naming_Server::init_with_orb (int argc,
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;
// Creation of the new POAs over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0;
@@ -377,8 +364,7 @@ TAO_Naming_Server::init_with_orb (int argc,
++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
result = this->init (orb,
@@ -401,7 +387,6 @@ TAO_Naming_Server::init_with_orb (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
if (this->ior_file_name_ != 0)
{
@@ -500,7 +485,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
persistence_location,
use_redundancy_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->use_servant_activator_)
persFactory.release();
@@ -539,7 +523,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
TAO_ROOT_NAMING_CONTEXT,
context_size
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
@@ -549,21 +532,17 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
orb->register_initial_reference ("NameService",
this->naming_context_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set the ior of the root Naming Context.
this->naming_service_ior_=
orb->object_to_string (this->naming_context_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var table_object =
orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (adapter.in ()))
{
ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
@@ -573,9 +552,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
CORBA::String_var ior =
orb->object_to_string (this->naming_context_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
#if defined (ACE_HAS_IP_MULTICAST)
@@ -664,22 +641,18 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
polList.length (1);
polList[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
anyObjectVal);
- ACE_TRY_CHECK;
// set a timeout on the orb
//
CORBA::Object_var orbPolicyManagerObj =
orb->resolve_initial_references ("ORBPolicyManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::PolicyManager_var orbPolicyManager =
CORBA::PolicyManager::_narrow (orbPolicyManagerObj.in ());
- ACE_TRY_CHECK;
orbPolicyManager->set_policy_overrides (polList, CORBA::SET_OVERRIDE);
polList[0]->destroy ();
- ACE_TRY_CHECK;
polList[0] = CORBA::Policy::_nil ();
}
#else
@@ -692,7 +665,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -705,17 +677,14 @@ TAO_Naming_Server::fini (void)
ACE_TRY_NEW_ENV
{
this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (adapter.in ()))
{
ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
@@ -723,7 +692,6 @@ TAO_Naming_Server::fini (void)
else
{
adapter->unbind ("NameService" 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 97c2407a6bb..fd126538867 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -149,7 +149,6 @@ TAO_Persistent_Context_Index::init (size_t context_size)
context_size,
this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
@@ -221,10 +220,8 @@ TAO_Persistent_Context_Index::recreate_all (void)
this->poa_->activate_object_with_id (id.in (),
context
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- CosNaming::NamingContext_var result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CosNaming::NamingContext_var result = context->_this ();
// If this is the root Naming Context, take a note of it.
if (context_impl->root ())
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 80b4a7f4aa7..7668d6c26e1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -75,7 +75,6 @@ TAO_Persistent_Bindings_Map::find (const char *id,
{
ACE_DECLARE_NEW_CORBA_ENV;
obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
type = entry.type_;
return 0;
@@ -166,7 +165,6 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
// Obtain a stringified ior of <obj> (i.e., the representation we can store).
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
// object binding.
@@ -337,7 +335,6 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
poa_id,
ind),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (result._retn ());
// Put <context_impl> into the auto pointer temporarily, in case next
// allocation fails.
@@ -362,7 +359,6 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
ACE_NEW_THROW_EX (context,
TAO_Naming_Context (context_impl),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (result._retn ());
// Let <implementation> know about it's <interface>.
context_impl->interface (context);
@@ -379,10 +375,8 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
poa->activate_object_with_id (id.in (),
context
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (result._retn ());
- result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+ result = context->_this ();
// Everything went smoothly, without errors - we don't need any cleanup.
context_impl->set_cleanup_level (0);
@@ -391,13 +385,12 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
}
CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Persistent_Naming_Context::new_context (void)
{
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -418,7 +411,6 @@ TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
this->persistent_context_->total_size (),
this->index_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
return result._retn ();
}
@@ -435,14 +427,12 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (bl,
CosNaming::BindingList (0),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Obtain a lock before we proceed with the operation.
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -455,7 +445,6 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
HASH_MAP::ITERATOR
(*persistent_context_->map ()),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Store <hash_iter temporarily in auto pointer, in case we'll have
// some failures and throw an exception.
@@ -507,7 +496,6 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (bind_iter,
ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Release <hash_iter> from auto pointer, and start using the
// reference counting to control our servant.
@@ -516,8 +504,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ interface_->_add_ref ();
// Register with the POA.
char poa_id[BUFSIZ];
@@ -531,10 +518,8 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
this->poa_->activate_object_with_id (id.in (),
bind_iter
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ bi = bind_iter->_this ();
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 4ad3b2e61c0..eb2b9b0bc11 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -214,7 +214,7 @@ public:
* same naming server in which the operation was invoked. The
* context is not bound.
*/
- virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
+ virtual CosNaming::NamingContext_ptr new_context (void);
/**
* Returns at most the requested number of bindings <how_many> in
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index cdcfa73cb3d..eb4c84cd229 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -183,7 +183,6 @@ TAO_Storable_Bindings_Map::find (const char *id,
{
ACE_DECLARE_NEW_CORBA_ENV;
obj = orb_->string_to_object (entry.ref_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
type = entry.type_;
return 0;
@@ -488,7 +487,6 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
delete context->storable_context_;
// and build a new one from disk
context->load_map(this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -508,7 +506,6 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
{
// Load the map from disk
context->load_map(this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else
@@ -631,7 +628,6 @@ TAO_Storable_Naming_Context::make_new_context (
persistence_directory,
context_size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (result._retn ());
// Put <context_impl> into the auto pointer temporarily, in case next
// allocation fails.
@@ -641,7 +637,6 @@ TAO_Storable_Naming_Context::make_new_context (
ACE_NEW_THROW_EX (context,
TAO_Naming_Context (context_impl),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (result._retn ());
// Let <implementation> know about it's <interface>.
context_impl->interface (context);
@@ -665,7 +660,6 @@ TAO_Storable_Naming_Context::make_new_context (
poa->activate_object_with_id (id.in (),
context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, ex)
{
@@ -674,10 +668,8 @@ TAO_Storable_Naming_Context::make_new_context (
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (result._retn ());
- result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+ result = context->_this ();
// return the address of the new context object so that caller can finish
*new_context = context_impl;
@@ -686,20 +678,18 @@ TAO_Storable_Naming_Context::make_new_context (
}
CosNaming::NamingContext_ptr
-TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Storable_Naming_Context::new_context (void)
{
ACE_TRACE("new_context");
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
{
// Open the backing file
File_Open_Lock_and_Check flck(this, "r"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -762,17 +752,14 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()),
&new_context
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Since this is a new context, make an empty map in it
ACE_NEW_THROW_EX (new_context->storable_context_,
TAO_Storable_Bindings_Map (hash_table_size_,orb_.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
new_context->context_ = new_context->storable_context_;
File_Open_Lock_and_Check flck(new_context, "wc" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
new_context->Write(flck.peer());
return result._retn ();
@@ -795,12 +782,10 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -817,13 +802,11 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
CosNaming::NamingContext_var context =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// If we received a simple name, we need to rebind it in this
// context.
@@ -867,12 +850,10 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -889,13 +870,11 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
CosNaming::NamingContext_var context =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// If we received a simple name, we need to bind it in this context.
else
@@ -933,12 +912,10 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -955,13 +932,11 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
CosNaming::NamingContext_var context =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// If we received a simple name, we need to rebind it in this
// context.
@@ -998,12 +973,10 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
// we didn't need a lock to check the input arg, but now we do
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Open the backing file
File_Open_Lock_and_Check flck(this, "r"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1042,7 +1015,6 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
// Narrow to NamingContext.
context = CosNaming::NamingContext::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (result._retn ());
}
else
// The first name component wasn't bound to a NamingContext.
@@ -1096,12 +1068,10 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1118,13 +1088,11 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
CosNaming::NamingContext_var context =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// If we received a simple name, we need to unbind it in this
// context.
@@ -1156,7 +1124,6 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1167,7 +1134,6 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1185,13 +1151,11 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
CosNaming::NamingContext_var context =
get_context (n ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
CosNaming::Name simple_name;
simple_name.length (1);
simple_name[0] = n[name_len - 1];
return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
}
// If we received a simple name, we need to bind it in this context.
@@ -1203,8 +1167,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
CosNaming::NamingContext::_nil ();
// Create new context.
- result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+ result = new_context ();
// Bind the new context to the name.
ACE_TRY
@@ -1212,7 +1175,6 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
bind_context (n,
result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -1220,7 +1182,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY_EX(DESTROY)
{
- result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ result->destroy ();
ACE_TRY_CHECK_EX(DESTROY);
}
ACE_CATCHANY
@@ -1233,24 +1195,21 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
return result._retn ();
}
void
-TAO_Storable_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Storable_Naming_Context::destroy (void)
{
ACE_TRACE("destroy");
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1278,11 +1237,9 @@ TAO_Storable_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var id =
PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->Write(flck.peer());
}
@@ -1306,12 +1263,10 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1328,13 +1283,11 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
CosNaming::NamingContext_var context =
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 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// If we received a simple name, we need to bind it in this context.
else
@@ -1369,19 +1322,16 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (bl,
CosNaming::BindingList (0),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Obtain a lock before we proceed with the operation.
ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Open the backing file
File_Open_Lock_and_Check flck(this, "r"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -1396,7 +1346,6 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (hash_iter,
HASH_MAP::ITERATOR (storable_context_->map ()),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Store <hash_iter temporarily in auto pointer, in case we'll have
// some failures and throw an exception.
@@ -1458,7 +1407,6 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
ITER_SERVANT (this, hash_iter,
this->poa_.in (), this->lock_),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Release <hash_iter> from auto pointer, and start using
// reference counting to control our servant.
@@ -1467,8 +1415,7 @@ TAO_Storable_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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ interface_->_add_ref ();
// Register with the POA.
char poa_id[BUFSIZ];
@@ -1482,10 +1429,8 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
this->poa_->activate_object_with_id (id.in (),
bind_iter
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ bi = bind_iter->_this ();
#endif /* 0 */
}
}
@@ -1528,7 +1473,6 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
persistence_directory,
&new_context
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Now does this already exist on disk?
ACE_TString file_name(persistence_directory);
@@ -1539,7 +1483,6 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
{
// Load the map from disk
File_Open_Lock_and_Check flck(new_context, "r" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
}
else
{
@@ -1547,10 +1490,8 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
ACE_NEW_THROW_EX (new_context->storable_context_,
TAO_Storable_Bindings_Map (context_size,orb),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
new_context->context_ = new_context->storable_context_;
File_Open_Lock_and_Check flck(new_context, "wc" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
new_context->Write(flck.peer());
}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 87f8bb203a2..752bbf23345 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -274,7 +274,7 @@ public:
* same naming server in which the operation was invoked. The
* context is not bound.
*/
- virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
+ virtual CosNaming::NamingContext_ptr new_context (void);
/**
* Returns at most the requested number of bindings <how_many> in
@@ -360,7 +360,7 @@ public:
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void destroy (void);
protected:
@@ -419,7 +419,6 @@ protected:
* <pre>
* How to use this class:
* File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
- ACE_CHECK;
* </pre>
*/
class File_Open_Lock_and_Check
@@ -428,7 +427,7 @@ public:
/// Constructor - we always need the object which we guard.
File_Open_Lock_and_Check(TAO_Storable_Naming_Context * context,
- const char * mode
+ const char * mode
ACE_ENV_ARG_DECL);
/// Destructor
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index cef31e28bff..07e9e8d10aa 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -83,7 +83,6 @@ TAO_Storable_Naming_Context_Activator::incarnate (
persistence_directory_,
context_size_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
// Put <context_impl> into the auto pointer temporarily, in case next
// allocation fails.
@@ -93,7 +92,6 @@ TAO_Storable_Naming_Context_Activator::incarnate (
ACE_NEW_THROW_EX (context,
TAO_Naming_Context (context_impl),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
// Let <implementation> know about it's <interface>.
context_impl->interface (context);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 06eb43a44b5..61f3fab9594 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -158,7 +158,6 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
poa_id,
context_size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (result._retn ());
// Put <context_impl> into the auto pointer temporarily, in case next
// allocation fails.
@@ -168,7 +167,6 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
ACE_NEW_THROW_EX (context,
TAO_Naming_Context (context_impl),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (result._retn ());
// Let <implementation> know about it's <interface>.
context_impl->interface (context);
@@ -185,22 +183,19 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
poa->activate_object_with_id (id.in (),
context
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (result._retn ());
- result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+ result = context->_this ();
return result._retn ();
}
CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Transient_Naming_Context::new_context (void)
{
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -221,7 +216,6 @@ TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
poa_id,
this->transient_context_->total_size ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
return result._retn ();
}
@@ -238,14 +232,12 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (bl,
CosNaming::BindingList (0),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Obtain a lock before we proceed with the operation.
ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
ace_mon,
this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Check to make sure this object didn't have <destroy> method
// invoked on it.
@@ -257,7 +249,6 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (hash_iter,
HASH_MAP::ITERATOR (transient_context_->map ()),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Store <hash_iter temporarily in auto pointer, in case we'll have
// some failures and throw an exception.
@@ -310,7 +301,6 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
ACE_NEW_THROW_EX (bind_iter,
ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Release <hash_iter> from auto pointer, and start using
// reference counting to control our servant.
@@ -319,8 +309,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ interface_->_add_ref ();
// Register with the POA.
char poa_id[BUFSIZ];
@@ -334,10 +323,8 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
this->poa_->activate_object_with_id (id.in (),
bind_iter
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ bi = bind_iter->_this ();
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 2c3de8a61f3..9cefdaa03bf 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -169,7 +169,7 @@ public:
* same naming server in which the operation was invoked. The
* context is not bound.
*/
- virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
+ virtual CosNaming::NamingContext_ptr new_context (void);
/**
* Returns at most the requested number of bindings <how_many> in
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 48a0a7d9de0..3c14110da0a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -61,11 +61,9 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
ACE_NEW_THROW_EX (proxy_container,
TAO_Notify_Proxy_Container (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->proxy_container_.reset (proxy_container);
- this->proxy_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_container().init ();
}
@@ -73,7 +71,6 @@ void
TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
{
this->proxy_container().remove (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -81,7 +78,6 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// Adopt the Admin's subscription.
TAO_Notify_EventTypeSeq added (this->subscribed_types_), removed;
@@ -92,15 +88,13 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
}
int
-TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Admin::shutdown (void)
{
- int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ int sd_ret = TAO_Notify_Object::shutdown ();
if (sd_ret == 1)
return 1;
- this->proxy_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->proxy_container().shutdown ();
return 0;
}
@@ -128,24 +122,20 @@ TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
bool want_all_children =
saver.begin_object(this->id(), type, attrs, changed
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (want_all_children || this->filter_admin_.is_changed ())
{
this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (want_all_children || this->subscribed_types_.is_changed ())
{
this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy>
wrk(saver, want_all_children);
this->proxy_container().collection()->for_each(&wrk
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
}
@@ -212,11 +202,10 @@ TAO_Notify_Admin::load_child (const ACE_CString &type,
}
void
-TAO_Notify_Admin::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Admin::reconnect (void)
{
TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk;
this->proxy_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index a7a9487c8c4..e7612b1359b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -76,12 +76,12 @@ public:
TAO_Notify_EventChannel * event_channel () const;
/// Shutdown
- virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int shutdown (void);
virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
- virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void reconnect (void);
void set_default (bool is_default);
bool is_default () const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 2c47a4225ef..e8391596dfd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -113,13 +113,12 @@ TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
}
TAO_Notify_Event *
-TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::copy (void) const
{
TAO_Notify_Event * new_event;
ACE_NEW_THROW_EX (new_event,
TAO_Notify_AnyEvent (*this->event_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return new_event;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 49c5604065f..8be01ffb9e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -80,7 +80,7 @@ public:
protected:
/// returns a copy of this event allocated from the heap
- virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const;
+ virtual TAO_Notify_Event * copy (void) const;
protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index bcaef713001..8127458dc43 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -66,19 +66,18 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup
CORBA::NO_MEMORY ());
supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (supplier ACE_ENV_ARG_PARAMETER);
}
void
-TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
}
const char *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 4690fc1fcdd..b60eb88a621 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -66,7 +66,7 @@ protected:
CosEventChannelAdmin::AlreadyConnected
));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 694b6c378b5..5df37a9f493 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -41,19 +41,18 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon
CORBA::NO_MEMORY ());
consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (consumer ACE_ENV_ARG_PARAMETER);
}
void
-TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
}
const char *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 2ae0cda9608..1dc113b8651 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -28,7 +28,7 @@ TAO_Notify_ProxyPushConsumer::release (void)
}
CosNotifyChannelAdmin::ProxyType
-TAO_Notify_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ProxyPushConsumer::MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -71,22 +71,19 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl
CORBA::NO_MEMORY ());
supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
-void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_ProxyPushConsumer::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
+ this->self_change ();
}
const char *
@@ -106,21 +103,17 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- ACE_TRY_CHECK;
CosNotifyComm::PushSupplier_var ps = CosNotifyComm::PushSupplier::_nil();
if ( ior.length() > 0 )
{
CORBA::Object_var obj =
orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// minor hack: suppress generating subscription updates during reload.
bool save_updates = this->updates_off_;
this->updates_off_ = true;
this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->updates_off_ = save_updates;
}
ACE_CATCHALL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 5d7bb8b4b8e..27fe56d4d77 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -59,7 +59,7 @@ public:
protected:
///= CosNotifyChannelAdmin::ProxyPushConsumer methods
- virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::ProxyType MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -76,7 +76,7 @@ protected:
CosEventChannelAdmin::AlreadyConnected
));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index d478b3253cc..dbfd412363f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -41,27 +41,24 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu
CORBA::NO_MEMORY ());
consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
void
-TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_ProxyPushSupplier::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
+ this->self_change ();
}
CosNotifyChannelAdmin::ProxyType
-TAO_Notify_ProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ProxyPushSupplier::MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -92,12 +89,9 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
{
CORBA::Object_var obj =
orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index e9450202c1c..430c1747f0d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -60,7 +60,7 @@ public:
virtual void load_attrs (const TAO_Notify::NVPList& attrs);
// = Interface methods
- virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::ProxyType MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 920eb001c33..6baa5f766d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -45,7 +45,6 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
this->publish_ =
CosNotifyComm::NotifyPublish::_narrow (push_consumer ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -58,9 +57,8 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
CosEventComm::PushConsumer_var new_cos_comm_pc =
CosEventComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->push_consumer_ =
+ this->push_consumer_ =
CosEventComm::PushConsumer::_duplicate (new_cos_comm_pc.in());
//
@@ -72,10 +70,9 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
// this->publish_ is in TAO_NS_Consumer::dispatch_updates_i (the superclass).
// If any other use is made of this data member, then the code to validate
// the actual type of the target object must be refactored.
- this->publish_ =
+ this->publish_ =
CosNotifyComm::NotifyPublish::_unchecked_narrow (obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//--cj verify dispatching ORB
@@ -147,7 +144,6 @@ TAO_Notify_PushConsumer::get_ior (void) const
ACE_TRY
{
CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = static_cast<const char*> (ior.in ());
}
ACE_CATCHANY
@@ -166,7 +162,6 @@ TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consu
dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer);
ACE_ASSERT(tmp != 0);
this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->schedule_timer(false);
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index e60246795e2..cca08ba88c6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -26,7 +26,6 @@ TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_
ACE_TRY
{
this->subscribe_ = CosNotifyComm::NotifySubscribe::_narrow (push_supplier ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -51,7 +50,6 @@ TAO_Notify_PushSupplier::get_ior (void) const
ACE_TRY
{
CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = static_cast<const char*> (ior.in ());
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index bab9d61ecf0..84fd5bde0e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -56,27 +56,21 @@ public:
PROXY_IMPL* proxy = 0;
factory->create (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy_ret._retn ());
PortableServer::ServantBase_var servant (proxy);
proxy->init (parent ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy_ret._retn ());
proxy->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy_ret._retn ());
CORBA::Object_var obj = proxy->activate (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy_ret._retn ());
proxy_id = proxy->id ();
proxy_ret = PROXY::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy_ret._retn ());
// insert proxy in admin container.
parent->insert (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PROXY::_nil ());
return proxy_ret._retn ();
}
@@ -89,19 +83,15 @@ public:
PROXY_IMPL* proxy = 0;
factory->create (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
PortableServer::ServantBase_var servant (proxy);
proxy->init (parent ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
proxy->activate (proxy, proxy_id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// insert proxy in admin container.
parent->insert (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return proxy;
}
@@ -177,7 +167,7 @@ TAO_Notify_Builder::~TAO_Notify_Builder ()
}
CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Builder::build_filter_factory (void)
{
TAO_Notify_FilterFactory* ff = ACE_Dynamic_Service<TAO_Notify_FilterFactory>::instance ("TAO_Notify_FilterFactory");
@@ -186,7 +176,6 @@ TAO_Notify_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (ff,
TAO_Notify_ETCL_FilterFactory (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
}
PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
@@ -204,12 +193,9 @@ TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE
// Create ECF
TAO_Notify_EventChannelFactory* ecf = 0;
factory->create (ecf ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf_ret._retn ());
ecf->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf_ret._retn ());
- ecf_ret = ecf->activate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (ecf_ret._retn ());
+ ecf_ret = ecf->activate_self ();
return (ecf_ret._retn ());
}
@@ -227,23 +213,18 @@ TAO_Notify_Builder::build_event_channel (
TAO_Notify_EventChannel* ec = 0;
factory->create (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec_ret._retn ());
ec->init (ecf, initial_qos, initial_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec_ret._retn ());
// insert ec in ec container.
ecf->ec_container().insert (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec_ret._retn ());
CORBA::Object_var obj = ec->activate (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec_ret._retn ());
// Populate the ID to return.
id = ec->id ();
ec_ret = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ec_ret._retn ());
return ec_ret._retn ();
}
@@ -257,17 +238,13 @@ TAO_Notify_Builder::build_event_channel (
TAO_Notify_EventChannel* ec = 0;
factory->create (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ec->init (ecf ACE_ENV_ARG_PARAMETER); //, initial_qos, initial_admin
- ACE_CHECK_RETURN (0);
// insert ec in ec container.
ecf->ec_container().insert (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ec->activate (ec, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return ec;
}
@@ -284,24 +261,19 @@ TAO_Notify_Builder::build_consumer_admin (
TAO_Notify_ConsumerAdmin* ca = 0;
factory->create (ca ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca_ret._retn ());
ca->init (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca_ret._retn ());
ca->filter_operator (op);
CORBA::Object_var obj = ca->activate (ca ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca_ret._retn ());
id = ca->id ();
ca_ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca_ret._retn ());
// insert admin in CA container.
ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca_ret._retn ());
return ca_ret._retn ();
}
@@ -315,17 +287,13 @@ TAO_Notify_Builder::build_consumer_admin (
TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
TAO_Notify_ConsumerAdmin * ca = 0;
factory->create (ca ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ca->init (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Object_var obj = ca->activate (ca, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// insert admin in CA container.
ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return ca;
}
@@ -338,24 +306,19 @@ TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotify
TAO_Notify_SupplierAdmin* sa = 0;
factory->create (sa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa_ret._retn ());
sa->init (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa_ret._retn ());
sa->filter_operator (op);
CORBA::Object_var obj = sa->activate (sa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa_ret._retn ());
id = sa->id ();
sa_ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa_ret._retn ());
// insert admin in SA container.
ec->sa_container().insert (sa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa_ret._retn ());
return sa_ret._retn ();
}
@@ -369,17 +332,13 @@ TAO_Notify_Builder::build_supplier_admin (
TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
TAO_Notify_SupplierAdmin * sa = 0;
factory->create (sa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
sa->init (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Object_var obj = sa->activate (sa, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// insert admin in CA container.
ec->sa_container().insert (sa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return sa;
}
@@ -558,12 +517,10 @@ TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object ACE_EN
ACE_NEW_THROW_EX (worker_task,
TAO_Notify_Reactive_Task (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
object.set_worker_task (worker_task);
- worker_task->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ worker_task->init ();
}
void
@@ -574,12 +531,10 @@ TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, co
ACE_NEW_THROW_EX (worker_task,
TAO_Notify_ThreadPool_Task (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
object.set_worker_task (worker_task);
worker_task->init (tp_params, object.admin_properties_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 96a7d9ef8a7..8f57e06a484 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -66,11 +66,11 @@ TAO_Notify_Consumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties
}
void
-TAO_Notify_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Consumer::resume (void)
{
this->is_suspended_ = 0;
- this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->dispatch_pending ();
}
void
@@ -79,14 +79,12 @@ TAO_Notify_Consumer::enqueue_request (
ACE_ENV_ARG_DECL)
{
TAO_Notify_Event::Ptr event (
- request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ request->event ()->queueable_copy ());
TAO_Notify_Method_Request_Event_Queueable * queue_entry;
ACE_NEW_THROW_EX (queue_entry,
TAO_Notify_Method_Request_Event_Queueable (*request, event),
CORBA::NO_MEMORY ());
- ACE_CHECK;
if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG,
ACE_TEXT ("Consumer %d: enqueue_request (%d) @%@.\n"),
@@ -111,14 +109,12 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
request->sequence ()
));
TAO_Notify_Event::Ptr event (
- request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK_RETURN (false);
+ request->event ()->queueable_copy ());
TAO_Notify_Method_Request_Event_Queueable * queue_entry;
ACE_NEW_THROW_EX (queue_entry,
TAO_Notify_Method_Request_Event_Queueable (*request,
event),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (false);
this->pending_events().enqueue_tail (queue_entry);
this->schedule_timer (false);
return true;
@@ -132,14 +128,12 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
request->sequence ()
));
TAO_Notify_Event::Ptr event (
- request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK_RETURN (false);
+ request->event ()->queueable_copy ());
TAO_Notify_Method_Request_Event_Queueable * queue_entry;
ACE_NEW_THROW_EX (queue_entry,
TAO_Notify_Method_Request_Event_Queueable (*request,
event),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (false);
this->pending_events().enqueue_tail (queue_entry);
this->schedule_timer (false);
return true;
@@ -155,7 +149,6 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
// from being deleted while the push is in progress.
TAO_Notify_Proxy::Ptr proxy_guard (this->proxy ());
bool queued = enqueue_if_necessary (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!queued)
{
DispatchStatus status = this->dispatch_request (request);
@@ -175,7 +168,6 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
static_cast<int> (this->proxy ()->id ()),
request->sequence ()));
this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->schedule_timer (true);
break;
}
@@ -204,8 +196,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
ACE_DECLARE_NEW_ENV;
ACE_TRY
{
- this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_supplier ()->destroy ();
}
ACE_CATCHANY
{
@@ -227,7 +218,6 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
ACE_TRY
{
request->event ()->push (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (DEBUG_LEVEL > 8)
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Consumer %d dispatched single event %d.\n"),
@@ -364,7 +354,6 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
ACE_TRY
{
this->push (batch ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
@@ -467,7 +456,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
}
void
-TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::dispatch_pending (void)
{
if (DEBUG_LEVEL > 5)
ACE_DEBUG ((LM_DEBUG,
@@ -563,8 +552,7 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T
ACE_DECLARE_NEW_ENV;
ACE_TRY
{
- this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_supplier ()->destroy ();
}
ACE_CATCHANY
{
@@ -659,8 +647,7 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
ACE_DECLARE_NEW_ENV;
ACE_TRY
{
- this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->dispatch_pending ();
}
ACE_CATCHALL
{
@@ -671,7 +658,7 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
}
void
-TAO_Notify_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::shutdown (void)
{
if (this->timer_.isSet ())
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 89058b6492e..68e14d7535d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -83,19 +83,19 @@ public:
DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch);
/// Dispatch the pending events
- void dispatch_pending (ACE_ENV_SINGLE_ARG_DECL);
+ void dispatch_pending (void);
/// Is the connection suspended?
CORBA::Boolean is_suspended (void);
/// Suspend Connection
- void suspend (ACE_ENV_SINGLE_ARG_DECL);
+ void suspend (void);
/// Resume Connection
- void resume (ACE_ENV_SINGLE_ARG_DECL);
+ void resume (void);
/// Shutdown the consumer
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
/// on reconnect we need to move events from the old consumer
/// to the new one
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index c1dcd33bbe7..bc0be7f45e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -19,7 +19,7 @@ TAO_Notify_Consumer::is_suspended (void)
}
ACE_INLINE void
-TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::suspend (void)
{
this->is_suspended_ = 1;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 7b10e3bd40b..3d5bca9accf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -58,23 +58,21 @@ void
TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
{
TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const CosNotification::QoSProperties &default_ca_qos =
TAO_Notify_PROPERTIES::instance ()->default_consumer_admin_qos_properties ();
this->set_qos (default_ca_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_ConsumerAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_Notify_ConsumerAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -87,18 +85,16 @@ TAO_Notify_ConsumerAdmin::release (void)
}
void
-TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int result = this->shutdown ();
if ( result == 1)
return;
this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -114,7 +110,6 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else if (type == "structured_proxy_push_supplier")
{
@@ -123,7 +118,6 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else if (type == "sequence_proxy_push_supplier")
{
@@ -132,7 +126,6 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
#if 0
else if (type == "ec_proxy_push_supplier")
@@ -142,13 +135,11 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
#endif
else
{
result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return result;
}
@@ -165,7 +156,6 @@ TAO_Notify_ConsumerAdmin::load_proxy (
, ctype
, id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ACE_ASSERT(proxy != 0);
proxy->load_attrs (attrs);
return proxy;
@@ -189,9 +179,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm
, proxy_id
, initial_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
+ this->self_change ();
return proxy._retn ();
}
@@ -213,28 +201,24 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
, proxy_id
, initial_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
+ this->self_change ();
return proxy._retn ();
}
CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
CosEventChannelAdmin::ProxyPushSupplier_var proxy =
TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
+ this->self_change ();
return proxy._retn ();
}
CosNotifyChannelAdmin::AdminID
-TAO_Notify_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::MyID (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -243,16 +227,16 @@ TAO_Notify_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ConsumerAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::MyChannel (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->ec_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ec_->_this ();
}
::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::MyOperator (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -261,7 +245,7 @@ TAO_Notify_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::push_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -294,12 +278,12 @@ void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & q
CosNotification::QoSProperties*
-TAO_Notify_ConsumerAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_Notify_Object::get_qos ();
}
void
@@ -318,17 +302,14 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
this->subscribed_types_.add_and_remove (seq_added, seq_removed);
TAO_Notify_Subscription_Change_Worker worker (added, removed);
this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->self_change ();
}
CosNotifyFilter::FilterID
@@ -339,9 +320,7 @@ TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE
{
CosNotifyFilter::FilterID fid =
this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (fid);
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (fid);
+ this->self_change ();
return fid;
}
@@ -366,27 +345,27 @@ TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_A
}
::CosNotifyFilter::FilterIDSeq*
-TAO_Notify_ConsumerAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->filter_admin_.get_all_filters ();
}
void
-TAO_Notify_ConsumerAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->filter_admin_.remove_all_filters ();
}
/************ UNIMPLMENTED METHODS *************************/
CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::priority_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -405,7 +384,7 @@ TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*
}
CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::lifetime_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -424,7 +403,7 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*
}
::CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::pull_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -459,7 +438,7 @@ TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /
}
CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_Notify_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -479,7 +458,6 @@ TAO_Notify_ConsumerAdmin::find_proxy_supplier (
{
TAO_Notify_ProxySupplier_Find_Worker find_worker;
TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
result = dynamic_cast <TAO_Notify_ProxySupplier *> (proxy);
}
return result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index a17453cfc07..6680e7126b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -54,8 +54,8 @@ public:
void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
/// ServantBase refcount methods.
- virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
virtual const char * get_admin_type_name () const;
@@ -92,7 +92,7 @@ protected:
));
/// = CosNotifyChannelAdmin::ConsumerAdmin methods
- virtual CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::AdminID MyID (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -104,7 +104,7 @@ protected:
CORBA::SystemException
));
- virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -121,7 +121,7 @@ protected:
CORBA::SystemException
));
- virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -132,12 +132,12 @@ protected:
CORBA::SystemException
));
- virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -167,12 +167,12 @@ protected:
, CosNotifyChannelAdmin::AdminLimitExceeded
));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosNotification::QoSProperties * get_qos (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotification::QoSProperties * get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -217,22 +217,22 @@ protected:
, CosNotifyFilter::FilterNotFound
));
- virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index 3656e3dca86..f90aa3e3373 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -31,7 +31,7 @@ TAO_Notify_Container_T<TYPE>::~TAO_Notify_Container_T ()
}
template <class TYPE> void
-TAO_Notify_Container_T<TYPE>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::shutdown (void)
{
TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
@@ -51,7 +51,7 @@ TAO_Notify_Container_T<TYPE>::remove (TYPE* type ACE_ENV_ARG_DECL)
}
template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::init (void)
{
// get the factory
TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 9c06930d1b2..13cf3041e37 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -44,7 +44,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
virtual ~TAO_Notify_Container_T ();
/// Init this object.
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
/// Insert object to this container.
virtual void insert (TYPE* type ACE_ENV_ARG_DECL);
@@ -53,7 +53,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
virtual void remove (TYPE* type ACE_ENV_ARG_DECL);
/// Shutdown
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
/// Collection
COLLECTION* collection (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 3e095e32f73..9db94d2b2b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -234,7 +234,6 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
char **argv = &argv0; // ansi requires argv be null terminated.
CORBA::ORB_var dispatcher = CORBA::ORB_init (argc, argv,
"default_dispatcher" ACE_ENV_ARG_PARAMETER);
- //ACE_CHECK_RETURN (-1);
TAO_Notify_PROPERTIES::instance()->dispatching_orb(dispatcher.in());
}
@@ -252,7 +251,6 @@ void
TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
{
this->init_i2 (orb, dispatching_orb ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -261,14 +259,12 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
// Obtain the Root POA
CORBA::Object_var object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (object.in ()))
ACE_ERROR ((LM_ERROR,
" (%P|%t) Unable to resolve the RootPOA.\n"));
PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Set the properties
TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -277,13 +273,11 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
properties->default_poa (default_poa.in ());
// Init the factory
- this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ this->factory_.reset (this->create_factory ());
ACE_ASSERT( this->factory_.get() != 0 );
TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
- this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ this->builder_.reset (this->create_builder ());
ACE_ASSERT( this->builder_.get() != 0 );
TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
}
@@ -294,13 +288,11 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o
// Obtain the Root POA
CORBA::Object_var object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (object.in ()))
ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n"));
PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Set the properties
TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -312,19 +304,17 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o
properties->default_poa (default_poa.in ());
// Init the factory and builder
- this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ this->factory_.reset (this->create_factory ());
ACE_ASSERT( this->factory_.get() != 0 );
TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
- this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ this->builder_.reset (this->create_builder ());
ACE_ASSERT( this->builder_.get() != 0 );
TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
}
TAO_Notify_Factory*
-TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosNotify_Service::create_factory (void)
{
TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
if (factory == 0)
@@ -332,19 +322,17 @@ TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (factory,
TAO_Notify_Default_Factory (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
}
return factory;
}
TAO_Notify_Builder*
-TAO_CosNotify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosNotify_Service::create_builder (void)
{
TAO_Notify_Builder* builder = 0;
ACE_NEW_THROW_EX (builder,
TAO_Notify_Builder (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return builder;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index c3e2e8ebd47..45c881e6fff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -69,10 +69,10 @@ protected:
private:
/// Create the Factory for Notify objects.
- virtual TAO_Notify_Factory* create_factory (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Factory* create_factory (void);
/// Create the Builder for Notify objects.
- virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Builder* create_builder (void);
/// Set thread options on <qos>.
void set_threads (CosNotification::QoSProperties &qos, int threads);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index ca9765dc57e..3cbadd32339 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -21,8 +21,7 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
{
ACE_TRY_NEW_ENV
{
- this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->remove_all_constraints ();
}
ACE_CATCHANY
{
@@ -38,7 +37,7 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
}
char*
-TAO_Notify_ETCL_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ETCL_Filter::constraint_grammar (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -69,7 +68,6 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo
notify_constr_expr->interpreter.
build_tree (expr.constraint_expr.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
notify_constr_expr->constr_expr = expr;
@@ -96,7 +94,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
CORBA::ULong constraint_length = constraint_list.length ();
@@ -109,7 +106,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
ACE_NEW_THROW_EX (infoseq_ptr,
CosNotifyFilter::ConstraintInfoSeq (constraint_length),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
infoseq->length (constraint_length);
@@ -130,7 +126,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
}
this->add_constraints_i (infoseq.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return infoseq._retn ();
}
@@ -148,7 +143,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// First check if all the ids are valid.
u_int index;
@@ -190,7 +184,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
{
this->add_constraints_i (modify_list
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -206,7 +199,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
// Now go around deleting...
// for the del_list.
@@ -234,14 +226,12 @@ TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// Create the list that goes out.
CosNotifyFilter::ConstraintInfoSeq *infoseq_ptr;
ACE_NEW_THROW_EX (infoseq_ptr,
CosNotifyFilter::ConstraintInfoSeq (id_list.length ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
@@ -265,12 +255,11 @@ TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq
}
CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::get_all_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
CORBA::ULong current_size = static_cast<CORBA::ULong> (this->constraint_expr_list_.current_size ());
@@ -279,7 +268,6 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (infoseq_ptr,
CosNotifyFilter::ConstraintInfoSeq (current_size),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
@@ -307,18 +295,17 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Notify_ETCL_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::remove_all_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
- this->remove_all_constraints_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->remove_all_constraints_i ();
}
void
-TAO_Notify_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ETCL_Filter::remove_all_constraints_i (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
@@ -339,15 +326,13 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_US
}
void
-TAO_Notify_ETCL_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
- this->remove_all_constraints_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->remove_all_constraints_i ();
PortableServer::POA_var my_POA = _default_POA ();
@@ -375,7 +360,6 @@ TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// We want to return true if at least one constraint matches.
CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
@@ -438,7 +422,7 @@ TAO_Notify_ETCL_Filter::detach_callback (
}
CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::get_callbacks (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 758c3ea4e38..6e42fcb61b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -50,7 +50,7 @@ public:
virtual ~TAO_Notify_ETCL_Filter ();
protected:
- virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * constraint_grammar (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -77,17 +77,17 @@ protected:
CosNotifyFilter::ConstraintNotFound
));
- virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void remove_all_constraints (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -121,7 +121,7 @@ protected:
CosNotifyFilter::CallbackNotFound
));
- virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -133,7 +133,7 @@ private:
CosNotifyFilter::InvalidConstraint
));
- void remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL)
+ void remove_all_constraints_i (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 25d53cd5370..43eba4faad7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -23,7 +23,7 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_E
PortableServer::ServantBase_var servant_var (this);
- return _this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return _this ();
}
CosNotifyFilter::Filter_ptr
@@ -52,12 +52,10 @@ TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE
PortableServer::ObjectId_var oid =
this->filter_poa_->activate_object (filter
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
CORBA::Object_var obj =
this->filter_poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
return CosNotifyFilter::Filter::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 1b44711ce46..796d717836f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -88,7 +88,7 @@ public:
virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
/// Return a pointer to a copy of this event on the heap
- TAO_Notify_Event* queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const;
+ TAO_Notify_Event* queueable_copy (void) const;
/// marshal this event into a CDR buffer (for persistence)
virtual void marshal (TAO_OutputCDR& cdr) const = 0;
@@ -120,7 +120,7 @@ protected:
private:
/// Return a pointer to a copy of this event on the heap
- virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+ virtual TAO_Notify_Event* copy (void) const = 0;
virtual void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index 36bdd57e0f5..d8635cf5bc9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -24,7 +24,7 @@ TAO_Notify_Event::reliable (void) const
ACE_INLINE
TAO_Notify_Event*
-TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_Event::queueable_copy (void) const
{
if ( is_on_heap_ )
{
@@ -32,8 +32,7 @@ TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const
}
else if (this->clone_.get() == 0)
{
- TAO_Notify_Event* copied = this->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ TAO_Notify_Event* copied = this->copy ();
copied->is_on_heap_ = true;
this->clone_.reset( copied );
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index a55f5e44f6c..5320a872059 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -72,29 +72,24 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
ACE_NEW_THROW_EX (ca_container,
TAO_Notify_ConsumerAdmin_Container (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->ca_container_.reset (ca_container);
- this->ca_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ca_container().init ();
// Init ca_container_
TAO_Notify_SupplierAdmin_Container* sa_container = 0;
ACE_NEW_THROW_EX (sa_container,
TAO_Notify_SupplierAdmin_Container (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->sa_container_.reset (sa_container);
- this->sa_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->sa_container().init ();
// Set the admin properties.
TAO_Notify_AdminProperties* admin_properties = 0;
ACE_NEW_THROW_EX (admin_properties,
TAO_Notify_AdminProperties (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
this->set_admin_properties (admin_properties);
// create the event manager. @@ use factory
@@ -102,23 +97,18 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
ACE_NEW_THROW_EX (event_manager,
TAO_Notify_Event_Manager (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->set_event_manager (event_manager);
- this->event_manager().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_manager().init ();
const CosNotification::QoSProperties &default_ec_qos =
TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->set_admin (initial_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Note originally default admins were allocated here, bt this caused problems
// attempting to save the topology changes before the Event Channel was completely
@@ -142,29 +132,24 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D
ACE_NEW_THROW_EX (ca_container,
TAO_Notify_ConsumerAdmin_Container (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->ca_container_.reset (ca_container);
- this->ca_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ca_container().init ();
TAO_Notify_SupplierAdmin_Container* sa_container = 0;
// Init ca_container_
ACE_NEW_THROW_EX (sa_container,
TAO_Notify_SupplierAdmin_Container (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->sa_container_.reset (sa_container);
- this->sa_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->sa_container().init ();
// Set the admin properties.
TAO_Notify_AdminProperties* admin_properties = 0;
ACE_NEW_THROW_EX (admin_properties,
TAO_Notify_AdminProperties (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
this->set_admin_properties (admin_properties);
// create the event manager. @@ use factory
@@ -172,29 +157,26 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D
ACE_NEW_THROW_EX (event_manager,
TAO_Notify_Event_Manager (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->set_event_manager (event_manager);
- this->event_manager().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_manager().init ();
const CosNotification::QoSProperties &default_ec_qos =
TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_EventChannel::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_Notify_EventChannel::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -207,19 +189,16 @@ TAO_Notify_EventChannel::release (void)
}
int
-TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::shutdown (void)
{
- int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ int sd_ret = TAO_Notify_Object::shutdown ();
if (sd_ret == 1)
return 1;
- this->ca_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->ca_container().shutdown ();
- this->sa_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->sa_container().shutdown ();
this->event_manager().shutdown ();
@@ -227,20 +206,18 @@ TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Notify_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_EventChannel::Ptr guard( this );
- int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int result = this->shutdown ();
if ( result == 1)
return;
this->ecf_->remove (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sa_container_.reset( 0 );
this->ca_container_.reset( 0 );
@@ -269,25 +246,25 @@ TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos ACE
}
CosNotification::QoSProperties*
-TAO_Notify_EventChannel::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_Notify_Object::get_qos ();
}
CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannel::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::MyFactory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->ecf_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ecf_->_this ();
}
CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::default_consumer_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -299,13 +276,11 @@ TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
{
CosNotifyChannelAdmin::AdminID id;
this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil());
// Wish there was a better way to do this!
PortableServer::ServantBase * admin_servant =
this->poa()->reference_to_servant (
this->default_consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil());
TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
if (pAdmin != 0)
@@ -318,7 +293,7 @@ TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::default_supplier_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -330,12 +305,10 @@ TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
{
CosNotifyChannelAdmin::AdminID id;
this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil());
PortableServer::ServantBase * admin_servant =
this->poa()->poa()->reference_to_servant (
this->default_supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
if (pAdmin != 0)
@@ -347,12 +320,12 @@ TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (this->default_supplier_admin_.in ());
}
-::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->ecf_->get_default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ecf_->get_default_filter_factory ();
}
::CosNotifyChannelAdmin::ConsumerAdmin_ptr
@@ -366,9 +339,7 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr
{
::CosNotifyChannelAdmin::ConsumerAdmin_var ca =
TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (ca._retn ());
+ this->self_change ();
return ca._retn ();
}
@@ -383,9 +354,7 @@ TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGr
{
::CosNotifyChannelAdmin::SupplierAdmin_var sa =
TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (sa._retn ());
+ this->self_change ();
return sa._retn ();
}
@@ -414,7 +383,7 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id AC
}
CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_all_consumeradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -425,7 +394,7 @@ TAO_Notify_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_all_supplieradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -446,7 +415,7 @@ TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & adm
}
CosNotification::AdminProperties*
-TAO_Notify_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -463,21 +432,21 @@ TAO_Notify_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
}
CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::for_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->default_consumer_admin(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->default_consumer_admin();
}
CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::for_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->default_supplier_admin ();
}
void
@@ -507,16 +476,13 @@ TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
bool want_all_children = saver.begin_object(
this->id(), "channel", attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin> ca_wrk(saver, want_all_children);
this->ca_container().collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Notify::Save_Persist_Worker<TAO_Notify_SupplierAdmin> sa_wrk(saver, want_all_children);
this->sa_container().collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
saver.end_object(this->id(), "channel" ACE_ENV_ARG_PARAMETER);
}
@@ -573,16 +539,13 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
this,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ca->load_attrs (attrs);
if (ca->is_default ())
{
CORBA::Object_var caob = this->poa()->servant_to_reference (ca ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->default_consumer_admin_ =
CosNotifyChannelAdmin::ConsumerAdmin::_narrow (
caob.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
result = ca;
}
@@ -598,16 +561,13 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
this,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
sa->load_attrs (attrs);
if (sa->is_default ())
{
CORBA::Object_var saob = this->poa()->servant_to_reference (sa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->default_supplier_admin_ =
CosNotifyChannelAdmin::SupplierAdmin::_narrow (
saob.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
result = sa;
}
@@ -622,13 +582,11 @@ TAO_Notify_EventChannel::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_
{
TAO_Notify_SupplierAdmin_Find_Worker find_worker;
TAO_Notify_SupplierAdmin * admin = find_worker.find (id_path[position], this->sa_container() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
++position;
if (admin != 0)
{
result = admin->find_proxy_consumer (id_path, position
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
}
return result;
@@ -643,13 +601,11 @@ TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_
{
TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
TAO_Notify_ConsumerAdmin * admin = find_worker.find (id_path[position], this->ca_container() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
++position;
if (admin != 0)
{
result = admin->find_proxy_supplier (id_path, position
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
}
return result;
@@ -657,15 +613,13 @@ TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_
void
-TAO_Notify_EventChannel::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::reconnect (void)
{
TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk;
this->ca_container().collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Notify::Reconnect_Worker<TAO_Notify_SupplierAdmin> sa_wrk;
this->sa_container().collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_Notify_EventChannel::TAO_Notify_ConsumerAdmin_Container&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index 2fe1c13ff05..bdcfc84df8c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -79,8 +79,8 @@ public:
void remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
/// ServantBase refcount methods.
- virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
// TAO_Notify::Topology_Parent
@@ -89,7 +89,7 @@ public:
CORBA::Long id,
const TAO_Notify::NVPList& attrs
ACE_ENV_ARG_DECL);
- virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void reconnect (void);
virtual TAO_Notify_Object::ID get_id () const {return id();}
@@ -97,7 +97,7 @@ public:
TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL);
/// Shutdown
- virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int shutdown (void);
virtual void load_attrs(const TAO_Notify::NVPList& attrs);
private:
@@ -120,7 +120,7 @@ private:
/// =CosNotifyChannelAdmin::EventChannel methods
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -145,7 +145,7 @@ private:
CORBA::SystemException
));
- virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -178,17 +178,17 @@ private:
, CosNotifyChannelAdmin::AdminNotFound
));
- virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosNotification::QoSProperties * get_qos (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotification::QoSProperties * get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -208,7 +208,7 @@ private:
, CosNotification::UnsupportedQoS
));
- virtual ::CosNotification::AdminProperties * get_admin (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotification::AdminProperties * get_admin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -219,12 +219,12 @@ private:
, CosNotification::UnsupportedAdmin
));
- virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 2cf855c3009..7205d8831eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -60,13 +60,12 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory ()
}
void
-TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int result = this->shutdown ();
if ( result == 1)
return;
@@ -85,19 +84,16 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
ACE_ASSERT (this->ec_container_.get() == 0);
this->default_filter_factory_ =
- TAO_Notify_PROPERTIES::instance()->builder()->build_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Notify_PROPERTIES::instance()->builder()->build_filter_factory ();
// Init ec_container_
TAO_Notify_EventChannel_Container* ecc = 0;
ACE_NEW_THROW_EX (ecc,
TAO_Notify_EventChannel_Container (),
CORBA::INTERNAL ());
- ACE_CHECK;
this->ec_container_.reset( ecc );
- this->ec_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_container().init ();
TAO_Notify_POA_Helper* object_poa = 0;
@@ -105,12 +101,10 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
ACE_NEW_THROW_EX (object_poa,
TAO_Notify_POA_Helper (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
object_poa->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->adopt_poa (auto_object_poa.release ());
@@ -119,21 +113,19 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
this->topology_factory_ =
ACE_Dynamic_Service <TAO_Notify::Topology_Factory>::instance ("Topology_Factory");
- this->load_topology (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->load_topology ();
- this->load_event_persistence (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->load_event_persistence ();
}
void
-TAO_Notify_EventChannelFactory::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_Notify_EventChannelFactory::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -149,27 +141,24 @@ void
TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel ACE_ENV_ARG_DECL)
{
this->ec_container().remove (event_channel ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
int
-TAO_Notify_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::shutdown (void)
{
- int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ int sd_ret = TAO_Notify_Object::shutdown ();
if (sd_ret == 1)
return 1;
- this->ec_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->ec_container().shutdown ();
return 0;
}
CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
{
return CosNotifyFilter::FilterFactory::_duplicate (this->default_filter_factory_.in ());
}
@@ -191,14 +180,12 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D
, initial_admin
, id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
+ this->self_change ();
return ec._retn ();
}
CosNotifyChannelAdmin::ChannelIDSeq*
-TAO_Notify_EventChannelFactory::get_all_channels (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::get_all_channels (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -233,7 +220,7 @@ TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factor
}
void
-TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::load_topology (void)
{
this->loading_topology_ = true;
if (this->topology_factory_ != 0)
@@ -243,7 +230,6 @@ TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL)
if (tl.get () != 0)
{
tl->load (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else
@@ -270,7 +256,6 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav
bool want_all_children =
saver.begin_object(0, "channel_factory", attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// for each deleted child
// delete_child // if the child has persistence.
@@ -278,18 +263,16 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav
TAO_Notify::Save_Persist_Worker<TAO_Notify_EventChannel> wrk(saver, want_all_children);
this->ec_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (want_all_children || this->reconnect_registry_.is_changed ())
{
this->reconnect_registry_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
saver.end_object(0, "channel_factory" ACE_ENV_ARG_PARAMETER);
}
void
-TAO_Notify_EventChannelFactory::load_event_persistence (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::load_event_persistence (void)
{
TAO_Notify::Event_Persistence_Strategy * strategy =
ACE_Dynamic_Service <TAO_Notify::Event_Persistence_Strategy>::instance ("Event_Persistence");
@@ -327,13 +310,12 @@ TAO_Notify_EventChannelFactory::load_event_persistence (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("(%P|%t) Notify Service: Configuration error. Event Persistence requires Topology Persistence.\n")
));
ACE_THROW (CORBA::PERSIST_STORE());
- ACE_CHECK;
}
}
}
bool
-TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::change_to_parent (void)
{
bool saving = false;
if (! this->loading_topology_)
@@ -348,16 +330,13 @@ TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
// just return. Caller will signal change again if necessary.
short seq = this->topology_save_seq_;
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->topology_save_lock_, CORBA::INTERNAL ());
- ACE_CHECK_RETURN(false);
if (seq == this->topology_save_seq_)
{
auto_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
if (saver.get() != 0)
{
this->save_persistent(*saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(false);
- saver->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ saver->close ();
}
this->topology_save_seq_ += 1;
}
@@ -387,7 +366,6 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
this ,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ec->load_attrs (attrs);
@@ -401,26 +379,23 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
}
void
-TAO_Notify_EventChannelFactory::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::reconnect (void)
{
// Reconnect all children first
TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk;
this->ec_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Then send reconnection announcement to registered clients
ACE_ASSERT (!CORBA::is_nil (this->channel_factory_.in ()));
this->reconnect_registry_.send_reconnect (this->channel_factory_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// reactivate events in-progress
Routing_Slip_Set::CONST_ITERATOR iter (this->routing_slip_restart_set_);
TAO_Notify::Routing_Slip_Ptr * routing_slip;
for (iter.first(); iter.next(routing_slip); iter.advance())
{
- (*routing_slip)->reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ (*routing_slip)->reconnect();
}
this->routing_slip_restart_set_.reset ();
}
@@ -448,18 +423,17 @@ TAO_Notify_EventChannelFactory::unregister_callback (
}
CORBA::Boolean
-TAO_Notify_EventChannelFactory::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::Boolean (1);
}
void
-TAO_Notify_EventChannelFactory::save_topology (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::save_topology (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->self_change ();
}
TAO_Notify_ProxyConsumer *
@@ -479,13 +453,11 @@ TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path
TAO_Notify_EventChannel_Find_Worker find_worker;
TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
++position;
if (ec != 0)
{
result = ec->find_proxy_consumer (id_path, position
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
}
return result;
@@ -507,28 +479,23 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path
{
TAO_Notify_EventChannel_Find_Worker find_worker;
TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
++position;
if (ec != 0)
{
result = ec->find_proxy_supplier (id_path, position
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
}
return result;
}
CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory::activate_self (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::activate_self (void)
{
CORBA::Object_var obj = this->activate (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
this->channel_factory_
= CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
ACE_TRY_NEW_ENV
{
@@ -536,8 +503,7 @@ TAO_Notify_EventChannelFactory::activate_self (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self") ));
}
- this->reconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->reconnect ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index be559fae20a..5c631f67e8e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -65,8 +65,8 @@ public:
virtual ~TAO_Notify_EventChannelFactory ();
/// = ServantBase Methods
- virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
/// Remove <channel> from the <ec_container_>
void remove (TAO_Notify_EventChannel* channel ACE_ENV_ARG_DECL);
@@ -84,7 +84,7 @@ public:
/// Use the registered Topology_Factory to create a loader, and
/// load the topology. If no Topology_Factory is registered
/// then nothing will be loaded.
- void load_topology (ACE_ENV_SINGLE_ARG_DECL);
+ void load_topology (void);
/// Use the passed in saver factory to generate topology saver objects.
/// Does not take ownership.
@@ -95,20 +95,20 @@ public:
virtual bool is_persistent () const;
virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
- virtual bool change_to_parent (ACE_ENV_SINGLE_ARG_DECL);
+ virtual bool change_to_parent (void);
virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
CORBA::Long id,
const TAO_Notify::NVPList& attrs
ACE_ENV_ARG_DECL);
- CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (ACE_ENV_SINGLE_ARG_DECL);
- virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void);
+ virtual void reconnect (void);
/// handle change notifications
- bool handle_change (ACE_ENV_SINGLE_ARG_DECL);
+ bool handle_change (void);
- void load_event_persistence (ACE_ENV_SINGLE_ARG_DECL);
+ void load_event_persistence (void);
- virtual void save_topology (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void save_topology (void)
ACE_THROW_SPEC ((CORBA::SystemException));
TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL);
@@ -125,13 +125,13 @@ public:
CosNotifyFilter::FilterFactory_var default_filter_factory_;
/// = NotifyExt methods
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
/// shutdown
- virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int shutdown (void);
virtual
NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
@@ -144,7 +144,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// = CosNotifyChannelAdmin Methods
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index e86593e9583..5866bfb9d54 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -171,10 +171,8 @@ TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV
attrs.push_back(TAO_Notify::NVP("Domain", this->event_type_.domain_name.in()));
attrs.push_back(TAO_Notify::NVP("Type", this->event_type_.type_name.in()));
saver.begin_object(0, "subscription", attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index bd9d489dd63..ec574b112bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -274,11 +274,9 @@ TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
if (this->size() != 0)
{
saver.begin_object(0, "subscriptions", attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
for (iter.first (); iter.next (event_type) != 0; iter.advance ())
{
event_type->save_persistent(saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// todo:
// for all deleted children
@@ -286,7 +284,6 @@ TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
// saver.delete_child(child_type, child_id);
// }
saver.end_object(0, "subscriptions" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 35264373bd4..58025098ad4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -80,7 +80,7 @@ void TAO_Notify_Event_Manager::release()
}
void
-TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Manager::init (void)
{
ACE_ASSERT (this->consumer_map_.get() == 0);
@@ -88,21 +88,17 @@ TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (consumer_map,
TAO_Notify_Consumer_Map (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
this->consumer_map_.reset( consumer_map );
- this->consumer_map().init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_map().init ();
TAO_Notify_Supplier_Map* supplier_map = 0;
ACE_NEW_THROW_EX (supplier_map,
TAO_Notify_Supplier_Map (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
this->supplier_map_.reset( supplier_map );
- this->supplier_map_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_map_->init ();
}
void
@@ -114,12 +110,10 @@ void
TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
{
this->consumer_map().connect (proxy_supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Inform about offered types.
TAO_Notify_EventTypeSeq removed;
proxy_supplier->types_changed (this->offered_types (), removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -132,7 +126,6 @@ void
TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
{
this->supplier_map().connect (proxy_consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Inform about subscription types.
TAO_Notify_EventTypeSeq removed;
proxy_consumer->types_changed (this->subscription_types (), removed ACE_ENV_ARG_PARAMETER);
@@ -150,10 +143,8 @@ TAO_Notify_Event_Manager::offer_change (TAO_Notify_ProxyConsumer* proxy_consumer
TAO_Notify_EventTypeSeq new_added, last_removed;
this->publish (proxy_consumer, added, new_added ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->un_publish (proxy_consumer, removed, last_removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Notify_Consumer_Map::ENTRY::COLLECTION* updates_collection = this->consumer_map().updates_collection ();
@@ -169,9 +160,7 @@ TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_s
TAO_Notify_EventTypeSeq new_added, last_removed;
this->subscribe (proxy_supplier, added, new_added ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->un_subscribe (proxy_supplier, removed, last_removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Notify_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map().updates_collection ();
@@ -180,7 +169,6 @@ TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_s
if (updates_collection != 0)
{
updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -194,7 +182,6 @@ TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, c
for (iter.first (); iter.next (event_type) != 0; iter.advance ())
{
int result = this->consumer_map().insert (proxy_supplier, *event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (result == 1)
new_seq.insert (*event_type);
@@ -211,7 +198,6 @@ TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier
for (iter.first (); iter.next (event_type) != 0; iter.advance ())
{
int result = this->consumer_map().remove (proxy_supplier, *event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (result == 1)
last_seq.insert (*event_type);
@@ -228,7 +214,6 @@ TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, con
for (iter.first (); iter.next (event_type) != 0; iter.advance ())
{
int result = supplier_map().insert (proxy_consumer, *event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (result == 1)
new_seq.insert (*event_type);
@@ -245,7 +230,6 @@ TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer,
for (iter.first (); iter.next (event_type) != 0; iter.advance ())
{
int result = supplier_map().remove (proxy_consumer, *event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (result == 1)
last_seq.insert (*event_type);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index ee897512072..29d578cad6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -68,7 +68,7 @@ public:
void release();
/// Init
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
/// Init
void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 5488c3ad420..3435bf852c6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -9,8 +9,8 @@
#include "orbsvcs/Notify/Event_Map_Entry_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Notify,
- TAO_Notify_Event_Map_Entry_T,
+ACE_RCSID (Notify,
+ TAO_Notify_Event_Map_Entry_T,
"$Id$")
#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
@@ -32,7 +32,7 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::~TAO_Notify_Event_Map_Entry_T ()
}
template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::init (void)
{
TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index e362f9a7efb..960747ed964 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -50,7 +50,7 @@ public:
~TAO_Notify_Event_Map_Entry_T (void);
/// Init - Allocates collection
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
/// Connect
void connected (PROXY* proxy ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 121d1f51fd0..9b7119ee4a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -28,19 +28,17 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::~TAO_Notify_Event_Map_T ()
}
template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (void)
{
- this->broadcast_entry_.init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->broadcast_entry_.init ();
- this->updates_entry_.init (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->updates_entry_.init ();
}
template <class PROXY, class ACE_LOCK> void
TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy ACE_ENV_ARG_DECL)
{
this->updates_entry_.connected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
++this->proxy_count_;
@@ -50,7 +48,6 @@ template <class PROXY, class ACE_LOCK> void
TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy ACE_ENV_ARG_DECL)
{
this->updates_entry_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
--this->proxy_count_;
@@ -81,13 +78,10 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
ACE_NEW_THROW_EX (entry,
ENTRY (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (-1);
- entry->init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ entry->init ();
entry->connected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -102,7 +96,6 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
else // Add to existing entry or the broadcast entry.
{
entry->connected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
@@ -118,7 +111,6 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
entry = &this->broadcast_entry_;
entry->disconnected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
@@ -133,7 +125,6 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
if (result == 0)
{
entry->disconnected (proxy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (entry->count () == 0)
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 039a8bcedf6..fef3e1d77f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -48,7 +48,7 @@ public:
~TAO_Notify_Event_Map_T ();
/// Init
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
/// Connect a PROXY
void connect (PROXY* proxy ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 81b86902a36..61c39483ae5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -33,7 +33,6 @@ TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_E
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
CosNotifyFilter::FilterID new_id = this->filter_ids_.id ();
@@ -56,7 +55,6 @@ TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_E
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
if (this->filter_list_.unbind (filter_id) == -1)
ACE_THROW (CosNotifyFilter::FilterNotFound ());
@@ -71,7 +69,6 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
CosNotifyFilter::Filter_var filter_var;
@@ -84,14 +81,13 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_
}
CosNotifyFilter::FilterIDSeq*
-TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin::get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// Figure out the length of the list.
size_t len = this->filter_list_.current_size ();
@@ -102,7 +98,6 @@ TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (list_ptr,
CosNotifyFilter::FilterIDSeq,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
CosNotifyFilter::FilterIDSeq_var list (list_ptr);
@@ -122,12 +117,11 @@ TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Notify_FilterAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin::remove_all_filters (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
this->filter_list_.unbind_all ();
}
@@ -142,7 +136,6 @@ TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_E
TAO_Notify::NVPList attrs;
bool want_children = saver.begin_object(0, "filter_admin", attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (want_children)
{
FILTER_LIST::ITERATOR iter (this->filter_list_);
@@ -157,12 +150,9 @@ TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_E
TAO_Notify::NVPList fattrs;
CORBA::Long id = entry->ext_id_;
CORBA::String_var ior = orb->object_to_string(entry->int_id_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
fattrs.push_back(TAO_Notify::NVP("IOR", ior.in()));
saver.begin_object(id, "filter", fattrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
saver.end_object(id, "filter" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -182,9 +172,7 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
attrs.load("IOR", ior);
CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
if (! CORBA::is_nil(filter.in()))
{
this->filter_ids_.set_last_used(id);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index dfa0d7eb7af..3e254ad37ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -75,12 +75,12 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
CosNotifyFilter::FilterNotFound
));
- virtual CosNotifyFilter::FilterIDSeq * get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index 3b30256fbb4..ba180b7ca6b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -13,7 +13,6 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// If no filter is active, match is successfull.
if (this->filter_list_.current_size () == 0)
@@ -27,7 +26,6 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
for (; iter.next (entry); iter.advance ())
{
ret_val = event->do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (ret_val == 1)
return 1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index de2822ae61b..b0ed1a62f7e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -23,7 +23,6 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (const TA
this->id_ = id;
container.collection ()->for_each (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return this->result_;
}
@@ -32,14 +31,12 @@ template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTE
TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
{
this->find (id, container ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (INTERFACE::_nil ());
if (this->result_ == 0)
ACE_THROW_RETURN (EXCEPTION ()
, INTERFACE::_nil ());
- CORBA::Object_var object = this->result_->ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (INTERFACE::_nil ());
+ CORBA::Object_var object = this->result_->ref ();
return INTERFACE::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index e9dc45dbb07..d9463ed423c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -15,7 +15,7 @@ TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void)
}
TAO_Notify_Method_Request_Queueable *
-TAO_Notify_Method_Request_Queueable::copy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Queueable::copy (void)
{
return this;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 271c2d721b4..e0de13c6408 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -42,8 +42,8 @@ public:
virtual ~TAO_Notify_Method_Request (void);
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
- virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual int execute (void) = 0;
+ virtual TAO_Notify_Method_Request_Queueable* copy (void) = 0;
};
/***********************************************************************/
@@ -64,7 +64,7 @@ public:
TAO_Notify_Method_Request_Queueable();
TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event);
- virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Method_Request_Queueable* copy (void);
void init (const TAO_Notify_Event * event);
};
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index af503aa3077..5fbcf580337 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -66,7 +66,7 @@ TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch ()
#endif
}
-int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+int TAO_Notify_Method_Request_Dispatch::execute_i (void)
{
if (this->proxy_supplier_->has_shutdown ())
return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -78,7 +78,6 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
parent.filter_admin (),
parent.filter_operator ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (TAO_debug_level > 1)
ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
@@ -95,7 +94,6 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
if (consumer != 0)
{
consumer->deliver (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -145,7 +143,6 @@ TAO_Notify_Method_Request_Dispatch::unmarshal (
{
TAO_Notify_ProxySupplier* proxy_supplier = ecf.find_proxy_supplier (id_path,
0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
if (proxy_supplier != 0)
{
if (DEBUG_LEVEL > 6) ACE_DEBUG ((LM_DEBUG,
@@ -236,9 +233,9 @@ TAO_Notify_Method_Request_Dispatch_Queueable::~TAO_Notify_Method_Request_Dispatc
}
int
-TAO_Notify_Method_Request_Dispatch_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_Queueable::execute (void)
{
- return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->execute_i ();
}
/*********************************************************************************************************/
@@ -279,19 +276,18 @@ TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch
}
int
-TAO_Notify_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy::execute (void)
{
- return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->execute_i ();
}
TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy::copy (void)
{
TAO_Notify_Method_Request_Queueable* request;
TAO_Notify_Event::Ptr event_var (
- this->event_->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
- ACE_CHECK_RETURN (0);
+ this->event_->queueable_copy () );
ACE_NEW_THROW_EX (request,
TAO_Notify_Method_Request_Dispatch_Queueable (*this, event_var, this->proxy_supplier_.get(), this->filtering_),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index fed8d063cfa..7597e9e3a83 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -78,7 +78,7 @@ public:
protected:
/// Execute the dispatch operation.
- int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ int execute_i (void);
protected:
/// The Proxy
@@ -120,7 +120,7 @@ public:
virtual ~TAO_Notify_Method_Request_Dispatch_Queueable ();
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
private:
TAO_Notify_Event::Ptr event_var_;
@@ -156,10 +156,10 @@ public:
virtual ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
/// Create a copy of this method request
- virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Method_Request_Queueable* copy (void);
};
/*****************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 53ab33da14c..29dacfce71b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -87,7 +87,7 @@ TAO_Notify_Method_Request_Event_Queueable::~TAO_Notify_Method_Request_Event_Queu
}
int
-TAO_Notify_Method_Request_Event_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Event_Queueable::execute (void)
{
ACE_ASSERT (false);
return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 4acb97f10d9..cab979791b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -93,7 +93,7 @@ public:
virtual ~TAO_Notify_Method_Request_Event_Queueable ();
/// satisfy the pure virtual method. Should never be called.
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
private:
TAO_Notify_Event::Ptr event_var_;
};
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index bee058ab534..d9095545817 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -44,16 +44,14 @@ TAO_Notify_Method_Request_Lookup::work (
{
TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true);
proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
delivery_request_->dispatch (proxy_supplier, true ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
-int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+int TAO_Notify_Method_Request_Lookup::execute_i (void)
{
if (this->proxy_consumer_->has_shutdown ())
return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -64,7 +62,6 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
parent.filter_admin (),
parent.filter_operator ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (TAO_debug_level > 1)
ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
@@ -77,7 +74,6 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
TAO_Notify_Consumer_Map& map = this->proxy_consumer_->event_manager ().consumer_map ();
TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
TAO_Notify_ProxySupplier_Collection* consumers = 0;
@@ -88,7 +84,6 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
if (consumers != 0)
{
consumers->for_each (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
map.release (entry);
@@ -100,7 +95,6 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
if (consumers != 0)
{
consumers->for_each (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
this->complete ();
return 0;
@@ -138,7 +132,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal (
TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (
id_path,
0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
if (proxy_consumer != 0)
{
ACE_NEW_NORETURN (result,
@@ -191,9 +184,9 @@ TAO_Notify_Method_Request_Lookup_Queueable::~TAO_Notify_Method_Request_Lookup_Qu
}
int
-TAO_Notify_Method_Request_Lookup_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_Queueable::execute (void)
{
- return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->execute_i ();
}
/******************************************************************************************************/
@@ -210,18 +203,17 @@ TAO_Notify_Method_Request_Lookup_No_Copy::~TAO_Notify_Method_Request_Lookup_No_C
}
int
-TAO_Notify_Method_Request_Lookup_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_No_Copy::execute (void)
{
- return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->execute_i ();
}
TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_No_Copy::copy (void)
{
TAO_Notify_Method_Request_Queueable* request;
- TAO_Notify_Event::Ptr event(this->event_->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK_RETURN (0);
+ TAO_Notify_Event::Ptr event(this->event_->queueable_copy());
ACE_NEW_THROW_EX (request,
TAO_Notify_Method_Request_Lookup_Queueable (event, this->proxy_consumer_),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index d54bb62833e..f515e97edcd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -61,7 +61,7 @@ protected:
TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event * event, TAO_Notify_ProxyConsumer * proxy);
/// Execute the dispatch operation.
- int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ int execute_i (void);
///= TAO_ESF_Worker method
virtual void work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
@@ -99,7 +99,7 @@ public:
virtual ~TAO_Notify_Method_Request_Lookup_Queueable ();
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
private:
TAO_Notify_Event::Ptr event_var_;
@@ -128,10 +128,10 @@ public:
virtual ~TAO_Notify_Method_Request_Lookup_No_Copy ();
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
/// Create a copy of this object.
- virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Method_Request_Queueable* copy (void);
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index 74ca99ef829..2720a530fc1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Method_Request_Shutdown::copy (void)
}
int
-TAO_Notify_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Shutdown::execute (void)
{
// Shut down the scheduler by deactivating the activation queue's
// underlying message queue - should pop all worker threads off their
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index af38f816524..c8199b63b30 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -45,7 +45,7 @@ public:
TAO_Notify_Method_Request_Queueable* copy (void);
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
private:
// Task to shutdown
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 18ac5fa1841..61215e49d58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -20,9 +20,9 @@ TAO_Notify_Method_Request_Updates::~TAO_Notify_Method_Request_Updates ()
}
int
-TAO_Notify_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates::execute (void)
{
- return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->execute_i ();
}
/*****************************************************************************/
@@ -38,22 +38,21 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No
}
TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_No_Copy::copy (void)
{
TAO_Notify_Method_Request_Queueable* request = 0;
ACE_NEW_THROW_EX (request,
TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (request);
return request;
}
int
-TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_No_Copy::execute (void)
{
- return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->execute_i ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index b9410188772..93604f4c4d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -49,7 +49,7 @@ public:
virtual ~TAO_Notify_Method_Request_Updates ();
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
};
/*****************************************************************************/
@@ -78,10 +78,10 @@ public:
virtual ~TAO_Notify_Method_Request_Updates_No_Copy ();
/// Create a copy of this object.
- virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Method_Request_Queueable* copy (void);
/// Execute the Request
- virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int execute (void);
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index 53b6c1d7b30..933412db268 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -41,15 +41,15 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_T
{
public:
/// Constuctor
- TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added,
- SEQ_PARAM removed,
+ TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added,
+ SEQ_PARAM removed,
PROXY_PARAM proxy);
/// Destructor
virtual ~TAO_Notify_Method_Request_Updates_T ();
/// Execute the Request
- int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ int execute_i (void);
protected:
/// Update Added
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index 657b6dd0929..a44c8551a93 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -8,7 +8,7 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (void)
{
if (this->proxy_->has_shutdown ())
return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -20,7 +20,6 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute
if (peer != 0)
{
peer->dispatch_updates (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 5d6f3e11e21..a4abcb5db21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -30,7 +30,6 @@ TAO_Notify_Constraint_Interpreter::build_tree (
ACE_NEW_THROW_EX (this->root_,
TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 1),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 49f4aa6814e..3a4f341cb23 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -207,7 +207,6 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
TAO_DynUnion_i dyn_union;
dyn_union.init (this->current_value_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::TypeCode_var tc = this->current_value_->type ();
@@ -219,12 +218,10 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
{
CORBA::Any disc_any;
CORBA::TypeCode_var disc_tc =
- tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tc->discriminator_type ();
CORBA::TCKind disc_kind =
TAO_DynAnyFactory::unalias (disc_tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
switch (disc_kind)
{
@@ -274,16 +271,12 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
disc_tc.in (),
disc_any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
dyn_union.set_discriminator (dyn_any.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var u_member =
- dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_union.member ();
this->current_value_ =
- u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ u_member->to_any ();
break;
}
@@ -291,8 +284,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
{
const char *name = (const char *) disc_val;
CORBA::ULong count =
- tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tc->member_count ();
const char *member_name = 0;
CORBA::ULong i = 0;
@@ -301,7 +293,6 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
{
member_name = tc->member_name (i
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ACE_OS::strcmp (name, member_name) == 0)
break;
@@ -312,7 +303,6 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
// return -1;
this->current_value_ = tc->member_label (i
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
break;
}
@@ -360,7 +350,6 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
CORBA::TypeCode_var tc = this->current_value_->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var member;
CORBA::Boolean success = 0;
@@ -373,18 +362,15 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
TAO_DynEnum_i dyn_enum;
dyn_enum.init (this->current_value_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_enum.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
return -1;
member =
- dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_enum.current_component ();
break;
}
@@ -393,17 +379,14 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
TAO_DynStruct_i dyn_struct;
dyn_struct.init (this->current_value_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_struct.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
return -1;
- member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ member = dyn_struct.current_component ();
break;
}
@@ -415,8 +398,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
return -1;
}
- CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var value = member->to_any ();
TAO_ETCL_Constraint *comp = pos->component ();
@@ -507,7 +489,6 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
CORBA::TypeCode_var tc = this->current_value_->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var member;
CORBA::Boolean success = 0;
@@ -520,17 +501,14 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
TAO_DynEnum_i dyn_array;
dyn_array.init (this->current_value_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_array.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
return -1;
- member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ member = dyn_array.current_component ();
break;
}
@@ -539,18 +517,15 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
TAO_DynStruct_i dyn_sequence;
dyn_sequence.init (this->current_value_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
success = dyn_sequence.seek (slot
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (success == 0)
return -1;
member =
- dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_sequence.current_component ();
break;
}
@@ -560,8 +535,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
return -1;
}
- CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var value = member->to_any ();
TAO_ETCL_Constraint *comp = array->component ();
@@ -592,10 +566,8 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
{
CORBA::TypeCode_var tc = this->current_value_->type ();
tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::TCKind kind = tc->kind ();
switch (special->type ())
{
@@ -610,19 +582,16 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
TAO_DynSequence_i dyn_seq;
dyn_seq.init (current_value_.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::AnySeq_var any_seq =
- dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_seq.get_elements ();
length = any_seq->length ();
}
break;
case CORBA::tk_array:
{
- length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ length = tc->length ();
}
break;
default:
@@ -640,14 +609,11 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
TAO_DynUnion_i dyn_union;
dyn_union.init (this->current_value_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var disc =
- dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_union.get_discriminator ();
- CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var disc_any = disc->to_any ();
TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
this->queue_.enqueue_head (lit);
@@ -655,8 +621,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
}
case TAO_ETCL_TYPE_ID:
{
- const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ const char *name = tc->name ();
TAO_ETCL_Literal_Constraint lit (name);
this->queue_.enqueue_head (lit);
@@ -664,8 +629,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
}
case TAO_ETCL_REPOS_ID:
{
- const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ const char *id = tc->id ();
TAO_ETCL_Literal_Constraint lit (id);
this->queue_.enqueue_head (lit);
@@ -807,8 +771,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Long default_index = tc->default_index ();
// No default index.
if (default_index == -1)
@@ -1161,7 +1124,6 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
CORBA::TypeCode_var tc = component->type ();
kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -1226,13 +1188,10 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
CORBA::TypeCode_var type = any->type ();
CORBA::TypeCode_var base_type =
TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::TypeCode_var content_type =
- base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ base_type->content_type ();
CORBA::TCKind kind =
TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the array elements must be
// of the same simple type.
@@ -1245,11 +1204,9 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
TAO_DynSequence_i dyn_seq;
dyn_seq.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::AnySeq_var any_seq =
- dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_seq.get_elements ();
CORBA::ULong length = any_seq->length ();
@@ -1280,7 +1237,6 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
CORBA::TypeCode_var type = any->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the array elements must be
// of the same simple type.
@@ -1293,11 +1249,9 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
TAO_DynArray_i dyn_array;
dyn_array.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::AnySeq_var any_seq =
- dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_array.get_elements ();
CORBA::ULong length = any_seq->length ();
@@ -1328,11 +1282,9 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
TAO_DynStruct_i dyn_struct;
dyn_struct.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::NameValuePairSeq_var members =
- dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_struct.get_members ();
CORBA::ULong length = members->length ();
CORBA::TypeCode_var tc;
@@ -1343,7 +1295,6 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
tc = members[i].value.type ();
kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the struct member must be
// of the same simple type.
@@ -1378,19 +1329,15 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
TAO_DynUnion_i dyn_union;
dyn_union.init (*any
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAny_var cc =
- dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ dyn_union.current_component ();
- CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Any_var member = cc->to_any ();
CORBA::TypeCode_var tc = member->type ();
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The literal and the union member must be
// of the same simple type.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 2bc881f15a7..531b3686799 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -30,10 +30,8 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
CORBA::ORB_ptr orb = poa->orb_core ().orb () ;
notify_service->init_service (orb ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (notify_factory._retn ());
notify_factory = notify_service->create (default_POA ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (notify_factory._retn ());
return notify_factory._retn ();
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index a00a6c374b8..3b737e9a761 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -86,12 +86,11 @@ TAO_Notify_Object::activate (
void
-TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::deactivate (void)
{
ACE_TRY
{
this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -106,7 +105,7 @@ TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
}
int
-TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::shutdown (void)
{
{
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
@@ -117,8 +116,7 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
this->shutdown_ = 1;
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->deactivate ();
this->shutdown_worker_task ();
@@ -126,7 +124,7 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Object_ptr
-TAO_Notify_Object::ref (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::ref (void)
{
return this->poa_->id_to_reference (this->id_ ACE_ENV_ARG_PARAMETER);
}
@@ -160,8 +158,7 @@ TAO_Notify_Object::destroy_proxy_poa (void)
{
this->own_proxy_poa_ = false;
ACE_Auto_Ptr< TAO_Notify_POA_Helper > app( object_poa_ );
- this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_poa_->destroy ();
}
this->proxy_poa_ = 0;
}
@@ -189,8 +186,7 @@ TAO_Notify_Object::destroy_object_poa (void)
{
this->own_object_poa_ = false;
ACE_Auto_Ptr< TAO_Notify_POA_Helper > aop( object_poa_ );
- this->object_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->object_poa_->destroy ();
}
this->object_poa_ = 0;
}
@@ -267,19 +263,16 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_A
if (new_qos_properties.thread_pool ().value ().static_threads == 0)
{
TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
TAO_Notify_PROPERTIES::instance()->builder()->
apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else if (new_qos_properties.thread_pool_lane ().is_valid ())
TAO_Notify_PROPERTIES::instance()->builder()->
apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update the Thread Task's QoS properties..
this->worker_task_->update_qos_properties (new_qos_properties);
@@ -296,7 +289,7 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_A
}
CosNotification::QoSProperties*
-TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::get_qos (void)
{
CosNotification::QoSProperties_var properties;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 7b9cb510b6c..0731dbb222d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -69,7 +69,7 @@ public:
ACE_ENV_ARG_DECL);
/// Deactivate
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
/// Have we been shutdown. returns 1 if shutdown.
int has_shutdown (void);
@@ -77,13 +77,13 @@ public:
void execute_task (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
/// Get CORBA Ref.
- CORBA::Object_ptr ref (ACE_ENV_SINGLE_ARG_DECL);
+ CORBA::Object_ptr ref (void);
/// Set the QoS Properties.
virtual void set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL);
/// Get the QoS Properties.
- CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotification::QoSProperties* get_qos (void);
bool find_qos_property_value (
const char * name,
@@ -96,7 +96,7 @@ public:
TAO_Notify_Event_Manager& event_manager (void);
/// shutdown. Returns 1 ifif the shutdown was already run once before.
- virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int shutdown (void);
/// Load our attributes. Each derived type should call the superclass
/// load first before loading its own attributes.
@@ -117,7 +117,7 @@ protected:
/// Changes the primary poa to the current proxy poa
void set_primary_as_proxy_poa();
-
+
/// Accessor for the proxy_poa_
TAO_Notify_POA_Helper* proxy_poa (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 8d781c1929e..2b95a550355 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -42,7 +42,6 @@ TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa
CORBA::PolicyList policy_list (2);
this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
}
@@ -63,12 +62,10 @@ TAO_Notify_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::Po
policy_list[0] =
parent_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policy_list[1] =
parent_poa->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -76,21 +73,18 @@ void
TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
{
PortableServer::POAManager_var manager =
- parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ parent_poa->the_POAManager ();
// Create the child POA.
this->poa_ = parent_poa->create_POA (poa_name,
manager.in (),
policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (DEBUG_LEVEL > 0)
{
CORBA::String_var the_name = this->poa_->the_name (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "Created POA : %s\n", the_name.in ()));
}
@@ -143,7 +137,6 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i
{
CORBA::String_var the_name = this->poa_->the_name (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in POA : %s\n", id, the_name.in ()));
}
@@ -151,12 +144,10 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i
// Convert CORBA::Long to ObjectId
PortableServer::ObjectId_var oid =
this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
poa_->activate_object_with_id (oid.in (),
servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
@@ -169,7 +160,6 @@ TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA:
{
CORBA::String_var the_name = this->poa_->the_name (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_DEBUG ((LM_DEBUG, "Activating object with existing id = %d in POA : %s\n", id, the_name.in ()));
}
this->id_factory_.set_last_used (id);
@@ -177,12 +167,10 @@ TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA:
// Convert CORBA::Long to ObjectId
PortableServer::ObjectId_var oid =
this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
poa_->activate_object_with_id (oid.in (),
servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
@@ -194,7 +182,6 @@ TAO_Notify_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
// Convert CORBA::Long to ObjectId
PortableServer::ObjectId_var oid =
this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa_->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
}
@@ -205,7 +192,6 @@ TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
// Convert CORBA::Long to ObjectId
PortableServer::ObjectId_var oid =
this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
@@ -226,7 +212,7 @@ TAO_Notify_POA_Helper::servant_to_reference (
void
-TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_POA_Helper::destroy (void)
{
poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER);
// The <wait_for_completion> flag = 0
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 57b4208324e..5a2c9c4a17f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -54,7 +54,7 @@ public:
PortableServer::POA_ptr poa (void);
/// Destroy underlying POA.
- void destroy (ACE_ENV_SINGLE_ARG_DECL);
+ void destroy (void);
/// Activate Object, the POA will assign an ID and return its value.
CORBA::Object_ptr activate (PortableServer::Servant servant,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 6caa4aa6552..4d38017ea99 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -25,16 +25,16 @@ TAO_Notify_Peer::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/
}
void
-TAO_Notify_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Peer::shutdown (void)
{
// NOP.
}
void
-TAO_Notify_Peer::handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Peer::handle_dispatch_exception (void)
{
// Sever all association when a remote client misbehaves. Other strategies like reties are possible but not implemented.
- this->proxy ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy ()->destroy ();
}
void
@@ -42,7 +42,6 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
{
TAO_Notify_EventTypeSeq subscribed_types ;
this->proxy ()->subscribed_types (subscribed_types ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY
{
@@ -85,13 +84,11 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ());
this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
{
- this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->handle_dispatch_exception ();
}
ACE_CATCH (CORBA::NO_IMPLEMENT, no_impl)
{
@@ -100,8 +97,7 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
}
ACE_CATCH (CORBA::SystemException, sysex)
{
- this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->handle_dispatch_exception ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 142ef4484cf..60e66cba1dc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -49,7 +49,7 @@ public:
CORBA::ULong _decr_refcnt (void);
/// Shutdown the peer.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown (void);
/// Access Proxy.
virtual TAO_Notify_Proxy* proxy (void) = 0;
@@ -63,7 +63,7 @@ public:
virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
/// Handle dispatch exceptions.
- void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_dispatch_exception (void);
/// Retrieve the ior of this peer
virtual ACE_CString get_ior (void) const = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index a088943d05b..0785bb48dc2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -46,7 +46,7 @@ TAO_Notify_Proxy::activate (PortableServer::Servant servant,
}
void
-TAO_Notify_Proxy::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy::deactivate (void)
{
ACE_ASSERT (this->proxy_poa() != 0 );
this->proxy_poa()->deactivate (this->id() ACE_ENV_ARG_PARAMETER);
@@ -57,7 +57,6 @@ TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// copy
subscribed_types = this->subscribed_types_;
@@ -76,12 +75,10 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO
if (TAO_Notify_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
{
this->execute_task (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else // execute in the current thread context.
{
- request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ request.execute ();
}
}
@@ -98,7 +95,6 @@ TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, cons
CORBA::NO_MEMORY ());
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
- ACE_CHECK_RETURN (event_type_seq._retn ());
if (mode == CosNotifyChannelAdmin::ALL_NOW_UPDATES_OFF ||
mode == CosNotifyChannelAdmin::ALL_NOW_UPDATES_ON)
@@ -143,18 +139,15 @@ TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
const char * type_name = this->get_proxy_type_name ();
bool want_all_children = saver.begin_object(this->id(), type_name, attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (want_all_children || this->filter_admin_.is_changed ())
{
this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (want_all_children || this->subscribed_types_.is_changed ())
{
this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// todo: handle removed children
@@ -187,7 +180,6 @@ TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id,
// in the constructor. we have to clear it out first.
this->subscribed_types_.reset();
result = &this->subscribed_types_;
- ACE_CHECK_RETURN(0);
}
else if (type == "filter_admin")
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index d6931ece562..d0368573fa6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -62,7 +62,7 @@ public:
ACE_ENV_ARG_DECL);
/// Deactivate
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
/// Obtain the Proxy's subscribed types.
void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
@@ -85,7 +85,7 @@ public:
CORBA::Boolean updates_off (void);
/// Destroy this object.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void destroy (void) = 0;
/// Access our Peer.
virtual TAO_Notify_Peer* peer (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index 6eff985b31e..43f5d362b18 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -19,19 +19,16 @@ TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event
// check if it passes the parent filter.
CORBA::Boolean parent_val =
parent_filter_admin.match (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::Boolean val = 0;
if (filter_operator == CosNotifyChannelAdmin::AND_OP)
{
val = parent_val && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else
{
val = parent_val || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return val;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index af5fffb4b78..a1ffb1a15ac 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -50,7 +50,6 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE
ACE_ASSERT( this->supplier_admin_.get() == 0 );
TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_admin_.reset (dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent));
ACE_ASSERT (this->supplier_admin_.get() != 0);
@@ -62,7 +61,6 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
this->TAO_Notify_Object::set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -87,7 +85,6 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// if supplier is set and reconnect not allowed we get out.
if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
@@ -99,7 +96,6 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
this->supplier_ = auto_supplier;
this->supplier_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
- ACE_CHECK;
}
// Inform QoS values.
@@ -109,10 +105,8 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
TAO_Notify_EventTypeSeq removed;
this->event_manager().offer_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Increment the global supplier count
++supplier_count;
@@ -122,22 +116,18 @@ TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL)
{
if (this->supports_reliable_events ())
{
- TAO_Notify_Event::Ptr pevent(event->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ TAO_Notify_Event::Ptr pevent(event->queueable_copy());
TAO_Notify::Routing_Slip_Ptr routing_slip =
TAO_Notify::Routing_Slip::create (pevent ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (DEBUG_LEVEL > 0)
ACE_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n")));
routing_slip->route (this, true ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
routing_slip->wait_persist ();
}
else
{
TAO_Notify_Method_Request_Lookup_No_Copy request (event, this);
this->execute_task (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -158,49 +148,42 @@ TAO_Notify_ProxyConsumer::supports_reliable_events () const
}
void
-TAO_Notify_ProxyConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::disconnect (void)
{
TAO_Notify_EventTypeSeq added;
event_manager().offer_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_manager().disconnect (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Decrement the global supplier count
this->admin_properties().suppliers ()--;
}
int
-TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::shutdown (void)
{
- if (this->TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+ if (this->TAO_Notify_Object::shutdown () == 1)
return 1;
- ACE_CHECK_RETURN (1);
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->disconnect ();
if (this->supplier_.get() != 0)
{
- this->supplier_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->supplier_->shutdown ();
}
return 0;
}
void
-TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::destroy (void)
{
- int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int result = this->shutdown ();
if ( result == 1)
return;
this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Do not reset this->supplier_.
// It is not safe to delete the non-refcounted supplier here.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 17890c772f2..5e56ae10676 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -58,13 +58,13 @@ public:
));
/// Disconnect
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Shutdown (TAO_Notify_Container_T method)
- virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int shutdown (void);
/// Destroy this object.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void destroy (void);
/// Return 1 if connected
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index a47122b58d5..e89976a1c6e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -29,15 +29,14 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica
}
template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
CosNotifyChannelAdmin::SupplierAdmin_var ret;
- CORBA::Object_var object = this->supplier_admin().ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (ret._retn ());
+ CORBA::Object_var object = this->supplier_admin().ref ();
ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
@@ -57,7 +56,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
this->subscribed_types_.add_and_remove (seq_added, seq_removed);
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index bcb0ada782b..9f10ecf26e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -47,7 +47,7 @@ public:
const CosNotification::EventTypeSeq & removed
ACE_ENV_ARG_DECL);
- virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 0b668445abe..5d1c2469408 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -34,7 +34,6 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV
ACE_ASSERT (consumer_admin != 0 && this->consumer_admin_.get() == 0);
TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_admin_.reset (consumer_admin);
@@ -45,7 +44,6 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
this->TAO_Notify_Object::set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -76,7 +74,6 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
// if consumer is set and reconnect not allowed we get out.
if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
@@ -88,7 +85,6 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
this->consumer_ = auto_consumer;
this->consumer_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
- ACE_CHECK;
}
// Inform QoS values.
@@ -98,58 +94,50 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
TAO_Notify_EventTypeSeq removed;
this->event_manager().subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Increment the global consumer count
++consumer_count;
}
void
-TAO_Notify_ProxySupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::disconnect (void)
{
TAO_Notify_EventTypeSeq added;
this->event_manager().subscription_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_manager().disconnect (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Decrement the global consumer count
this->admin_properties().consumers ()--;
}
int
-TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::shutdown (void)
{
- if (this->TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+ if (this->TAO_Notify_Object::shutdown () == 1)
return 1;
- ACE_CHECK_RETURN (1);
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ this->disconnect ();
if (this->consumer_.get() != 0)
{
- this->consumer_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->consumer_->shutdown ();
}
return 0;
}
void
-TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::destroy (void)
{
- int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int result = this->shutdown ();
if ( result == 1)
return;
this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Do not reset this->consumer_.
// It is not safe to delete the non-refcounted consumer here.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 17ced483590..723de83294d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -56,16 +56,16 @@ public:
, CosEventChannelAdmin::AlreadyConnected
));
/// Disconnect
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Dispatch Event to consumer
virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL);
/// Override TAO_Notify_Container_T::shutdown method
- virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ virtual int shutdown (void);
/// Destroy this object.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void destroy (void);
/// Override, TAO_Notify_Proxy::qos_changed to apply MaxEventssPerConsumer QoS.
virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index 622acba3277..b3568409e86 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -109,7 +109,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
this->subscribed_types_.add_and_remove (seq_added, seq_removed);
}
@@ -118,7 +117,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyChannelAdmin::ConnectionAlreadyInactive,
@@ -135,14 +134,12 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG
ACE_THROW (CosNotifyChannelAdmin::ConnectionAlreadyInactive ());
}
- this->consumer()->suspend (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer()->suspend ();
+ this->self_change ();
}
template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyChannelAdmin::ConnectionAlreadyActive,
@@ -159,19 +156,18 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_
ACE_THROW (CosNotifyChannelAdmin::ConnectionAlreadyActive ());
}
- this->consumer()->resume (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->consumer()->resume ();
}
template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
CosNotifyChannelAdmin::ConsumerAdmin_var ret;
- CORBA::Object_var object = this->consumer_admin().ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (ret._retn ());
+ CORBA::Object_var object = this->consumer_admin().ref ();
ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
@@ -181,7 +177,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
/***************************** UNIMPLEMENTED METHODS***************************************/
template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -202,7 +198,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mapp
}
template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 518db5e5c02..740c2cdd848 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -26,13 +26,13 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::servant (void)
}
template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (void)
{
this->_incr_refcnt ();
}
template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -48,16 +48,15 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoS
}
template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_Notify_Object::get_qos ();
}
template <class SERVANT_TYPE> void
@@ -95,13 +94,10 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_fi
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
CosNotifyFilter::FilterID fid =
this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(fid);
+ this->self_change ();
return fid;
}
@@ -130,26 +126,24 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter A
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
}
template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
- return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->filter_admin_.get_all_filters ();
}
template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -157,7 +151,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->filter_admin_.remove_all_filters ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 2cdc149f502..f31b6e350ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -48,8 +48,8 @@ public:
virtual PortableServer::Servant servant (void);
/// ServantBase refcount methods.
- virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
virtual void validate_event_qos (
const CosNotification::QoSProperties & required_qos,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 98b297f069a..8f70f048db0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -34,14 +34,12 @@ TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
ACE_NEW_THROW_EX (proxy_poa,
TAO_Notify_RT_POA_Helper (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_proxy_poa (proxy_poa);
PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
proxy_poa->init (default_poa.in (), tp_params ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Give ownership of proxy_poa
object.set_proxy_poa (auto_proxy_poa.release ());
@@ -57,14 +55,12 @@ TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
ACE_NEW_THROW_EX (proxy_poa,
TAO_Notify_RT_POA_Helper (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_proxy_poa (proxy_poa);
PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
proxy_poa->init (default_poa.in (), tpl_params ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Give ownership of proxy_poa
object.set_proxy_poa (auto_proxy_poa.release ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index f9e4ce24128..fe0f0af4dc4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -26,7 +26,6 @@ TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n"));
this->init_i (orb ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -34,7 +33,6 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
//Init the base class.
TAO_CosNotify_Service::init_i (orb ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Notify_RT_Properties* properties = TAO_Notify_RT_PROPERTIES::instance();
@@ -42,23 +40,19 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var object =
orb->resolve_initial_references ("RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::RTORB_var rt_orb =
RTCORBA::RTORB::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve RTCurrent
object =
orb->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::Current_var current =
RTCORBA::Current::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
/// Set the properties
properties->rt_orb (rt_orb.in ());
@@ -66,7 +60,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
}
TAO_Notify_Factory*
-TAO_RT_Notify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Notify_Service::create_factory (void)
{
TAO_Notify_Factory* factory =
ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
@@ -76,19 +70,17 @@ TAO_RT_Notify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (factory,
TAO_Notify_RT_Factory (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN(0);
}
return factory;
}
TAO_Notify_Builder*
-TAO_RT_Notify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Notify_Service::create_builder (void)
{
TAO_Notify_Builder* builder = 0;
ACE_NEW_THROW_EX (builder,
TAO_Notify_RT_Builder (),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN(0);
return builder;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index 6383e95fc34..594a4d8c01e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -47,10 +47,10 @@ protected:
virtual void init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
/// Create the Factory for RT Notify objects.
- virtual TAO_Notify_Factory* create_factory (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Factory* create_factory (void);
/// Creates the Builder for RT Notify objects.
- virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_Builder* create_builder (void);
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 81859ded60f..9d142db5b71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -32,7 +32,6 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
CORBA::PolicyList policy_list (4);
this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
@@ -49,7 +48,6 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
rt_orb->create_priority_model_policy (priority_model,
tp_params.server_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n"
@@ -65,13 +63,11 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
tp_params.max_buffered_requests,
tp_params.max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policy_list.length (4);
policy_list[3] =
rt_orb->create_threadpool_policy (threadpool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
}
@@ -91,7 +87,6 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
CORBA::PolicyList policy_list (4);
this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
@@ -104,7 +99,6 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
rt_orb->create_priority_model_policy (priority_model,
tpl_params.server_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Populate RTCORBA Lanes.
RTCORBA::ThreadpoolLanes lanes (tpl_params.lanes.length ());
@@ -132,13 +126,11 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
tpl_params.max_buffered_requests,
tpl_params.max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policy_list.length (4);
policy_list[3] =
rt_orb->create_threadpool_policy (threadpool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
}
@@ -156,7 +148,6 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_D
rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_CString child_poa_name = this->get_unique_id ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index be6bdd90518..8ecd21f6d40 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -22,7 +22,7 @@ TAO_Notify_Reactive_Task::~TAO_Notify_Reactive_Task ()
}
void
-TAO_Notify_Reactive_Task::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Reactive_Task::init (void)
{
ACE_ASSERT (this->timer_.get() == 0);
@@ -47,7 +47,7 @@ TAO_Notify_Reactive_Task::shutdown (void)
void
TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
{
- method_request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+ method_request.execute ();
}
TAO_Notify_Timer*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index b7a602cd67c..7d3dcec5f3e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -43,7 +43,7 @@ public:
virtual ~TAO_Notify_Reactive_Task ();
/// Init the reactive task.
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
/// Shutdown task
virtual void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
index 4c5857f45c8..06fa3a8c3f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
@@ -31,8 +31,7 @@ namespace TAO_Notify
Reconnect_Worker<TOPOOBJ>::work (TOPOOBJ* o ACE_ENV_ARG_DECL)
{
ACE_ASSERT(o != 0);
- o->reconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ o->reconnect ();
}
} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 8eba0d841ef..8360fa282e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -61,14 +61,12 @@ namespace TAO_Notify
CORBA::ORB_var orb = properties->orb ();
CORBA::String_var cior = orb->object_to_string (callback ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_CString ior(cior.in ());
if ( 0 != reconnection_registry_.bind (next_id, ior))
{
//todo throw something;
}
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->self_change ();
return next_id;
}
@@ -88,12 +86,11 @@ namespace TAO_Notify
{
//@@todo throw something
}
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->self_change ();
}
CORBA::Boolean
- Reconnection_Registry::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ Reconnection_Registry::is_alive (void)
{
return CORBA::Boolean(1);
}
@@ -111,7 +108,6 @@ namespace TAO_Notify
NVPList attrs;
//@@todo: bool want_all_children =
saver.begin_object (0, REGISTRY_TYPE, attrs, change ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Reconnection_Registry_Type::ENTRY *entry;
for (Reconnection_Registry_Type::ITERATOR iter (this->reconnection_registry_);
@@ -129,9 +125,7 @@ namespace TAO_Notify
cattrs.push_back(NVP(RECONNECT_ID, entry->ext_id_));
cattrs.push_back(NVP(RECONNECT_IOR, entry->int_id_));
saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// todo:
// for all deleted children
@@ -208,13 +202,11 @@ namespace TAO_Notify
}
ACE_CString & ior = entry->int_id_;
CORBA::Object_var obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
NotifyExt::ReconnectionCallback_var callback =
NotifyExt::ReconnectionCallback::_narrow (obj.in ());
if (!CORBA::is_nil (callback.in ()))
{
callback->reconnect (dest_factory ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 0c84190d5a9..b2c4a52c4a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -69,7 +69,7 @@ namespace TAO_Notify
void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id
ACE_ENV_ARG_DECL);
- CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL);
+ CORBA::Boolean is_alive (void);
//////////////////////
// During topology save
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index eb101ef2105..2b9c0893896 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -57,7 +57,6 @@ Routing_Slip::create (const TAO_Notify_Event::Ptr& event ACE_ENV_ARG_DECL)
{
Routing_Slip * prs;
ACE_NEW_THROW_EX (prs, Routing_Slip (event), CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (Routing_Slip_Ptr());
Routing_Slip_Ptr result(prs);
result->this_ptr_ = result; // let the pointers touch so they use the same ref count
@@ -122,7 +121,6 @@ Routing_Slip::create (
if (event.isSet())
{
result = create (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_InputCDR cdr_rs (rs_mb);
if ( result->unmarshal (ecf, cdr_rs))
{
@@ -365,7 +363,6 @@ Routing_Slip::dispatch (
static_cast<int> (request_id),
ps->id()));
ps->execute_task (method ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -855,7 +852,6 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
prequest,
Delivery_Request(this_ptr_, this->delivery_requests_.size ()),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
Delivery_Request_Ptr request(prequest);
TAO_Notify_Method_Request_Dispatch_Queueable * method =
TAO_Notify_Method_Request_Dispatch::unmarshal (
@@ -863,7 +859,6 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
ecf,
cdr
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (method != 0)
{
this->delivery_requests_.push_back (request);
@@ -899,7 +894,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
}
void
-Routing_Slip::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+Routing_Slip::reconnect (void)
{
Routing_Slip_Guard guard (this->internals_);
enter_state_saved (guard);
@@ -908,8 +903,7 @@ Routing_Slip::reconnect (ACE_ENV_SINGLE_ARG_DECL)
size_t count = this->delivery_methods_.size ();
for (size_t nmethod = 0; nmethod < count; ++nmethod)
{
- this->delivery_methods_[nmethod]->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->delivery_methods_[nmethod]->execute ();
}
this->delivery_methods_.clear ();
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index 5670dfc1d05..84714fe29eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -78,7 +78,7 @@ public:
void set_rspm (Routing_Slip_Persistence_Manager * rspm);
- void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void reconnect (void);
/// destructor (should be private but that inspires compiler wars)
virtual ~Routing_Slip ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
index 1be68b66c33..da11e708026 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
@@ -37,7 +37,6 @@ namespace TAO_Notify
if (this->want_all_children_ || o->is_changed ())
{
o->save_persistent (saver_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index a1a29b3eb35..7e10edfb171 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
this->seq_ = tmp;
container.collection ()->for_each (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return this->seq_._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index a7c5adb49c3..94ab584710b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -29,7 +29,7 @@ TAO_Notify_SequenceProxyPushConsumer::release (void)
}
CosNotifyChannelAdmin::ProxyType
-TAO_Notify_SequenceProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequenceProxyPushConsumer::MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -51,11 +51,9 @@ TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyC
CORBA::NO_MEMORY ());
supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
void
@@ -80,20 +78,18 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
TAO_Notify_StructuredEvent_No_Copy event (notification);
this->push_i (&event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
+ this->self_change ();
}
const char *
@@ -117,15 +113,12 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att
if ( ior.length() > 0 )
{
CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// minor hack: suppress generating subscription updates during reload.
bool save_updates = this->updates_off_;
this->updates_off_ = true;
this->connect_sequence_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->updates_off_ = save_updates;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 4db216993cb..f91abbd0962 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -60,7 +60,7 @@ protected:
///= Protected Methods
//= interface methods
- virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::ProxyType MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -81,7 +81,7 @@ protected:
CosEventComm::Disconnected
));
- virtual void disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_sequence_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index be2f9f74299..5c1140577f7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -40,28 +40,25 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC
CORBA::NO_MEMORY ());
consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
void
-TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
+ this->self_change ();
}
CosNotifyChannelAdmin::ProxyType
-TAO_Notify_SequenceProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequenceProxyPushSupplier::MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -90,12 +87,9 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
if (ior.length() > 0)
{
CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 6603d5613e9..cc35f740442 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -62,7 +62,7 @@ public:
virtual void load_attrs (const TAO_Notify::NVPList& attrs);
/// = Servant methods
- virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::ProxyType MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 222e4a5172d..95ddb3a892c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -60,9 +60,8 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
ACE_TRY
{
- CosNotifyComm::SequencePushConsumer_var new_push_consumer =
+ CosNotifyComm::SequencePushConsumer_var new_push_consumer =
CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in());
- ACE_TRY_CHECK;
this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (new_push_consumer.in());
this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
@@ -212,8 +211,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
ACE_DECLARE_NEW_ENV;
ACE_TRY
{
- this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_supplier ()->destroy ();
}
ACE_CATCHANY
{
@@ -269,14 +267,12 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
if (DEBUG_LEVEL > 0)
ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n"));
this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
size_t mbs = static_cast<size_t>(this->max_batch_size_.value());
if (this->pending_events().size() >= mbs || this->pacing_.is_valid () == 0)
{
- this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ this->dispatch_pending ();
}
else
{
@@ -310,7 +306,6 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_
//--cj end
this->push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_CString
@@ -322,7 +317,6 @@ TAO_Notify_SequencePushConsumer::get_ior (void) const
ACE_TRY
{
CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = static_cast<const char*> (ior.in ());
}
ACE_CATCHANY
@@ -340,7 +334,6 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o
TAO_Notify_SequencePushConsumer* tmp = dynamic_cast<TAO_Notify_SequencePushConsumer *> (old_consumer);
ACE_ASSERT(tmp != 0);
this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->schedule_timer(false);
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index df010388763..20000a62737 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -42,7 +42,6 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const
ACE_TRY
{
CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = static_cast<const char*> (ior.in ());
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index c4df69993b1..fb514502662 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -22,11 +22,9 @@ CORBA::Object_ptr
TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = TAO_Notify_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Obtain our ref.
- CORBA::Object_var obj = this->ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ CORBA::Object_var obj = this->ref ();
this->event_forwarder_ = Event_Forwarder::StructuredProxyPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
@@ -46,7 +44,6 @@ TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Di
ACE_TRY
{
request.event()->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -65,7 +62,6 @@ TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_E
ACE_TRY
{
event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 86d312d8f4e..2a744e362ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -57,13 +57,12 @@ TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
}
TAO_Notify_Event *
-TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::copy (void) const
{
TAO_Notify_Event * new_event;
ACE_NEW_THROW_EX (new_event,
TAO_Notify_StructuredEvent (*this->notification_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return new_event;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 5ed850afd93..54755fdb0a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -74,7 +74,7 @@ public:
protected:
/// returns a copy of this event allocated on the heap
- virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const;
+ virtual TAO_Notify_Event * copy (void) const;
/// Structured Event
const CosNotification::StructuredEvent* notification_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index d79e907a741..ca29e011545 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -30,7 +30,7 @@ TAO_Notify_StructuredProxyPushConsumer::release (void)
}
CosNotifyChannelAdmin::ProxyType
-TAO_Notify_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushConsumer::MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -52,10 +52,8 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot
CORBA::NO_MEMORY ());
supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (supplier ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
void
@@ -80,15 +78,14 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica
}
void
-TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
+ this->self_change ();
}
const char *
@@ -108,20 +105,16 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- ACE_TRY_CHECK;
CosNotifyComm::StructuredPushSupplier_var ps = CosNotifyComm::StructuredPushSupplier::_nil();
if ( ior.length() > 0 )
{
CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// minor hack: suppress generating subscription updates during reload.
bool save_updates = this->updates_off_;
this->updates_off_ = true;
this->connect_structured_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->updates_off_ = save_updates;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 82ec83de086..177c16bed68 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -56,7 +56,7 @@ public:
protected:
// = interface methods
- virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::ProxyType MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 10e753f3437..6d71dcb8fbb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -29,7 +29,7 @@ TAO_Notify_StructuredProxyPushSupplier::release (void)
}
CosNotifyChannelAdmin::ProxyType
-TAO_Notify_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushSupplier::MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -52,24 +52,21 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
CORBA::NO_MEMORY ());
consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->connect (consumer ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->self_change ();
}
void
-TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this );
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy ();
+ this->self_change ();
}
const char *
@@ -93,12 +90,9 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
if (ior.length() > 0)
{
CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index b3a3526dbe9..0d6ef16902c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -62,7 +62,7 @@ public:
/// = Servant methods
// = interface methods
- virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::ProxyType MyType (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 7739b12b707..48daf1a676e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -47,9 +47,8 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
ACE_TRY
{
- CosNotifyComm::StructuredPushConsumer_var new_push_consumer =
+ CosNotifyComm::StructuredPushConsumer_var new_push_consumer =
CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (new_push_consumer.in());
this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
@@ -103,7 +102,6 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent&
//--cj end
this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
/// Push a batch of events to this consumer.
@@ -122,7 +120,6 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer*
TAO_Notify_StructuredPushConsumer* tmp = dynamic_cast<TAO_Notify_StructuredPushConsumer *> (old_consumer);
ACE_ASSERT(tmp != 0);
this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->schedule_timer(false);
}
@@ -135,7 +132,6 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const
ACE_TRY
{
CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = static_cast<const char*> (ior.in ());
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 69e28687a34..981911bb89f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -41,7 +41,6 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const
ACE_TRY
{
CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result = static_cast<const char*> (ior.in ());
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 71ff8590b4c..8e38720abe0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -52,7 +52,6 @@ void
TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
{
TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const CosNotification::QoSProperties &default_sa_qos =
TAO_Notify_PROPERTIES::instance ()->default_supplier_admin_qos_properties ();
@@ -61,13 +60,13 @@ TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
}
void
-TAO_Notify_SupplierAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::_add_ref (void)
{
this->_incr_refcnt ();
}
void
-TAO_Notify_SupplierAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::_remove_ref (void)
{
this->_decr_refcnt ();
}
@@ -80,18 +79,16 @@ TAO_Notify_SupplierAdmin::release (void)
}
void
-TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ int result = this->shutdown ();
if ( result == 1)
return;
this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_Notify::Topology_Object*
@@ -106,7 +103,6 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else if (type == "structured_proxy_push_consumer")
{
@@ -115,7 +111,6 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else if (type == "sequence_proxy_push_consumer")
{
@@ -124,12 +119,10 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
, static_cast<int> (id)
));
result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
else
{
result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return result;
}
@@ -146,7 +139,6 @@ TAO_Notify_SupplierAdmin::load_proxy (
, ctype
, id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ACE_ASSERT(proxy != 0);
proxy->load_attrs (attrs);
return proxy;
@@ -164,12 +156,12 @@ TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos AC
}
CosNotification::QoSProperties*
-TAO_Notify_SupplierAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_qos (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_Notify_Object::get_qos ();
}
CosNotifyChannelAdmin::ProxyConsumer_ptr
@@ -190,9 +182,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdm
, proxy_id
, initial_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
+ this->self_change ();
return proxy._retn ();
}
@@ -214,29 +204,25 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
, proxy_id,
initial_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
+ this->self_change ();
return proxy._retn ();
}
CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
CosEventChannelAdmin::ProxyPushConsumer_var proxy =
TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (proxy._retn ());
+ this->self_change ();
return proxy._retn ();
}
CosNotifyChannelAdmin::AdminID
-TAO_Notify_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::MyID (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -245,16 +231,16 @@ TAO_Notify_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_SupplierAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::MyChannel (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->ec_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ec_->_this ();
}
::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::MyOperator (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -263,7 +249,7 @@ TAO_Notify_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::push_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -302,7 +288,6 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
this->subscribed_types_.add_and_remove (seq_added, seq_removed);
@@ -320,9 +305,7 @@ TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE
{
CosNotifyFilter::FilterID fid =
this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (fid);
- this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (fid);
+ this->self_change ();
return fid;
}
@@ -347,27 +330,27 @@ TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_A
}
::CosNotifyFilter::FilterIDSeq*
-TAO_Notify_SupplierAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->filter_admin_.get_all_filters ();
}
void
-TAO_Notify_SupplierAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::remove_all_filters (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->filter_admin_.remove_all_filters ();
}
/************** UNIMPLEMENTED METHODS ***************/
CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_Notify_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::obtain_pull_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -376,7 +359,7 @@ TAO_Notify_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
}
CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::pull_consumers (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -421,7 +404,6 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer (
{
TAO_Notify_ProxyConsumer_Find_Worker find_worker;
TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
result = dynamic_cast <TAO_Notify_ProxyConsumer *> (proxy);
}
return result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index eeeaf0d40ab..3dcffc953a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -54,8 +54,8 @@ public:
void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
/// ServantBase refcount methods.
- virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _add_ref (void);
+ virtual void _remove_ref (void);
virtual const char * get_admin_type_name () const;
@@ -92,7 +92,7 @@ protected:
CosNotification::UnsupportedQoS));
/// = CosNotifyChannelAdmin::SupplierAdmin methods
- virtual CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyChannelAdmin::AdminID MyID (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
@@ -140,10 +140,10 @@ protected:
ACE_THROW_SPEC ((CORBA::SystemException,
CosNotifyChannelAdmin::AdminLimitExceeded));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual ::CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::CosNotification::QoSProperties* get_qos (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void set_qos (const CosNotification::QoSProperties& qos
@@ -190,7 +190,7 @@ protected:
)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void remove_all_filters (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 01a7a51711f..0192a72f5e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -46,7 +46,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
ACE_NEW_THROW_EX (timer,
TAO_Notify_Timer_Queue (),
CORBA::NO_MEMORY ());
- ACE_CHECK;
this->timer_.reset (timer);
@@ -55,7 +54,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties),
CORBA::NO_MEMORY ());
this->buffering_strategy_.reset (buffering_strategy);
- ACE_CHECK;
long flags = THR_NEW_LWP | THR_DETACHED;
CORBA::ORB_var orb =
@@ -103,8 +101,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request A
{
if (!shutdown_)
{
- TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy ();
if (this->buffering_strategy_->enqueue (request_copy) == -1)
{
@@ -138,8 +135,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
if (result > 0)
{
- method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ method_request->execute ();
ACE_Message_Block::release (method_request);
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
index 27eeb6ad143..11736c14a7a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -13,7 +13,7 @@ TAO_Notify::Topology_Loader::~Topology_Loader ()
}
void
-TAO_Notify::Topology_Loader::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify::Topology_Loader::close (void)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index 599afa07985..a30c9c21208 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -72,7 +72,7 @@ public:
* vary based on the type of loader, so we can't include it in the
* interface.
*/
- virtual void close (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void close (void);
};
} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index ac174723aa3..87d61638478 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -22,7 +22,7 @@ namespace TAO_Notify
}
void
- Topology_Savable::reconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ Topology_Savable::reconnect (void)
{
}
@@ -79,22 +79,21 @@ namespace TAO_Notify
}
bool
- Topology_Object::self_change (ACE_ENV_SINGLE_ARG_DECL)
+ Topology_Object::self_change (void)
{
this->self_changed_ = true;
- return send_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return send_change ();
}
bool
- Topology_Object::send_change (ACE_ENV_SINGLE_ARG_DECL)
+ Topology_Object::send_change (void)
{
bool saving = false;
if (is_persistent ())
{
while (this->self_changed_ || this->children_changed_)
{
- saving = this->change_to_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ saving = this->change_to_parent ();
if (!saving)
{
this->self_changed_ = false;
@@ -111,14 +110,13 @@ namespace TAO_Notify
}
bool
- Topology_Object::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
+ Topology_Object::change_to_parent (void)
{
bool result = false;
Topology_Parent * parent = this->topology_parent();
if (parent != 0)
{
- result = parent->child_change(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ result = parent->child_change();
}
return result;
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 53e825c0939..20f40b680fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -73,13 +73,11 @@ namespace TAO_Notify
/// {
/// bool want_all_children = saver.begin_object(
/// this->id(), type, attrs, change ACE_ENV_ARG_PARAMETER);
- /// ACE_CHECK;
/// for all children
/// {
/// if (want_all_children || child.is_changed())
/// {
/// child.save_persistent(saver ACE_ENV_ARG_PARAMETER);
- /// ACE_CHECK;
/// }
/// }
/// for all deleted children
@@ -96,7 +94,7 @@ namespace TAO_Notify
/// to any external objects with whom we were interacting. We should
/// call the reconnect() method on all of our children to give them
/// the chance to do the same.
- virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void reconnect (void);
};
@@ -155,7 +153,7 @@ namespace TAO_Notify
///
/// see also Topology_Parent::child_change ()
/// \return false if save will never happen
- bool self_change (ACE_ENV_SINGLE_ARG_DECL);
+ bool self_change (void);
/// \brief pointer to our topological parent
///
@@ -165,7 +163,7 @@ namespace TAO_Notify
/// \brief Handle details of propagating change
///
/// \return false if save will never happen
- bool send_change (ACE_ENV_SINGLE_ARG_DECL);
+ bool send_change (void);
private:
/// \brief Send change to parent.
@@ -174,7 +172,7 @@ namespace TAO_Notify
/// (top level of tree)
/// private virtual because this should only be called from send_change()
/// \return false if save will never happen
- virtual bool change_to_parent (ACE_ENV_SINGLE_ARG_DECL);
+ virtual bool change_to_parent (void);
protected:
/// true if this object changed since last save_persistent
@@ -197,7 +195,7 @@ namespace TAO_Notify
/// Called by a child that has changed.
/// A child calls this method to report that it has changed.
/// \return false if save will never happen
- bool child_change (ACE_ENV_SINGLE_ARG_DECL);
+ bool child_change (void);
};
} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
index 14363a16d6f..b3d7ef8c054 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
@@ -15,10 +15,10 @@ namespace TAO_Notify
ACE_INLINE
bool
- Topology_Parent::child_change (ACE_ENV_SINGLE_ARG_DECL)
+ Topology_Parent::child_change (void)
{
this->children_changed_ = true;
- return send_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return send_change ();
}
} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
index 65c9aa9f681..77adc658cb0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -9,7 +9,7 @@ TAO_Notify::Topology_Saver::~Topology_Saver ()
}
void
-TAO_Notify::Topology_Saver::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify::Topology_Saver::close (void)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 91648109b7a..4159beb2c19 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -103,7 +103,7 @@ namespace TAO_Notify
* vary based on the type of saver, so we can't include it in the
* interface.
*/
- virtual void close (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void close (void);
};
} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 7dd33e5deb6..2fde3ff524a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -198,7 +198,6 @@ namespace TAO_Notify
Topology_Object* next = cur->load_child (
cname, id, attrs ACE_ENV_ARG_PARAMETER);
ACE_ASSERT(next != 0);
- ACE_TRY_CHECK;
object_stack_.push (next);
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index f6f0864b46f..46264d44035 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -41,12 +41,11 @@ namespace TAO_Notify
}
void
- XML_Saver::close (ACE_ENV_SINGLE_ARG_DECL)
+ XML_Saver::close (void)
{
if (this->close_out_ && this->output_ != 0)
{
this->end_object(0, "notification_service" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_OS::fclose(this->output_);
this->output_ = 0;
@@ -140,7 +139,6 @@ namespace TAO_Notify
attrs.push_back(NVP("timestamp", nowusstr));
}
this->begin_object(0, "notification_service", attrs, changed ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index f7c9afb87e1..873ceaf1a45 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -57,7 +57,7 @@ public:
const ACE_CString& type
ACE_ENV_ARG_DECL);
- virtual void close (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void close (void);
private:
void backup_file_name (char * file_path, int nfile);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 721359a0343..193fba4e773 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -34,17 +34,14 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
// ObjectId out of it.
CORBA::Object_var obj_ref = this->create_reference (repository_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
PortableServer::ObjectId_var obj_id =
this->reference_to_id (obj_ref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Associate the object reference with the group reference.
this->associate_group_with_ref (the_ref,
obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return obj_id._retn ();
}
@@ -76,13 +73,11 @@ TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
// reference.
CORBA::Object_var obj_ref = this->id_to_reference (oid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Associate the object reference with the group reference.
this->associate_group_with_ref (ref,
obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -148,7 +143,6 @@ TAO_GOA::new_POA (const String &name,
object_adapter
ACE_ENV_ARG_PARAMETER),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return poa;
}
@@ -167,7 +161,6 @@ TAO_GOA::create_POA (const char *adapter_name,
poa_manager,
policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (poa);
return poa;
}
@@ -181,7 +174,6 @@ TAO_GOA::find_POA (const char *adapter_name,
PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
activate_it
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (poa);
return poa;
}
@@ -194,7 +186,6 @@ TAO_GOA::destroy (CORBA::Boolean etherealize_objects,
this->TAO_Regular_POA::destroy (etherealize_objects,
wait_for_completion
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -208,7 +199,6 @@ TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value
PortableServer::ThreadPolicy_ptr policy =
this->TAO_Regular_POA::create_thread_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -222,7 +212,6 @@ TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
PortableServer::LifespanPolicy_ptr policy =
this->TAO_Regular_POA::create_lifespan_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -234,7 +223,6 @@ TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va
PortableServer::IdUniquenessPolicy_ptr policy =
this->TAO_Regular_POA::create_id_uniqueness_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -247,7 +235,6 @@ TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
PortableServer::IdAssignmentPolicy_ptr policy =
this->TAO_Regular_POA::create_id_assignment_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -262,7 +249,6 @@ TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo
PortableServer::ImplicitActivationPolicy_ptr policy =
this->TAO_Regular_POA::create_implicit_activation_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -274,7 +260,6 @@ TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy
PortableServer::ServantRetentionPolicy_ptr policy =
this->TAO_Regular_POA::create_servant_retention_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -287,7 +272,6 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli
PortableServer::RequestProcessingPolicy_ptr policy =
this->TAO_Regular_POA::create_request_processing_policy (value
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -295,42 +279,38 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli
#endif /* TAO_HAS_MINIMUM_POA == 0 */
char *
-TAO_GOA::the_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
char * name =
- this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (name);
+ this->TAO_Regular_POA::the_name ();
return name;
}
PortableServer::POA_ptr
-TAO_GOA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_parent (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POA_ptr parent =
- this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (parent);
+ this->TAO_Regular_POA::the_parent ();
return parent;
}
PortableServer::POAList *
-TAO_GOA::the_children (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_children (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POAList *children =
- this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (children);
+ this->TAO_Regular_POA::the_children ();
return children;
}
PortableServer::POAManager_ptr
-TAO_GOA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_POAManager (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POAManager_ptr poa_manager =
- this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (poa_manager);
+ this->TAO_Regular_POA::the_POAManager ();
return poa_manager;
}
@@ -338,12 +318,11 @@ TAO_GOA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
#if (TAO_HAS_MINIMUM_POA == 0)
PortableServer::AdapterActivator_ptr
-TAO_GOA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_activator (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::AdapterActivator_ptr activator =
- this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (activator);
+ this->TAO_Regular_POA::the_activator ();
return activator;
}
@@ -354,17 +333,15 @@ TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
{
this->TAO_Regular_POA::the_activator (adapter_activator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
PortableServer::ServantManager_ptr
-TAO_GOA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::get_servant_manager (void)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::WrongPolicy))
{
PortableServer::ServantManager_ptr servant_manager =
- this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (servant_manager);
+ this->TAO_Regular_POA::get_servant_manager ();
return servant_manager;
}
@@ -376,18 +353,16 @@ TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr
{
this->TAO_Regular_POA::set_servant_manager (imgr
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
PortableServer::Servant
-TAO_GOA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::get_servant (void)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::NoServant,
PortableServer::POA::WrongPolicy))
{
PortableServer::Servant servant =
- this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (servant);
+ this->TAO_Regular_POA::get_servant ();
return servant;
}
@@ -399,7 +374,6 @@ TAO_GOA::set_servant (PortableServer::Servant servant
{
this->TAO_Regular_POA::set_servant (servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -414,7 +388,6 @@ TAO_GOA::activate_object (PortableServer::Servant p_servant
PortableServer::ObjectId *object_id =
this->TAO_Regular_POA::activate_object (p_servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (object_id);
return object_id;
}
@@ -430,7 +403,6 @@ TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
this->TAO_Regular_POA::activate_object_with_id (id,
p_servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -442,7 +414,6 @@ TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid
{
this->TAO_Regular_POA::deactivate_object (oid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CORBA::Object_ptr
@@ -454,7 +425,6 @@ TAO_GOA::create_reference (const char *intf
CORBA::Object_ptr obj =
this->TAO_Regular_POA::create_reference (intf
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (obj);
return obj;
}
@@ -468,7 +438,6 @@ TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid,
this->TAO_Regular_POA::create_reference_with_id (oid,
intf
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (obj);
return obj;
}
@@ -482,7 +451,6 @@ TAO_GOA::servant_to_id (PortableServer::Servant p_servant
PortableServer::ObjectId *object_id =
this->TAO_Regular_POA::servant_to_id (p_servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (object_id);
return object_id;
}
@@ -496,7 +464,6 @@ TAO_GOA::servant_to_reference (PortableServer::Servant p_servant
CORBA::Object_ptr obj =
this->TAO_Regular_POA::servant_to_reference (p_servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (obj);
return obj;
}
@@ -512,7 +479,6 @@ TAO_GOA::reference_to_servant (CORBA::Object_ptr reference
PortableServer::Servant servant =
this->TAO_Regular_POA::reference_to_servant (reference
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (servant);
return servant;
}
@@ -526,7 +492,6 @@ TAO_GOA::reference_to_id (CORBA::Object_ptr reference
PortableServer::ObjectId *object_id =
this->TAO_Regular_POA::reference_to_id (reference
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (object_id);
return object_id;
}
@@ -540,7 +505,6 @@ TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid
PortableServer::Servant servant =
this->TAO_Regular_POA::id_to_servant (oid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (servant);
return servant;
}
@@ -554,15 +518,14 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid
CORBA::Object_ptr obj =
this->TAO_Regular_POA::id_to_reference (oid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (obj);
return obj;
}
CORBA::OctetSeq *
-TAO_GOA::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_Regular_POA::id ();
}
int
@@ -643,7 +606,6 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
acceptor_registry.open (profile,
orb_core
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
++num;
}
@@ -671,7 +633,6 @@ TAO_GOA::associate_group_with_ref (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id;
@@ -693,7 +654,6 @@ TAO_GOA::associate_group_with_ref (
this->orb_core_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Add a mapping from GroupId to Object key in the PortableGroup
@@ -702,7 +662,6 @@ TAO_GOA::associate_group_with_ref (
rd->group_map_.add_groupid_objectkey_pair (group_id._retn (),
key
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index d5bbdeb04dd..03a10db2536 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -149,28 +149,28 @@ public:
#endif /* TAO_HAS_MINIMUM_POA == 0 */
- char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ char * the_name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ PortableServer::POA_ptr the_parent (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ PortableServer::POAList *the_children (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ PortableServer::POAManager_ptr the_POAManager (void)
ACE_THROW_SPEC ((CORBA::SystemException));
#if (TAO_HAS_MINIMUM_POA == 0)
- PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ PortableServer::AdapterActivator_ptr the_activator (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ PortableServer::ServantManager_ptr get_servant_manager (void)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::WrongPolicy));
@@ -179,7 +179,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::WrongPolicy));
- PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ PortableServer::Servant get_servant (void)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::NoServant,
PortableServer::POA::WrongPolicy));
@@ -258,7 +258,7 @@ public:
PortableServer::POA::ObjectNotActive,
PortableServer::POA::WrongPolicy));
- CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ CORBA::OctetSeq *id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// End standard POA interface methods.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 330d3984006..16f718b8f6c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -112,7 +112,7 @@ const char * TAO::PG_FactoryRegistry::identity () const
return this->identity_.c_str();
}
-void TAO::PG_FactoryRegistry::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO::PG_FactoryRegistry::_remove_ref (void)
{
this->quit_state_ = GONE;
}
@@ -136,7 +136,7 @@ int TAO::PG_FactoryRegistry::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
}
-int TAO::PG_FactoryRegistry::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::PG_FactoryRegistry::fini (void)
{
if (this->ior_output_file_ != 0)
{
@@ -164,18 +164,15 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// find my identity as a corba object
this->this_obj_ =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// and create a ior string
this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -190,7 +187,6 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -202,7 +198,6 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->poa_.in()))
{
@@ -212,27 +207,22 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
// find my identity as a corba object
this->this_obj_ =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
// and create a ior string
this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
if (this->ior_output_file_ != 0)
@@ -250,7 +240,6 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
if (CORBA::is_nil(naming_obj.in ())){
ACE_ERROR_RETURN ((LM_ERROR,
@@ -260,14 +249,12 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
this->this_name_.length (1);
this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
this->naming_context_->rebind (this->this_name_, this->this_obj_.in() //CORBA::Object::_duplicate(this_obj)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
}
return result;
@@ -328,7 +315,6 @@ void TAO::PG_FactoryRegistry::register_factory (
ACE_NEW_THROW_EX (role_info,
RoleInfo(5),
CORBA::NO_MEMORY());
- ACE_CHECK;
ACE_AUTO_PTR_RESET (safe_entry, role_info, RoleInfo);
role_info->type_id_ = type_id;
@@ -645,7 +631,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(),
CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
RoleInfo * role_info = 0;
if (this->registry_.find(role, role_info) == 0)
@@ -676,7 +661,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(this->registry_.current_size()),
CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
size_t result_length = 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index b16268b5f66..cb917663981 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -99,7 +99,7 @@ namespace TAO
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* Processing to happen when the ORB's event loop is idle.
@@ -122,7 +122,7 @@ namespace TAO
////////////////////////////////
// override servant base methods
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _remove_ref (void);
//////////////////
// CORBA interface
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 0461276bea1..3115752ee52 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -45,7 +45,6 @@ TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
this->delete_object_i (factory_set,
1 /* Ignore exceptions */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -73,7 +72,6 @@ TAO_PG_GenericFactory::create_object (
PortableGroup::Properties_var properties =
this->property_manager_.get_type_properties (type_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableGroup::MembershipStyleValue membership_style =
TAO_PG_MEMBERSHIP_STYLE;
@@ -93,7 +91,6 @@ TAO_PG_GenericFactory::create_object (
initial_number_members,
minimum_number_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CORBA::ULong fcid = 0;
@@ -138,7 +135,6 @@ TAO_PG_GenericFactory::create_object (
type_id,
the_criteria
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
TAO_PG_Factory_Set factory_set;
@@ -155,7 +151,6 @@ TAO_PG_GenericFactory::create_object (
initial_number_members,
factory_set
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->factory_map_.bind (fcid, factory_set) != 0)
ACE_TRY_THROW (PortableGroup::ObjectNotCreated ());
@@ -171,7 +166,6 @@ TAO_PG_GenericFactory::create_object (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
factory_creation_id = tmp;
@@ -182,16 +176,13 @@ TAO_PG_GenericFactory::create_object (
this->delete_object_i (factory_set,
1 /* Ignore exceptions */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->object_group_manager_.destroy_object_group (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
{
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -234,7 +225,6 @@ TAO_PG_GenericFactory::delete_object (
this->delete_object_i (factory_set,
0 /* Do not ignore exceptions */
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->factory_map_.unbind (fcid) != 0)
ACE_THROW (CORBA::INTERNAL ());
@@ -254,7 +244,6 @@ TAO_PG_GenericFactory::delete_object (
this->object_group_manager_.destroy_object_group (
oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -283,7 +272,6 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
{
factory->delete_object (member_fcid
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -297,7 +285,6 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
// Since GenericFactory::delete_object() can throw an exception,
// decrease the size of the factory array incrementally since
@@ -343,7 +330,6 @@ TAO_PG_GenericFactory::delete_member (
{
info.the_factory->delete_object (node.factory_creation_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The member has been successfully deleted. Reduce the
// size of the factory_set accordingly.
@@ -418,7 +404,6 @@ TAO_PG_GenericFactory::populate_object_group (
type_id,
propagate_member_already_present
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
factory_node.factory_info = factory_info; // Memberwise copy
@@ -474,7 +459,6 @@ TAO_PG_GenericFactory::process_criteria (
PortableGroup::Properties_var props =
this->property_manager_.get_type_properties (type_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Merge the given criteria with the type-specific criteria.
TAO_PG::override_properties (criteria, props.inout ());
@@ -611,7 +595,6 @@ TAO_PG_GenericFactory::check_minimum_number_members (
PortableGroup::Properties_var props =
this->property_manager_.get_properties (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableGroup::Name name (1);
name.length (1);
@@ -636,7 +619,6 @@ TAO_PG_GenericFactory::check_minimum_number_members (
const CORBA::ULong count =
this->object_group_manager_.member_count (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (count >= static_cast<CORBA::ULong> (minimum_number_members))
return;
@@ -673,7 +655,6 @@ TAO_PG_GenericFactory::check_minimum_number_members (
type_id,
propagate_member_already_present
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
++creation_count;
@@ -687,7 +668,6 @@ TAO_PG_GenericFactory::check_minimum_number_members (
// Ignore this exception and continue.
}
ACE_ENDTRY;
- ACE_CHECK;
}
// @todo If we get this far, and the MinimumNumberMembers
@@ -718,7 +698,6 @@ TAO_PG_GenericFactory::create_member (
factory_info.the_criteria,
fcid.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_TRY
{
@@ -733,7 +712,6 @@ TAO_PG_GenericFactory::create_member (
CORBA::Boolean right_type_id =
member->_is_a (type_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// @todo Strategize this -- e.g. strict type checking.
if (!right_type_id)
@@ -742,7 +720,6 @@ TAO_PG_GenericFactory::create_member (
// it, and throw a NoFactory exception.
factory_info.the_factory->delete_object (fcid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_THROW (PortableGroup::NoFactory (factory_info.the_location,
type_id));
@@ -755,7 +732,6 @@ TAO_PG_GenericFactory::create_member (
type_id,
propagate_member_already_present
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -766,13 +742,11 @@ TAO_PG_GenericFactory::create_member (
{
factory_info.the_factory->delete_object (fcid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return fcid._retn ();
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 3c84812d454..3c911ac6674 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -66,7 +66,6 @@ void TAO::PG_Group_Factory::init (
ACE_ASSERT (!CORBA::is_nil (this->factory_registry_.in ()));
this->manipulator_.init (orb, poa ACE_ENV_ARG_PARAMETER);
-// ACE_CHECK;
}
@@ -92,7 +91,6 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
this->domain_id_,
group_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// pick up the object group information as assigned by
// ObjectGroupManager
@@ -209,7 +207,6 @@ TAO::PG_Group_Factory::groups_at_location (
result,
PortableGroup::ObjectGroups (upper_limit),
CORBA::NO_MEMORY());
- ACE_CHECK_RETURN (0);
result->length(upper_limit);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index dc93a9e2e2c..55832aabccc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -34,13 +34,11 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void)
this->generic_factory_.delete_object_i (this->factory_set_,
1 // Ignore exceptions
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This should never throw an exception if this Guard is
// used properly.
this->group_manager_.destroy_object_group (this->oid_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 7b78ef895bc..c6cb7bab513 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -131,7 +131,6 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
member,
check_type_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
{
@@ -150,7 +149,6 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
type_id));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
return new_group._retn ();
}
@@ -170,7 +168,6 @@ TAO_PG_ObjectGroupManager::add_member_i (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
if (check_type_id)
{
@@ -179,7 +176,6 @@ TAO_PG_ObjectGroupManager::add_member_i (
group_entry,
member
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
if (!right_type_id)
{
@@ -209,7 +205,6 @@ TAO_PG_ObjectGroupManager::add_member_i (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
auto_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups);
@@ -253,7 +248,6 @@ TAO_PG_ObjectGroupManager::remove_member (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
TAO_PG_ObjectGroup_Array * groups = 0;
if (this->location_map_.find (the_location, groups) != 0)
@@ -298,7 +292,6 @@ TAO_PG_ObjectGroupManager::remove_member (
this->generic_factory_->delete_member (group_entry->group_id,
the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
}
if (member_infos.remove (info) == 0)
@@ -310,7 +303,6 @@ TAO_PG_ObjectGroupManager::remove_member (
group_entry->group_id,
group_entry->type_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
}
return PortableGroup::ObjectGroup::_duplicate (object_group);
@@ -336,7 +328,6 @@ TAO_PG_ObjectGroupManager::locations_of_members (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
PortableGroup::Locations *temp = 0;
ACE_NEW_THROW_EX (temp,
@@ -346,7 +337,6 @@ TAO_PG_ObjectGroupManager::locations_of_members (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
PortableGroup::Locations_var locations = temp;
@@ -375,7 +365,6 @@ TAO_PG_ObjectGroupManager::groups_at_location (
ACE_NEW_THROW_EX (ogs,
PortableGroup::ObjectGroups,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
PortableGroup::ObjectGroups_var object_groups = ogs;
@@ -414,7 +403,6 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
TAO_PG_ObjectGroup_Map_Entry * entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (entry == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -442,7 +430,6 @@ TAO_PG_ObjectGroupManager::get_object_group_ref (
entry = this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
}
if (entry == 0)
@@ -470,7 +457,6 @@ TAO_PG_ObjectGroupManager::get_member_ref (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
// This method assumes that it is faster to check for non-existence
// of an object group (and hence the member) at a given location,
@@ -558,7 +544,6 @@ TAO_PG_ObjectGroupManager::create_object_group (
this->poa_->create_reference_with_id (oid,
type_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
ACE_NEW_THROW_EX (group_entry,
@@ -568,7 +553,6 @@ TAO_PG_ObjectGroupManager::create_object_group (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
auto_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry);
@@ -628,7 +612,6 @@ TAO_PG_ObjectGroupManager::type_id (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CORBA::string_dup (group_entry->type_id.in ());
}
@@ -664,7 +647,6 @@ TAO_PG_ObjectGroupManager::member_count (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return static_cast<CORBA::ULong> (group_entry->member_infos.size ());
}
@@ -691,7 +673,6 @@ TAO_PG_ObjectGroupManager::get_properties (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
PortableGroup::Properties_var safe_properties = properties;
@@ -704,7 +685,6 @@ TAO_PG_ObjectGroupManager::get_properties (
TAO_PG_ObjectGroup_Map_Entry * group_entry =
this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
*properties = group_entry->properties;
}
@@ -727,7 +707,6 @@ TAO_PG_ObjectGroupManager::get_group_entry (
{
oid = this->poa_->reference_to_id (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (PortableServer::POA::WrongAdapter, ex)
{
@@ -744,7 +723,6 @@ TAO_PG_ObjectGroupManager::get_group_entry (
ACE_TRY_THROW (CORBA::INTERNAL ());
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
if (this->object_group_map_.find (oid.in (), group_entry) != 0)
@@ -849,14 +827,12 @@ TAO_PG_ObjectGroupManager::valid_type_id (
right_type_id =
member->_is_a (type_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (right_type_id);
}
// Make sure the group entry still exists. It may have been
// destroyed by another thread.
group_entry = this->get_group_entry (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (right_type_id);
return right_type_id;
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 09d492e76a0..7fc3d2ff98b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -177,7 +177,6 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
this->manipulator_.remove_profiles (cleaned.in (),
this->reference_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil());
this->empty_ = 0;
}
@@ -190,7 +189,6 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
// Now merge the list into one new IOGR
result =
this->manipulator_.merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
return result._retn ();
}
@@ -214,18 +212,15 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
CORBA::String_var member_ior_string =
orb_->object_to_string (member
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableGroup::ObjectGroup_var new_reference =
add_member_to_iogr (member
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Convert new member back to a (non group) ior.
CORBA::Object_var member_ior =
this->orb_->string_to_object (member_ior_string.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
MemberInfo * info = 0;
ACE_NEW_THROW_EX (info,
@@ -243,8 +238,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
// a duplicate
if (this->increment_version ())
{
- this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->distribute_iogr ();
}
else
{
@@ -290,7 +284,6 @@ TAO::PG_Object_Group::set_primary_member (
this->reference_.in (),
info->member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (!set_ok)
{
if (TAO_debug_level > 3)
@@ -306,8 +299,7 @@ TAO::PG_Object_Group::set_primary_member (
if (result && this->increment_version ())
{
- this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->distribute_iogr ();
}
else
{
@@ -356,7 +348,6 @@ TAO::PG_Object_Group::remove_member (
this->manipulator_.remove_profiles (this->reference_.in (),
info->member_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -372,8 +363,7 @@ TAO::PG_Object_Group::remove_member (
if (this->increment_version ())
{
- this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->distribute_iogr ();
}
}
@@ -467,13 +457,12 @@ TAO::PG_Object_Group::increment_version (void)
//////////////////
// Internal method
void
-TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::distribute_iogr (void)
{
// assume internals is locked
CORBA::String_var iogr =
this->orb_->object_to_string (this->reference_.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// size_t n_rep = 0; // for dump_ior below
for (MemberMap_Iterator it = this->members_.begin();
@@ -511,7 +500,6 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
this->tagged_component_.object_group_ref_version,
info->is_primary_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -532,7 +520,7 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
}
PortableGroup::Locations *
-TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::locations_of_members (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -548,7 +536,6 @@ TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
result,
PortableGroup::Locations (count),
CORBA::NO_MEMORY() );
- ACE_CHECK_RETURN (0);
result->length (count);
@@ -658,7 +645,6 @@ TAO::PG_Object_Group::create_member (
role_.c_str(),
factory_type.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ what if factory_type != type_id != this->type_id_
@@ -682,25 +668,21 @@ TAO::PG_Object_Group::create_member (
the_criteria,
fcid. out()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// convert the new member to a stringified IOR to avoid
// contamination with group info
CORBA::String_var member_ior_string =
orb_->object_to_string (member.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableGroup::ObjectGroup_var new_reference =
this->add_member_to_iogr (member.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Convert new member back to a (non group) ior.
CORBA::Object_var member_ior =
this->orb_->string_to_object (member_ior_string.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
MemberInfo * info = 0;
ACE_NEW_THROW_EX (info, MemberInfo(
@@ -709,7 +691,6 @@ TAO::PG_Object_Group::create_member (
factory_info.the_factory,
fcid.in ()),
CORBA::NO_MEMORY());
- ACE_CHECK;
if (this->members_.bind (the_location, info) != 0)
{
@@ -721,8 +702,7 @@ TAO::PG_Object_Group::create_member (
// duplicate
if (this->increment_version ())
{
- this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->distribute_iogr ();
}
created = 1;
}
@@ -752,7 +732,6 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
role_.c_str(),
factory_type.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong factory_count = factories->length ();
if (factory_count > 0)
@@ -778,25 +757,21 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
factory_info.the_criteria,
fcid. out()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// convert the new member to a stringified IOR to avoid
// contamination with group info
CORBA::String_var member_ior_string =
orb_->object_to_string (member.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableGroup::ObjectGroup_var new_reference =
this->add_member_to_iogr (member.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Convert new member back to a (non group) ior.
CORBA::Object_var member_ior =
this->orb_->string_to_object (member_ior_string.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
MemberInfo * info = 0;
ACE_NEW_THROW_EX (info, MemberInfo(
@@ -805,7 +780,6 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
factory_info.the_factory,
fcid.in ()),
CORBA::NO_MEMORY());
- ACE_TRY_CHECK;
if (this->members_.bind (factory_location, info) != 0)
{
@@ -835,8 +809,7 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
if (this->increment_version ())
{
- this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->distribute_iogr ();
}
}
else
@@ -846,7 +819,7 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
}
void
-TAO::PG_Object_Group::initial_populate (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::initial_populate (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
@@ -859,13 +832,12 @@ TAO::PG_Object_Group::initial_populate (ACE_ENV_SINGLE_ARG_DECL)
{
this->create_members (initial_number_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
void
-TAO::PG_Object_Group::minimum_populate (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::minimum_populate (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index aaf4628cda3..b466da4d3d2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -249,7 +249,7 @@ namespace TAO
/**
* @@TODO DOC
*/
- PortableGroup::Locations * locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
+ PortableGroup::Locations * locations_of_members (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -266,12 +266,12 @@ namespace TAO
/**
* @@TODO DOC
*/
- void initial_populate (ACE_ENV_SINGLE_ARG_DECL);
+ void initial_populate (void);
/**
* @@TODO DOC
*/
- void minimum_populate (ACE_ENV_SINGLE_ARG_DECL);
+ void minimum_populate (void);
/**
@@ -285,7 +285,7 @@ namespace TAO
int increment_version ();
- void distribute_iogr (ACE_ENV_SINGLE_ARG_DECL);
+ void distribute_iogr (void);
PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 2fb57ae571a..65fbaf99762 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -74,7 +74,6 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
this->poa_->create_reference_with_id (oid.in(),
type_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableGroup::TagGroupTaggedComponent tag_component;
@@ -87,7 +86,6 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
// Set the property
TAO::PG_Utils::set_tagged_component (object_group,
tag_component);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return object_group._retn ();
}
@@ -106,11 +104,9 @@ TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb,
// Get an object reference for the ORBs IORManipulation object!
CORBA::Object_var IORM = this->orb_->resolve_initial_references (
TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->iorm_ = TAO_IOP::TAO_IOR_Manipulation::_narrow (
IORM.in () ACE_ENV_ARG_PARAMETER);
-// ACE_CHECK;
}
int TAO::PG_Object_Group_Manipulator::set_primary (
@@ -120,11 +116,9 @@ int TAO::PG_Object_Group_Manipulator::set_primary (
ACE_ENV_ARG_DECL) const
{
int sts = this->iorm_->is_primary_set (prop, group ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (sts)
{
(void)this->iorm_->remove_primary_tag (prop, group ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
/////note: iorm takes it's parameters in the "wrong" order for this call
return this->iorm_->set_primary (prop, new_primary, group ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index cc8d023d899..6cb93acdff3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -50,7 +50,6 @@ TAO::PG_Properties_Support::get_default_properties (
{
PortableGroup::Properties_var result;
ACE_NEW_THROW_EX ( result, PortableGroup::Properties(), CORBA::NO_MEMORY());
- ACE_CHECK_RETURN (0);
this->default_properties_.export_properties (*result);
return result._retn ();
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index 50e2f504ffd..89233d0f012 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -98,7 +98,7 @@ namespace TAO
* resource leaks.
* @returns a newly allocated PortableGroup::Properties.
*/
- PortableGroup::Properties * get_default_properties (ACE_ENV_SINGLE_ARG_DECL)
+ PortableGroup::Properties * get_default_properties (void)
ACE_THROW_SPEC ( (CORBA::SystemException,
PortableGroup::InvalidProperty,
PortableGroup::UnsupportedProperty));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index f6d9fb2a13c..0cde16c21b8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -52,7 +52,6 @@ TAO_PG_PropertyManager::set_default_properties (
this->property_validator_.validate_property (props
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
@@ -75,7 +74,6 @@ TAO_PG_PropertyManager::get_default_properties (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return props;
}
@@ -97,7 +95,6 @@ TAO_PG_PropertyManager::remove_default_properties (
this->remove_properties (props,
this->default_properties_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -112,7 +109,6 @@ TAO_PG_PropertyManager::set_type_properties (
{
this->property_validator_.validate_property (overrides
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong num_overrides = overrides.length ();
@@ -159,7 +155,6 @@ TAO_PG_PropertyManager::get_type_properties (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
PortableGroup::Properties_var properties = tmp_properties;
@@ -201,7 +196,6 @@ TAO_PG_PropertyManager::remove_type_properties (
this->remove_properties (props,
type_properties
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -236,7 +230,6 @@ TAO_PG_PropertyManager::set_properties_dynamically (
this->property_validator_.validate_property (overrides
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @todo Set the properties in the object group map entry.
#endif /* 0 */
@@ -260,7 +253,6 @@ TAO_PG_PropertyManager::get_properties (
PortableGroup::Properties_var dynamic_properties =
this->object_group_manager_.get_properties (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::ULong dyn_props_len = dynamic_properties->length ();
if (dyn_props_len > properties_len)
@@ -269,7 +261,6 @@ TAO_PG_PropertyManager::get_properties (
CORBA::String_var type_id =
this->object_group_manager_.type_id (object_group
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CORBA::ULong type_props_len = 0;
PortableGroup::Properties * type_properties = 0;
@@ -295,7 +286,6 @@ TAO_PG_PropertyManager::get_properties (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
PortableGroup::Properties_var properties = tmp_properties;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index e63ff905d9d..196f92dd8e5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -76,7 +76,6 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
this->set_property (static_cast<const char *> (nc.id),
property.val
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if 0
ACE_CString name = static_cast<const char *> (nc.id);
@@ -85,7 +84,6 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
ACE_NEW_THROW_EX (value_copy,
PortableGroup::Value (property.val),
CORBA::NO_MEMORY ());
- ACE_CHECK;
const PortableGroup::Value * replaced_value = 0;
if (0 == this->values_.rebind (name, value_copy, replaced_value))
@@ -158,7 +156,6 @@ void TAO::PG_Property_Set::set_property (
ACE_NEW_THROW_EX (
value_copy, PortableGroup::Value (value),
CORBA::NO_MEMORY ());
- ACE_CHECK;
const PortableGroup::Value * replaced_value = 0;
if (0 == this->values_.rebind (name, value_copy, replaced_value))
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 4b3504795e2..44dc85aaf3d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -36,7 +36,6 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
object_adapter
ACE_ENV_ARG_PARAMETER),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return poa;
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index a22594ca04b..2962b4a5270 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -70,7 +70,6 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
orb_core,
factory
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// found = 1; // A usable protocol was found.
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 2878d3db9a6..aba18845954 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -38,12 +38,10 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
orb_initializer = temp_orb_initializer;
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
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 870c6b75e59..94c07aba6e4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -28,7 +28,6 @@ TAO_PortableGroup_ORBInitializer::pre_init (
// orb_core() TAO extension.
TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (tao_info.in ()))
{
@@ -51,7 +50,6 @@ TAO_PortableGroup_ORBInitializer::pre_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
tao_info->orb_core ()->request_dispatcher (rd);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index ae3fbe2d941..90746bf0dc8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -42,7 +42,6 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
request,
forward_to
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return;
}
@@ -55,7 +54,6 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
request,
forward_to
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 73745a4460b..87d925d5435 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -65,7 +65,6 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
// Fill out the entry.
new_entry->key = key;
@@ -140,7 +139,6 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_
request,
forward_to
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Reset the read pointer in the message block.
msgblk->rd_ptr (read_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 30f909e93e4..82f5174c71d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -154,7 +154,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr)
}
TAO_Profile *
-TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UIPMC_Connector::make_profile (void)
{
// The endpoint should be of the form:
// N.n@host:port/object_key
@@ -169,7 +169,6 @@ TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return profile;
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 43357053bd2..f7648dd917d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -70,7 +70,7 @@ protected:
TAO_Transport_Descriptor_Interface &desc,
ACE_Time_Value *timeout = 0);
- virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Profile * make_profile (void);
/// Cancel the passed cvs handler from the connector
virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index d242aef76a1..7e69bc96aa7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -84,7 +84,6 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
{
this->add_group_component ();
this->parse_string (string ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
addressing_mode_ = default_addressing_mode_;
}
@@ -447,7 +446,7 @@ TAO_UIPMC_Profile::endpoint_count (void) const
}
char *
-TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UIPMC_Profile::to_string (void)
{
// @@ Frank: Update to pull out GroupID information...
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index a6f8846eeb5..bd7074695bf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -81,14 +81,14 @@ public:
~TAO_UIPMC_Profile (void);
/// Template methods. Please see tao/Profile.h for documentation.
-
+
/// N.B. We have to override the TAO_Profile default decode because
/// in UIPMC there is no object key marshalled and we do not implement
/// a useable ::decode_endpoints
virtual int decode (TAO_InputCDR& cdr);
virtual void parse_string (const char *string
ACE_ENV_ARG_DECL);
- virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+ virtual char * to_string (void);
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
virtual CORBA::ULong endpoint_count (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 817d0726b4b..da43bc14b8f 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -102,7 +102,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
// things.
CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySetFactory::create_propertyset (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// New a TAO_PropertySet.
@@ -113,7 +113,7 @@ TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ULong cur_len = this->propertyset_products_.length ();
this->propertyset_products_.length (cur_len + 1);
this->propertyset_products_[cur_len] = new_set;
- return new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return new_set->_this ();
}
// Allows a client to create a new TAO_PropertySet with specific
@@ -136,7 +136,6 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
TAO_PropertySet (allowed_property_types,
allowed_properties
ACE_ENV_ARG_PARAMETER), 0);
- ACE_TRY_CHECK;
// Successful, store this in the products sequence.
CORBA::ULong products_len = this->propertyset_products_.length ();
@@ -144,8 +143,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
this->propertyset_products_[products_len] = new_set;
// All done.
- propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propset_ptr = new_set->_this ();
}
ACE_CATCH (CORBA::UserException, ex)
{
@@ -164,7 +162,6 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return propset_ptr;
}
@@ -187,7 +184,6 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
ACE_NEW_RETURN (new_set,
TAO_PropertySet (initial_properties
ACE_ENV_ARG_PARAMETER), 0);
- ACE_TRY_CHECK;
// Successful, store this in the products sequence.
CORBA::ULong products_len = this->propertyset_products_.length ();
@@ -195,8 +191,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
this->propertyset_products_[products_len] = new_set;
// All done.
- propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propset_ptr = new_set->_this ();
}
ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
{
@@ -215,7 +210,6 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return propset_ptr;
}
@@ -243,7 +237,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
// delete all these New'ed things.
CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySetDefFactory::create_propertysetdef (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// New a TAO_PropertySetDef.
@@ -256,8 +250,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL)
this->propertysetdef_products_[cur_len] = new_set;
CosPropertyService::PropertySetDef_ptr propsetdef_ptr =
- new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ new_set->_this ();
return propsetdef_ptr;
}
@@ -279,7 +272,6 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
TAO_PropertySetDef (allowed_property_types,
allowed_property_defs
ACE_ENV_ARG_PARAMETER), 0);
- ACE_TRY_CHECK;
// Successful, store this in the products sequence.
CORBA::ULong products_len = this->propertysetdef_products_.length ();
@@ -287,8 +279,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propsetdef_ptr = new_set->_this ();
}
ACE_CATCH (CORBA::UserException, ex)
{
@@ -307,7 +298,6 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return propsetdef_ptr;
}
@@ -330,7 +320,6 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
ACE_NEW_RETURN (new_set,
TAO_PropertySetDef (initial_property_defs
ACE_ENV_ARG_PARAMETER), 0);
- ACE_TRY_CHECK;
// Successful, store this in the products sequence.
CORBA::ULong products_len = this->propertysetdef_products_.length ();
@@ -338,8 +327,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
this->propertysetdef_products_[products_len] = new_set;
// All done.
- propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propsetdef_ptr = new_set->_this ();
}
ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
{
@@ -358,7 +346,6 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return propsetdef_ptr;
}
@@ -398,7 +385,6 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
{
this->define_properties (allowed_properties
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -406,7 +392,6 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// TAO_PropertySetDef's constructor needs this, for initializing the
@@ -433,7 +418,6 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_p
{
this->define_properties (initial_properties
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -441,7 +425,6 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_p
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Destructor. All sequences will be deleted.
@@ -514,7 +497,6 @@ TAO_PropertySet::define_property (const char *property_name,
CORBA::Boolean const equal_tc =
mapped_tc.in ()->equal (arg_tc.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// If type is not the same, raise exception.
if (!equal_tc)
@@ -567,7 +549,6 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
{
ret_val = this->allowed_property_types_[ti]->equal (type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ret_val == 1)
return 1;
@@ -579,7 +560,6 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
return ret_val;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
// Type not found.
@@ -633,7 +613,6 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
this->define_property (nproperties [pi].property_name.in (),
nproperties [pi].property_value
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
@@ -685,7 +664,6 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Raise the multi exception if needed.
@@ -698,7 +676,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
CORBA::ULong
-TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertySet::get_number_of_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return static_cast<CORBA::ULong> (this->hash_table_.current_size ());
@@ -722,8 +700,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
CosPropertyService::PropertyNames);
CORBA::ULong num_of_properties =
- this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_number_of_properties ();
if (num_of_properties == 0)
// Nothing to do.
@@ -780,14 +757,12 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
// Get the Interface ptr.
CosPropertyService::PropertyNamesIterator_ptr iterator_ptr =
- names_iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ names_iterator->_this ();
// POA stuff todo here, since we have <destroy> method in the
// <NamesIterator> interface.
// Give ownership of this servant to the POA.
- names_iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ names_iterator->_remove_ref ();
// Init the out parameter.
rest = iterator_ptr;
@@ -861,7 +836,6 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
{
any_ptr = get_property_value (property_names [i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (any_ptr != 0)
{
@@ -902,8 +876,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
// Validate the length.
CORBA::ULong num_of_properties =
- this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_number_of_properties ();
if (num_of_properties == 0)
return;
@@ -969,14 +942,12 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
// Get the interface ptr.
CosPropertyService::PropertiesIterator_ptr iterator_ptr =
- iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ iterator->_this ();
// POA stuff todo here, since we have <destroy> method in the
// <NamesIterator> interface.
// Give ownership of this servant to the POA.
- iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ iterator->_remove_ref ();
// Init the out parameter.
rest = iterator_ptr;
@@ -1047,7 +1018,6 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
// Delete this property.
this->delete_property (property_names[pi]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
@@ -1085,7 +1055,6 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Raise the multiple exceptions if there are any.
@@ -1098,7 +1067,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
CORBA::Boolean
-TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet::delete_all_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get all the property names in a names' sequence.
@@ -1110,14 +1079,12 @@ TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr);
CosPropertyService::PropertyNamesIterator_var iter;
- CORBA::ULong size = this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CORBA::ULong size = this->get_number_of_properties ();
this->get_all_property_names (size,
names_out,
iter_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Get the out values on to the var varibles.
names = names_out.ptr ();
@@ -1126,7 +1093,6 @@ TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
// Delete all these properties.
this->delete_properties (names.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// All properties deleted.
return 1;
@@ -1186,14 +1152,12 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
{
this->define_properties_with_modes (allowed_property_defs
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Constructor that the factory uses.
@@ -1203,7 +1167,6 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs i
{
this->define_properties_with_modes (initial_property_defs
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Destructor.
@@ -1351,7 +1314,6 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
property_defs[i].property_value,
property_defs[i].property_mode
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
{
@@ -1412,7 +1374,6 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Raise the multi exception if needed.
@@ -1491,7 +1452,6 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
// Invoke get_property_mode for this name.
mode = this->get_property_mode (property_names[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Store the mode in the out sequence.
property_modes[i].property_name = property_names[i];
@@ -1508,7 +1468,6 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
property_modes[i].property_mode = CosPropertyService::undefined;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
return ret;
@@ -1634,7 +1593,6 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
this->set_property_mode (property_modes[i].property_name,
property_modes[i].property_mode
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
{
@@ -1671,7 +1629,6 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
// Raise the multi_ex, if needed.
@@ -1698,7 +1655,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
// one exists.
void
-TAO_PropertyNamesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertyNamesIterator::reset (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->iterator_ = this->iterator_.map ().begin ();
@@ -1763,23 +1720,20 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
}
void
-TAO_PropertyNamesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator::destroy (void)
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var poa = this->_default_POA ();
PortableServer::ObjectId_var id = poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
//======================================================================
@@ -1794,7 +1748,7 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
}
void
-TAO_PropertiesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertiesIterator::reset (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->iterator_ = this->iterator_.map ().begin ();
@@ -1866,23 +1820,20 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
}
void
-TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertiesIterator::destroy (void)
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var poa = this->_default_POA ();
PortableServer::ObjectId_var id = poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index d887745dec3..0f7fe93af58 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -127,7 +127,7 @@ public:
// Destructor.
virtual CosPropertyService::PropertySet_ptr
- create_propertyset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ create_propertyset (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Returns a new TAO_PropertySet object. "The property set returned
// will *not* have any initial properties."
@@ -180,7 +180,7 @@ public:
// Destructor.
virtual CosPropertyService::PropertySetDef_ptr
- create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ create_propertysetdef (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Returns a new TAO_PropertySetDef object.
@@ -262,7 +262,7 @@ public:
CosPropertyService::MultipleExceptions));
// Define a sequence of properties at a time.
- virtual CORBA::ULong get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::ULong get_number_of_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Get the number of properties that are currently defined in the
// PropertySet.
@@ -311,7 +311,7 @@ public:
CosPropertyService::MultipleExceptions));
// Delete all the these properties from this property set.
- virtual CORBA::Boolean delete_all_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean delete_all_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Delete everything from this property set.
@@ -509,7 +509,7 @@ public:
virtual ~TAO_PropertyNamesIterator (void);
// Destructor.
- virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void reset (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The reset operation resets the position in an iterator to the
// first property name, if one exists.
@@ -532,7 +532,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 (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Destroys the iterator.
private:
@@ -572,7 +572,7 @@ public:
virtual ~TAO_PropertiesIterator (void);
// Destructor.
- virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void reset (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Resets the position in an iterator to the first property, if one exists.
@@ -594,7 +594,7 @@ public:
// at most the how_many number of properties. A return of false
// signifies no more items in the iterator.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Destroys the iterator.
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index d13cfe93576..2c14bdcbe5a 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -54,7 +54,6 @@ namespace TAO
ACE_NEW_THROW_EX (this->client_interceptor_,
RTCosScheduling_ClientScheduler_Interceptor(orb),
CORBA::NO_MEMORY());
- ACE_CHECK;
TAO_ORB_Core *orb_core = orb->orb_core();
@@ -102,19 +101,16 @@ namespace TAO
CORBA::Object_var rt_obj =
orb->resolve_initial_references("RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference to the real time orb
RTCORBA::RTORB_var rt_orb =
RTCORBA::RTORB::_narrow (rt_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// resolve a reference to RT Current
rt_obj =
orb->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->current_ =
RTCORBA::Current::_narrow (rt_obj.in () ACE_ENV_ARG_PARAMETER);
@@ -127,7 +123,6 @@ namespace TAO
RTCORBA::PriorityMappingManager_var mapping_manager =
RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Create the Linear Priority Mapping Manager
ACE_NEW_THROW_EX(this->pm_,
@@ -137,7 +132,6 @@ namespace TAO
// WHERE the parameter is one of SCHED_OTHER, SCHED_FIFO, or SCHED_RR
mapping_manager->mapping(this->pm_);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -178,7 +172,6 @@ void RTCosScheduling_ClientScheduler_i::schedule_activity (
{
this->current_->the_priority(priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
/// If the activity was not found, throw an UnknownName exception.
else
@@ -325,7 +318,6 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
CORBA::Object_var obj =
orb->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(obj.in()))
{
ACE_OS::exit(1);
@@ -335,7 +327,6 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
this->current_ =
RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
}
- ACE_CHECK;
obj =
orb->resolve_initial_references("CodecFactory"
@@ -380,7 +371,6 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
CORBA::Object_var obj =
orb->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil(obj.in()))
{
ACE_OS::exit(1);
@@ -390,7 +380,6 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
this->current_ =
RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
}
- ACE_TRY_CHECK;
obj =
orb->resolve_initial_references("CodecFactory"
@@ -418,7 +407,6 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
// Create the codec
this->codec_ = codec_factory->create_codec(encoding);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -457,7 +445,6 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request (
CORBA::Any the_priority_as_any;
the_priority_as_any <<=
this->current_->the_priority();
- ACE_TRY_CHECK;
// Set up a service context to hold the priority
IOP::ServiceContext sc;
@@ -467,11 +454,9 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request (
// (that is how service contexts send data)
sc.context_data =
reinterpret_cast<CORBA::OctetSeq &> (*this->codec_->encode (the_priority_as_any));
- ACE_TRY_CHECK;
// add the service context
ri->add_request_service_context(sc, 0);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index 69ac688e910..2ecf9755f0d 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -85,10 +85,10 @@ public:
//@{
/// Return the name of this ClientRequestInterceptor.
//
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void send_request (
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index b7fa81697e3..201cd60d568 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -55,7 +55,6 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
ACE_SYNCH_CONDITION(*mutex),
CORBA::NO_MEMORY());
}
- ACE_TRY_CHECK;
lock_array[size - 1].next(0); /// terminate the free list
@@ -265,7 +264,6 @@ PCP_Manager::lock(const int priority_ceiling, const int priority)
// at RTCORBA::maxPriority
this->current_->the_priority(RTCORBA::maxPriority);
this->mutex_->acquire();
- ACE_TRY_CHECK;
/// create a structure to store my own lock request
CosSchedulingLockNode MyLock;
@@ -322,19 +320,16 @@ PCP_Manager::lock(const int priority_ceiling, const int priority)
ACE_ERROR((LM_ERROR,
"Error in deferring lock\n"));
}
- ACE_TRY_CHECK;
}
}
/// remove mutex on the lock list
this->mutex_->release();
- ACE_TRY_CHECK;
/// at this point we have the right to set the OS priority
/// Do so at the priority ceiline.
this->current_->the_priority(priority_ceiling);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -358,7 +353,6 @@ void PCP_Manager::release_lock()
/// set up the mutex
this->mutex_->acquire();
- ACE_TRY_CHECK;
/// remove the lock node from the list of locks
CosSchedulingLockNode L;
@@ -367,7 +361,6 @@ void PCP_Manager::release_lock()
/// Done with the list, release the mutex
this->mutex_->release();
- ACE_TRY_CHECK;
/// Let the highest priority lock signal the condition variable
CosSchedulingLockNode *waiter = this->locks_->highest_priority();
@@ -375,7 +368,6 @@ void PCP_Manager::release_lock()
{
waiter->condition_->signal();
}
- ACE_TRY_CHECK;
/// We do not need to restore priority because we have already set this
// thread to wait at RTCORBA::maxPriority at the start of this method
@@ -411,7 +403,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
__LINE__));
ACE_OS::exit(1);
}
- ACE_TRY_CHECK;
/// Add the filename to the end
ACE_OS_String::strcat (temp_file, shared_file);
@@ -433,7 +424,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
ACE_ERROR ((LM_ERROR,
"(%P|%t) %p\n",
this->shm_key_));
- ACE_TRY_CHECK;
#else /* !ACE_LACKS_MMAP */
ACE_DEBUG((LM_ERROR,
@@ -464,7 +454,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
ACE_OS::exit(1);
}
- ACE_CHECK;
/// Make the shared memory a place for a lock list
this->lock_array_ = static_cast<CosSchedulingLockNode *> (this->mem_.malloc(CosSchedulingLockList_space));
@@ -489,7 +478,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
&this->mutex_),
CORBA::NO_MEMORY()
);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index cb28c37c73c..0f2f2aad4a1 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -76,7 +76,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
&this->object_name_map_,
&this->resource_map_),
CORBA::NO_MEMORY());
- ACE_TRY_CHECK;
/// First, get a list of all interceptors currently registered
TAO::ServerRequestInterceptor_List::TYPE &interceptors =
@@ -123,7 +122,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
RTCORBA::PriorityMappingManager_var mapping_manager =
RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Create the Linear Priority Mapping Manager
ACE_NEW_THROW_EX(this->pm_,
@@ -132,7 +130,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
CORBA::NO_MEMORY());
mapping_manager->mapping(this->pm_);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -179,7 +176,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
CORBA::Object_var rt_obj =
orb->resolve_initial_references("RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(rt_obj.in()))
{
ACE_DEBUG((LM_DEBUG,
@@ -192,7 +188,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
RTCORBA::RTORB_var rt_orb =
RTCORBA::RTORB::_narrow (rt_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(rt_orb.in ()))
{
@@ -214,7 +209,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
RTCORBA::SERVER_DECLARED,
RTCORBA::maxPriority
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set up the threadpool
#if defined (ACE_HAS_THREADS)
@@ -249,12 +243,10 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
max_buffered_requests,
max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa_policy_list[policies.length()+1] =
rt_orb->create_threadpool_policy (threadpool
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#endif /* ACE_HAS_THREADS */
@@ -264,7 +256,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
a_POAManager,
poa_policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RTPortableServer::POA_var rt_poa =
RTPortableServer::POA::_narrow(poa.in()
@@ -302,7 +293,6 @@ RTCosScheduling_ServerScheduler_i::schedule_object (
else
{
this->object_name_map_.rebind(obj, name);
- ACE_CHECK;
}
}
@@ -325,7 +315,6 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
ACE_NEW_THROW_EX(this->PCP_factory_,
PCP_Manager_Factory(shared_file),
CORBA::NO_MEMORY());
- ACE_CHECK;
/// Now resolve a reference to the Real Time ORB
@@ -333,7 +322,6 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
this->orb_->resolve_initial_references("RTORB"
ACE_ENV_ARG_PARAMETER);
RTCORBA::RTORB_var rt_orb;
- ACE_TRY_CHECK;
if (CORBA::is_nil(obj.in ()))
{
ACE_DEBUG((LM_DEBUG,
@@ -351,7 +339,6 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
// for the PCP manager to control
obj = this->orb_->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(obj.in()))
{
ACE_DEBUG((LM_DEBUG,
@@ -371,7 +358,6 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
obj =
this->orb_->resolve_initial_references ("CodecFactory"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(obj.in()))
{
@@ -384,7 +370,6 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
{
this->codec_factory_ = IOP::CodecFactory::_narrow(obj.in());
}
- ACE_TRY_CHECK;
// Set up the codec
@@ -429,7 +414,6 @@ ACE_THROW_SPEC((
// Now get a reference to the POA, this is used to get a reference
// to the target object
PortableInterceptor::AdapterName *adapter_seq = ri->adapter_name();
- ACE_TRY_CHECK;
PortableServer::POA_var poa;
const char *adapter_name =
(*adapter_seq)[adapter_seq->length() - 1];
@@ -437,7 +421,6 @@ ACE_THROW_SPEC((
CORBA::Object_var obj =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(obj.in()))
{
ACE_DEBUG((LM_DEBUG,
@@ -456,7 +439,6 @@ ACE_THROW_SPEC((
return;
}
poa = root_poa->find_POA(adapter_name, 0);
- ACE_TRY_CHECK;
}
// decode the Client priority sent in the service context
@@ -483,15 +465,12 @@ ACE_THROW_SPEC((
sc->context_data.length(),
sc->context_data.get_buffer(),
0);
- ACE_TRY_CHECK;
CORBA::Any the_priority_as_any;
the_priority_as_any = *this->codec_->decode(ocSeq);
- ACE_TRY_CHECK;
RTCORBA::Priority the_client_priority;
the_priority_as_any >>= the_client_priority;
- ACE_TRY_CHECK;
// get the object from the object ID that is passed
CORBA::OctetSeq_var oseq = ri->object_id();
@@ -499,10 +478,8 @@ ACE_THROW_SPEC((
oseq -> length(),
oseq -> get_buffer(),
0);
- ACE_TRY_CHECK;
CORBA::Object_var target_object = poa->id_to_reference(oid);
- ACE_TRY_CHECK;
// Check to make sure we have the object as scheduled by the
// ServerScheduler
@@ -552,7 +529,6 @@ ACE_THROW_SPEC((
PCP_Manager(
PCP_factory_->New_PCP_Manager(this->current_)),
CORBA::NO_MEMORY());
- ACE_TRY_CHECK;
// Get the lock on the resource, using MPCP
@@ -563,7 +539,6 @@ ACE_THROW_SPEC((
this->invocation_map_.bind(
p->threadID(),
p);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -601,14 +576,14 @@ RTCosScheduling_ServerScheduler_Interceptor::finish_execution()
}
char*
-RTCosScheduling_ServerScheduler_Interceptor::name(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ServerScheduler_Interceptor::name(void)
ACE_THROW_SPEC((CORBA::SystemException))
{
return CORBA::string_dup(this->name_);
}
void
-RTCosScheduling_ServerScheduler_Interceptor::destroy(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ServerScheduler_Interceptor::destroy(void)
ACE_THROW_SPEC((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 4f2500b8602..3e8b5d5a55e 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -122,7 +122,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
virtual ~RTCosScheduling_ServerScheduler_Interceptor();
- virtual char* name(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char* name(void)
ACE_THROW_SPEC((
CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index d582988c508..88e7f414752 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -76,7 +76,6 @@ ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
ACE_NEW_THROW_EX (info,
RtecScheduler::RT_Info,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
info->entry_point = rt_info_[handle - 1].entry_point;
@@ -188,7 +187,6 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
info.threads,
info.info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#else
// Call the internal set method.
this->set (infos[i].handle,
@@ -202,7 +200,6 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
infos[i].threads,
infos[i].info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif
}
}
@@ -234,7 +231,6 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
info.threads,
info.info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#else
// Call the internal set method.
this->set (infos[i].handle,
@@ -248,7 +244,6 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
infos[i].threads,
infos[i].info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif
}
}
@@ -304,7 +299,6 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
RtecScheduler::NOT_SCHEDULED))
{
RtecScheduler::handle_t handle = lookup (entry_point ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (handle < -1)
// The exception was thrown or is in ACE_ENV_SINGLE_ARG_PARAMETER already.
@@ -561,7 +555,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
// to the number returned, inclusive.
RtecScheduler::Preemption_Priority_t
-ACE_Runtime_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+ACE_Runtime_Scheduler::last_scheduled_priority (void)
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 f7afe874c75..6dc764f2884 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -255,7 +255,7 @@ public:
RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
// Provides the thread priority and queue type for the given priority level.
- virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+ virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void)
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/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index 4cf1fe799fb..53719a6f00b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -25,21 +25,21 @@ TAO::SSLIOP::ClientCredentials::~ClientCredentials (void)
}
SecurityLevel3::CredentialsType
-TAO::SSLIOP::ClientCredentials::creds_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::creds_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return SecurityLevel3::CT_ClientCredentials;
}
char *
-TAO::SSLIOP::ClientCredentials::context_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::context_id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
SecurityLevel3::Principal *
-TAO::SSLIOP::ClientCredentials::client_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::client_principal (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -62,7 +62,7 @@ TAO::SSLIOP::ClientCredentials::client_restricted_resources (
}
SecurityLevel3::Principal *
-TAO::SSLIOP::ClientCredentials::target_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_principal (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -85,7 +85,7 @@ TAO::SSLIOP::ClientCredentials::target_restricted_resources (
}
SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::parent_credentials (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
SecurityLevel3::OwnCredentials_ptr creds =
@@ -96,7 +96,6 @@ TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
::SSL_get_certificate (this->ssl_.in ()),
::SSL_get_privatekey (this->ssl_.in ())),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (creds);
return creds;
}
@@ -116,25 +115,25 @@ TAO::SSLIOP::ClientCredentials::client_authentication (
}
CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
}
CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::confidentiality (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
}
CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::integrity (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// TAO's SSLIOP pluggable transport always provides integrity. Note
- // that if we
+ // that if we
return true;
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index ce621276918..d2dc1d6dee5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -78,7 +78,7 @@ namespace TAO
* interface.
*/
//@{
- virtual char * context_id (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * context_id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual SecurityLevel3::Principal * client_principal (
@@ -109,16 +109,16 @@ namespace TAO
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean client_authentication (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean client_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean target_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean confidentiality (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean integrity (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean integrity (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 8ddb0ade83d..b836a8119b0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -110,14 +110,12 @@ TAO::SSLIOP::Connection_Handler::open (void *)
tph->client_protocol_properties_at_orb_level (
protocol_properties
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
tph->server_protocol_properties_at_orb_level (
protocol_properties
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -125,7 +123,6 @@ TAO::SSLIOP::Connection_Handler::open (void *)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
if (this->set_socket_option (this->peer (),
protocol_properties.send_buffer_size_,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 0b99b5e4a03..2dbf0e6c9e8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -115,12 +115,10 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
CORBA::Policy_var policy =
resolver->stub ()->get_policy (::Security::SecEstablishTrustPolicy
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
SecurityLevel2::EstablishTrustPolicy_var trust_policy =
SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// We use a pointer and temporary to make it obvious to determine
// if no establishment of trust policy was set. Specifically, if
@@ -129,8 +127,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
::Security::EstablishTrust trust = { 0 , 0 };
if (!CORBA::is_nil (trust_policy.in ()))
{
- trust = trust_policy->trust (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ trust = trust_policy->trust ();
}
// Flag that states whether any form of establishment of trust
@@ -163,12 +160,10 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
// the current object.
policy = resolver->stub ()->get_policy (::Security::SecQOPPolicy
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
SecurityLevel2::QOPPolicy_var qop_policy =
SecurityLevel2::QOPPolicy::_narrow (policy.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Temporary variable used to avoid overwriting the default value
// set when the ORB was initialized.
@@ -176,8 +171,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
if (!CORBA::is_nil (qop_policy.in ()))
{
- qop = qop_policy->qop (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ qop = qop_policy->qop ();
}
// If the SSL port is zero, then no SSLIOP tagged component was
@@ -237,7 +231,7 @@ TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr)
}
TAO_Profile *
-TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Connector::make_profile (void)
{
// The endpoint should be of the form:
// N.n@host:port/object_key
@@ -253,14 +247,13 @@ TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return profile;
}
TAO_Profile *
-TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Connector::make_secure_profile (void)
{
// The endpoint should be of the form:
// N.n@host:port/object_key
@@ -276,7 +269,6 @@ TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return profile;
}
@@ -327,13 +319,11 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
TAO_Profile *ptmp = 0;
if (ssl_only)
{
- ptmp = this->make_secure_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ptmp = this->make_secure_profile ();
}
else
{
- ptmp = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ptmp = this->make_profile ();
}
return ptmp;
@@ -509,7 +499,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
this->retrieve_credentials (resolver->stub (),
svc_handler->peer ().ssl ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
svc_handler = safe_handler.release ();
ssl_endpoint->set_sec_attrs (qop, trust, credentials.in());
@@ -791,13 +780,11 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
CORBA::Policy_var policy =
stub->get_policy (::SecurityLevel3::ContextEstablishmentPolicyType
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
SecurityLevel3::ContextEstablishmentPolicy_var creds_policy =
SecurityLevel3::ContextEstablishmentPolicy::_narrow (
policy.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
TAO::SSLIOP::OwnCredentials_var ssliop_credentials;
@@ -806,8 +793,7 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
if (!CORBA::is_nil (creds_policy.in ()))
{
SecurityLevel3::OwnCredentialsList_var creds_list =
- creds_policy->creds_list (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
+ creds_policy->creds_list ();
if (creds_list->length () > 0)
{
@@ -818,7 +804,6 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
ssliop_credentials =
TAO::SSLIOP::OwnCredentials::_narrow (credentials
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
if (!CORBA::is_nil (ssliop_credentials.in ()))
{
@@ -854,7 +839,6 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
::SSL_get_certificate (ssl),
::SSL_get_privatekey (ssl)),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
}
return ssliop_credentials._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 99578662196..9a7bd87c2de 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -90,12 +90,12 @@ namespace TAO
* @see @c TAO_Connector
*/
//@{
- virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Profile * make_profile (void);
virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
//@}
/// SSL-specific profile
- TAO_Profile * make_secure_profile (ACE_ENV_SINGLE_ARG_DECL);
+ TAO_Profile * make_secure_profile (void);
/// IIOP-specific connection establishment.
/**
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 9f8804ad604..49a79ba790b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -82,28 +82,28 @@ TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void)
}
char *
-TAO::SSLIOP_Credentials::creds_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::creds_id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->id_.in ());
}
SecurityLevel3::CredentialsUsage
-TAO::SSLIOP_Credentials::creds_usage (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::creds_usage (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return SecurityLevel3::CU_Indefinite;
}
TimeBase::UtcT
-TAO::SSLIOP_Credentials::expiry_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::expiry_time (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->expiry_time_;
}
SecurityLevel3::CredentialsState
-TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP_Credentials::creds_state (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const ::X509 *x = this->x509_.in ();
@@ -179,13 +179,11 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs)
// No need for a full blown ACE_TRY/CATCH block.
const SecurityLevel3::CredentialsType lct =
- this->creds_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ this->creds_type ();
const SecurityLevel3::CredentialsType rct =
const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type (
ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
// Don't bother check the creds_id and expiry_time attributes. They
// are checked implicitly by the below X509_cmp() call.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 5fdf4f78e6c..00f500102bb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -74,18 +74,18 @@ namespace TAO
* interface.
*/
//@{
- virtual char * creds_id (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * creds_id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual
- SecurityLevel3::CredentialsType creds_type (ACE_ENV_SINGLE_ARG_DECL)
+ SecurityLevel3::CredentialsType creds_type (void)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
virtual SecurityLevel3::CredentialsUsage creds_usage (
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual TimeBase::UtcT expiry_time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual TimeBase::UtcT expiry_time (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual SecurityLevel3::CredentialsState creds_state (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index fcccd07cc67..d92db73ba03 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -90,31 +90,28 @@ TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void)
}
char *
-TAO::SSLIOP::CredentialsAcquirer::acquisition_method (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->check_validity ();
return CORBA::string_dup ("SL3TLS");
}
SecurityLevel3::AcquisitionStatus
-TAO::SSLIOP::CredentialsAcquirer::current_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::current_status (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (SecurityLevel3::AQST_Failed);
+ this->check_validity ();
return SecurityLevel3::AQST_Succeeded; // @@ Really?
}
CORBA::ULong
-TAO::SSLIOP::CredentialsAcquirer::nth_iteration (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->check_validity ();
// SSL/TLS credentials is single-step process from the point-of-view
// of the caller.
@@ -146,8 +143,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
+ this->check_validity ();
::SSLIOP::AuthData *data;
@@ -183,7 +179,6 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
ACE_NEW_THROW_EX (creds,
TAO::SSLIOP::OwnCredentials (x509.in (), evp.in ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
SecurityLevel3::OwnCredentials_var credentials = creds;
@@ -191,21 +186,18 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
{
this->curator_->_tao_add_own_credentials (creds
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
}
- this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
+ this->destroy ();
return credentials._retn ();
}
void
-TAO::SSLIOP::CredentialsAcquirer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->check_validity ();
ACE_GUARD (TAO_SYNCH_MUTEX,
guard,
@@ -221,7 +213,7 @@ TAO::SSLIOP::CredentialsAcquirer::destroy (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO::SSLIOP::CredentialsAcquirer::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::check_validity (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX,
guard,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index 734ca4d1884..d2c5254e923 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -75,17 +75,17 @@ namespace TAO
* interface.
*/
//@{
- virtual char * acquisition_method (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * acquisition_method (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual SecurityLevel3::AcquisitionStatus current_status (
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong nth_iteration (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::ULong nth_iteration (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Any * get_continuation_data (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Any * get_continuation_data (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual SecurityLevel3::AcquisitionStatus continue_acquisition (
@@ -98,7 +98,7 @@ namespace TAO
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
@@ -115,7 +115,7 @@ namespace TAO
/// Verify that this CredentialsAcquirer object is still valid,
/// i.e. hasn't been destroyed.
- void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+ void check_validity (void);
/// Create an OpenSSL X.509 certificate data structure.
static ::X509 * make_X509 (const ::SSLIOP::File &certificate);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 06ac8c86977..8f96ff049f2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -22,7 +22,6 @@ TAO::SSLIOP::CredentialsAcquirerFactory::make (
TAO::SSLIOP::CredentialsAcquirer (curator,
acquisition_arguments),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (SecurityLevel3::CredentialsAcquirer::_nil ());
return ca;
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 9d39c05ba21..ba494fc96bf 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -47,7 +47,6 @@ TAO::SSLIOP::Current::get_peer_certificate (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
::SSLIOP::ASN_1_Cert_var certificate = c;
@@ -81,7 +80,6 @@ TAO::SSLIOP::Current::get_peer_certificate_chain (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
::SSLIOP::SSL_Cert_var cert_chain = c;
@@ -92,7 +90,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain (
}
CORBA::Boolean
-TAO::SSLIOP::Current::no_context (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Current::no_context (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return (this->implementation () == 0 ? 1 : 0);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 02b68b6f60b..55daa20bb8d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -63,7 +63,7 @@ namespace TAO
typedef Current_ptr _ptr_type;
typedef Current_var _var_type;
typedef Current_out _out_type;
-
+
/// Constructor.
Current (TAO_ORB_Core *orb_core);
@@ -94,7 +94,7 @@ namespace TAO
* @return @c true if the current execution context is not
* within a SSL session.
*/
- virtual CORBA::Boolean no_context (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean no_context (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Set the TSS slot ID assigned to this object.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 27f173dfaac..3c7610fd9e3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -45,13 +45,12 @@ TAO::SSLIOP::Current_Impl::client_credentials (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (SecurityLevel3::ClientCredentials::_nil ());
return creds;
}
CORBA::Boolean
-TAO::SSLIOP::Current_Impl::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current_Impl::request_is_local (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 49a369925e7..364803c4a26 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -542,13 +542,11 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
PortableInterceptor::ORBInitializer_var initializer = tmp;
PortableInterceptor::register_orb_initializer (initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Register the SSLIOP ORB initializer.
// PortableInterceptor::ORBInitializer_ptr tmp;
@@ -561,14 +559,12 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
//PortableInterceptor::ORBInitializer_var initializer = tmp;
initializer = tmp;
PortableInterceptor::register_orb_initializer (initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -578,7 +574,6 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 5e90c389e80..edb953a45d2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -63,8 +63,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 const no_ssl =
- this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ssliop_current_->no_context ();
if (TAO_debug_level >= 3)
ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl)));
@@ -82,7 +81,6 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
::SSLIOP::ASN_1_Cert_var cert =
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
// we should include it since it dumps alot of information,
@@ -132,7 +130,6 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
ACE_THROW (CORBA::NO_PERMISSION ());
}
ACE_ENDTRY;
- ACE_CHECK;
#endif /* DEBUG_PEER_CERTIFICATES */
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 9ab7aaffad1..c098061f8fe 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -66,10 +66,10 @@ namespace TAO
* PortableInterceptor::ServerRequestInterceptor interface.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 6f36fa774c5..0fc96b2eee7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -45,7 +45,6 @@ TAO::SSLIOP::ORBInitializer::pre_init (
TAO_ORBInitInfo_var tao_info =
TAO_ORBInitInfo::_narrow (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (tao_info.in ()))
ACE_THROW (CORBA::INV_OBJREF ());
@@ -68,7 +67,6 @@ TAO::SSLIOP::ORBInitializer::pre_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
SSLIOP::Current_var ssliop_current = current;
@@ -76,7 +74,6 @@ TAO::SSLIOP::ORBInitializer::pre_init (
info->register_initial_reference ("SSLIOPCurrent",
ssliop_current.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -98,11 +95,9 @@ TAO::SSLIOP::ORBInitializer::post_init (
CORBA::Object_var obj =
info->resolve_initial_references ("SSLIOPCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
SSLIOP::Current_var ssliop_current =
SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (ssliop_current.in ()))
{
@@ -113,7 +108,6 @@ TAO::SSLIOP::ORBInitializer::post_init (
{
const size_t slot =
this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
tao_current->tss_slot (slot);
}
@@ -133,7 +127,6 @@ TAO::SSLIOP::ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var si_interceptor =
si;
@@ -142,12 +135,10 @@ TAO::SSLIOP::ORBInitializer::post_init (
// with the ORB.
info->add_server_request_interceptor (si_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// TAO_ORBInitInfo_var tao_info =
// TAO_ORBInitInfo::_narrow (info
// ACE_ENV_ARG_PARAMETER);
-// ACE_CHECK;
// if (CORBA::is_nil (tao_info.in ()))
// ACE_THROW (CORBA::INV_OBJREF ());
@@ -166,7 +157,6 @@ TAO::SSLIOP::ORBInitializer::post_init (
// TAO::VMCID,
// ENOMEM),
// CORBA::COMPLETED_NO));
-// ACE_CHECK;
// PortableInterceptor::IORInterceptor_var ior_interceptor =
// ii;
@@ -174,40 +164,33 @@ TAO::SSLIOP::ORBInitializer::post_init (
// // Register the SSLIOP IORInterceptor.
// info->add_ior_interceptor (ior_interceptor.in ()
// ACE_ENV_ARG_PARAMETER);
-// ACE_CHECK;
// Register the SSLIOP-specific vault with the
// PrincipalAuthenticator.
obj = info->resolve_initial_references ("SecurityLevel3:SecurityManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
SecurityLevel3::SecurityManager_var manager =
SecurityLevel3::SecurityManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
SecurityLevel3::CredentialsCurator_var curator =
- manager->credentials_curator (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ manager->credentials_curator ();
TAO::SL3::CredentialsCurator_var tao_curator =
TAO::SL3::CredentialsCurator::_narrow (curator.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO::SSLIOP::CredentialsAcquirerFactory * factory;
ACE_NEW_THROW_EX (factory,
TAO::SSLIOP::CredentialsAcquirerFactory,
CORBA::NO_MEMORY ());
- ACE_CHECK;
auto_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
tao_curator->register_acquirer_factory ("SL3TLS",
factory
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
(void) safe_factory.release (); // CredentialsCurator now owns
// CredentialsAcquirerFactory.
@@ -223,12 +206,10 @@ TAO::SSLIOP::ORBInitializer::get_tss_slot_id (
CORBA::Object_var obj =
info->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
SecurityLevel3::SecurityCurrent_var current =
SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
TAO::SL3::SecurityCurrent * security_current =
dynamic_cast<TAO::SL3::SecurityCurrent *> (current.in ());
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 7d90833fff5..9c9b82c32c9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -44,14 +44,14 @@ TAO::SSLIOP::OwnCredentials::_nil (void)
}
SecurityLevel3::CredentialsType
-TAO::SSLIOP::OwnCredentials::creds_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::OwnCredentials::creds_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return SecurityLevel3::CT_OwnCredentials;
}
SecurityLevel3::CredsInitiator_ptr
-TAO::SSLIOP::OwnCredentials::creds_initiator (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::OwnCredentials::creds_initiator (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -59,7 +59,7 @@ TAO::SSLIOP::OwnCredentials::creds_initiator (ACE_ENV_SINGLE_ARG_DECL)
}
SecurityLevel3::CredsAcceptor_ptr
-TAO::SSLIOP::OwnCredentials::creds_acceptor (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::OwnCredentials::creds_acceptor (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 8376cda69dc..6cbad6b38b2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -57,7 +57,7 @@ namespace TAO
typedef OwnCredentials_ptr _ptr_type;
typedef OwnCredentials_var _var_type;
typedef OwnCredentials_out _out_type;
-
+
/// Constructor
OwnCredentials (::X509 *cert, ::EVP_PKEY *evp);
@@ -73,7 +73,7 @@ namespace TAO
* interface.
*/
//@{
- SecurityLevel3::CredentialsType creds_type (ACE_ENV_SINGLE_ARG_DECL)
+ SecurityLevel3::CredentialsType creds_type (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
@@ -92,7 +92,7 @@ namespace TAO
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void release_credentials (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void release_credentials (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index f9c084779cd..28d1e537fe1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -339,7 +339,6 @@ TAO_SSLIOP_Profile::parse_string (const char * ior
{
TAO_IIOP_Profile::parse_string (ior
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index a081a95c168..3e9d409aca0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -15,21 +15,21 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
SecurityLevel3::CredentialsType
-TAO::SSLIOP::TargetCredentials::creds_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::TargetCredentials::creds_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return SecurityLevel3::CT_TargetCredentials;
}
char *
-TAO::SSLIOP::TargetCredentials::context_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::context_id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
SecurityLevel3::Principal *
-TAO::SSLIOP::TargetCredentials::client_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_principal (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -52,7 +52,7 @@ TAO::SSLIOP::TargetCredentials::client_restricted_resources (
}
SecurityLevel3::Principal *
-TAO::SSLIOP::TargetCredentials::target_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_principal (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -75,7 +75,7 @@ TAO::SSLIOP::TargetCredentials::target_restricted_resources (
}
SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::TargetCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::parent_credentials (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -83,49 +83,49 @@ TAO::SSLIOP::TargetCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::client_authentication (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::confidentiality (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::integrity (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_embodied (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_embodied (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_endorsed (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_endorsed (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
void
-TAO::SSLIOP::TargetCredentials::release (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::release (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW (CORBA::NO_IMPLEMENT ());
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index 920db9d2e61..d9780aafc94 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -65,7 +65,7 @@ namespace TAO
* interface.
*/
//@{
- virtual char * context_id (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * context_id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual SecurityLevel3::Principal * client_principal (
@@ -96,25 +96,25 @@ namespace TAO
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean client_authentication (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean client_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean target_authentication (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean confidentiality (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean integrity (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean integrity (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean target_embodied (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean target_embodied (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean target_endorsed (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean target_endorsed (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void release (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void release (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 385e58f64e2..b5ae1e33037 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -33,7 +33,6 @@ TAO::SSLIOP::Util::current (
TAO::SSLIOP::Current_var tao_current =
TAO::SSLIOP::Current::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (tao_current.in ()))
ACE_TRY_THROW (CORBA::INV_OBJREF ());
@@ -50,7 +49,6 @@ TAO::SSLIOP::Util::current (
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index c8c56c6b5ac..cf5831cfa93 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -472,7 +472,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
RtecScheduler::Preemption_Priority_t
-ACE_Config_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::last_scheduled_priority (void)
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 d6b378d8f82..3d93093f9ea 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -114,7 +114,7 @@ public:
// provide the thread priority and queue type for the given priority level
virtual RtecScheduler::Preemption_Priority_t
- last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+ last_scheduled_priority (void)
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 3453a401eda..5686c913de8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -118,7 +118,6 @@ TAO_Reconfig_Scheduler (int config_count,
rt_info_count, rt_infos,
dependency_count, dependency_infos,
stability_flags ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, corba_sysex)
{
@@ -143,8 +142,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
ACE_TRY_NEW_ENV
{
- this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->close ();
}
ACE_CATCH (CORBA::SystemException, corba_sysex)
{
@@ -185,15 +183,13 @@ init (int config_count,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK_RETURN (-1);
int result = 0;
int i = 0;
/* WSOA merge - commented out
// Clear out the previous entries, if any.
- this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->close ();
*/
// Re-map the RT_Info and dependency handle values if necessary.
@@ -225,7 +221,6 @@ init (int config_count,
ACE_NEW_THROW_EX (new_config_info,
RtecScheduler::Config_Info,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (-1);
// Make sure the new config info is cleaned up if we exit abruptly.
ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info);
@@ -275,7 +270,6 @@ init (int config_count,
new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
rt_info [num_rt_infos].handle, 1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (new_rt_info == 0)
{
@@ -297,7 +291,6 @@ init (int config_count,
rt_info [num_rt_infos].threads,
RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Fill in the scheduler managed portions.
new_rt_info->priority =
@@ -317,7 +310,6 @@ init (int config_count,
dependency_info [dependency_count_].dependency_type,
dependency_info [dependency_count_].enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
++this->dependency_count_;
}
@@ -333,7 +325,7 @@ init (int config_count,
// Closes the scheduler, releasing all current resources.
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL,
RtecScheduler::UNKNOWN_TASK,
@@ -346,7 +338,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Unbind and delete each RT_Info in the map: this also cleans up
// all the entries and tuples associated with each RT_Info.
@@ -467,11 +458,9 @@ create (const char *entry_point
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK_RETURN (0);
RtecScheduler::handle_t handle = next_handle_;
create_i (entry_point, handle, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (handle);
// Set affected stability flags.
this->stability_flags_ |=
@@ -500,11 +489,9 @@ lookup (const char * entry_point
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK_RETURN (0);
RtecScheduler::handle_t handle;
handle = this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (handle);
return handle;
}
@@ -528,7 +515,6 @@ get (RtecScheduler::handle_t handle
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK_RETURN (0);
// Find the RT_Info in the hash map.
TAO_RT_Info_Ex *rt_info = 0;
@@ -542,7 +528,6 @@ get (RtecScheduler::handle_t handle
ACE_NEW_THROW_EX (new_info,
RtecScheduler::RT_Info,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
*new_info = *rt_info;
@@ -578,7 +563,6 @@ set (::RtecScheduler::handle_t handle,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Look up the RT_Info by its handle, throw an exception if it's not there.
TAO_RT_Info_Ex *rt_info_ptr = 0;
@@ -602,7 +586,6 @@ set (::RtecScheduler::handle_t handle,
this->set_i (rt_info_ptr, criticality, time, typical_time,
cached_time, period, importance, quantum,
threads, info_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update stability flags. For now, just mark everything as unstable.
@@ -641,7 +624,6 @@ reset (RtecScheduler::handle_t handle,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Look up the RT_Info by its handle, throw an exception if it's not there.
TAO_RT_Info_Ex *rt_info_ptr = 0;
@@ -669,14 +651,12 @@ reset (RtecScheduler::handle_t handle,
}
// Refresh the internal tuple pointer array.
- this->refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->refresh_tuple_ptr_array_i ();
// Then call the internal set method.
this->set_i (rt_info_ptr, criticality, time, typical_time,
cached_time, period, importance, quantum,
threads, info_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update stability flags. For now, just mark everything as unstable.
@@ -708,7 +688,6 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
for (u_int i = 0; i < infos.length (); ++i)
{
@@ -747,7 +726,6 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
info.threads,
info.info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#else
this->set_i (rt_info_ptr,
infos[i].criticality,
@@ -791,7 +769,6 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
TAO_RT_Info_Ex *rt_info_ptr = 0;
u_int i;
@@ -820,8 +797,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
}
// Refresh the internal tuple pointer array.
- this->refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->refresh_tuple_ptr_array_i ();
for (i = 0; i < infos.length (); ++i)
{
@@ -854,7 +830,6 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
info.threads,
info.info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#else
// Call the internal set method.
this->set_i (rt_info_ptr,
@@ -868,7 +843,6 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
infos[i].threads,
infos[i].info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif
}
@@ -899,7 +873,6 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
TAO_RT_Info_Ex *rt_info_ptr = 0;
@@ -977,7 +950,6 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
info.threads,
info.info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#else
// Call the internal set method.
this->set_i (rt_info_ptr,
@@ -991,7 +963,6 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
infos[i].threads,
infos[i].info_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif
}
@@ -1024,7 +995,6 @@ priority (RtecScheduler::handle_t handle,
{
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Check stability flags.
if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
@@ -1072,18 +1042,15 @@ entry_point_priority (const char * entry_point,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
RtecScheduler::handle_t handle =
this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->priority_i (handle,
priority,
subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -1108,12 +1075,10 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Delegate to the internal method.
add_dependency_i (handle, dependency, number_of_calls, dependency_type,
RtecBase::DEPENDENCY_ENABLED ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Since the call graph topology has changed, set *all*
// stability flags before incrementing the dependency count.
@@ -1143,12 +1108,10 @@ remove_dependency (RtecScheduler::handle_t handle,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Delegate to the internal method.
remove_dependency_i (handle, dependency, number_of_calls,
dependency_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Since the call graph topology has changed, set *all*
// stability flags before incrementing the dependency count.
@@ -1178,12 +1141,10 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Delegate to the internal method.
set_dependency_enable_state_i (handle, dependency, number_of_calls,
dependency_type, enabled ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -1205,7 +1166,6 @@ set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependenc
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Delegate to the internal method for each dependency in the sequence.
for (u_int i = 0; i < dependencies.length (); ++i)
@@ -1216,7 +1176,6 @@ set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependenc
dependencies[i].dependency_type,
dependencies[i].enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -1241,7 +1200,6 @@ set_rt_info_enable_state (RtecScheduler::handle_t handle,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Look up the RT_Info by its handle, throw an exception if it's not there.
TAO_RT_Info_Ex *rt_info_ptr = 0;
@@ -1279,7 +1237,6 @@ set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
for (u_int i = 0; i < pair_set.length (); ++i)
{
@@ -1327,16 +1284,12 @@ compute_scheduling (CORBA::Long minimum_priority,
// Delegates to recompute_scheduling and the respective accessors.
this->recompute_scheduling (minimum_priority, maximum_priority,
anomalies ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->get_rt_info_set (infos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->get_dependency_set (dependencies ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->get_config_info_set (configs ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if defined (SCHEDULER_DUMP)
ACE_DEBUG ((LM_TRACE, "Schedule prepared.\n"));
@@ -1373,7 +1326,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// @@ TO DO - use these to establish the bounds of priority assignment.
// minimum_priority
@@ -1387,7 +1339,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
ACE_NEW_THROW_EX (anomalies,
RtecScheduler::Scheduling_Anomaly_Set (0),
CORBA::NO_MEMORY ());
- ACE_CHECK;
return;
}
@@ -1406,8 +1357,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
// Traverse criticality dependency graph, assigning a
// topological ordering and identifying threads.
- crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ crit_dfs_traverse_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1416,8 +1366,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
#endif
// Propagate criticalities.
- propagate_criticalities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ propagate_criticalities_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1432,8 +1381,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
#endif
// Traverse dependency graph, assigning a topological ordering and identifying threads.
- dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ dfs_traverse_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1443,8 +1391,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
// Sort an array of RT_info handles in topological order, check
// for loops using the strongly connected components algorithm.
- detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ detect_cycles_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1453,8 +1400,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
#endif
// Perform admission control for task delineator rate tuples.
- perform_admission_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ perform_admission_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1463,8 +1409,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
#endif
// Propagate effective execution time and period, set total frame size.
- propagate_characteristics_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ propagate_characteristics_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1479,8 +1424,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
// Sort operations by urgency, then assign priorities and
// subpriorities in one pass. Sets last scheduled priority and
// last feasible priority.
- assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ assign_priorities_i ();
#if defined (SCHEDULER_LOGGING)
ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1497,7 +1441,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
ACE_NEW_THROW_EX (anomalies,
RtecScheduler::Scheduling_Anomaly_Set (0),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
ACE_DEBUG ((LM_DEBUG,
@@ -1539,7 +1482,6 @@ get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
ACE_NEW_THROW_EX (infos,
RtecScheduler::RT_Info_Set (this->rt_info_count_),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
infos->length (this->rt_info_count_);
@@ -1622,7 +1564,6 @@ get_config_info_set (RtecScheduler::Config_Info_Set_out configs
RtecScheduler::Config_Info_Set(this->
config_info_count_),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
configs->length (this->config_info_count_);
@@ -1661,7 +1602,6 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Check stability flags
if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
@@ -1689,7 +1629,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
RtecScheduler::Preemption_Priority_t
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+last_scheduled_priority (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::SYNCHRONIZATION_FAILURE,
RtecScheduler::NOT_SCHEDULED))
@@ -1701,7 +1641,6 @@ last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK_RETURN (0);
// Check schedule stability flags.
if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
@@ -1727,7 +1666,6 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs
{
ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
RtecScheduler::SYNCHRONIZATION_FAILURE ());
- ACE_CHECK;
// Check schedule stability flags.
if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
@@ -1743,7 +1681,6 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs
RtecScheduler::Config_Info_Set(this->
config_info_count_),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
configs->length (this->config_info_count_);
RtecScheduler::Config_Info* config_info = 0;
@@ -1795,7 +1732,6 @@ create_i (const char *entry_point,
ACE_NEW_THROW_EX (new_rt_info,
TAO_RT_Info_Ex,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
// Make sure the new scheduling entry is cleaned up if we exit abruptly.
auto_ptr<TAO_RT_Info_Ex> new_rt_info_ptr (new_rt_info);
@@ -1851,7 +1787,6 @@ create_i (const char *entry_point,
ACE_NEW_THROW_EX (new_sched_entry,
TAO_Reconfig_Scheduler_Entry (*new_rt_info),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
// Make sure the new scheduling entry is cleaned up if we exit abruptly.
auto_ptr<TAO_Reconfig_Scheduler_Entry> new_sched_entry_ptr (new_sched_entry);
@@ -1859,7 +1794,6 @@ create_i (const char *entry_point,
// Maintain the size of the entry pointer array.
maintain_scheduling_array (entry_ptr_array_, entry_ptr_array_size_,
handle ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Store the new entry in the scheduling entry pointer array.
@@ -1956,7 +1890,6 @@ set_i (TAO_RT_Info_Ex *rt_info,
ACE_NEW_THROW_EX (tuple_ptr,
TAO_RT_Info_Tuple (*rt_info),
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Make sure the new tuple is cleaned up if we exit abruptly.
@@ -1978,7 +1911,6 @@ set_i (TAO_RT_Info_Ex *rt_info,
tuple_ptr_array_size_,
rt_info_tuple_count_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Store the new tuple in the tuple pointer array.
tuple_ptr_array_ [this->rt_info_tuple_count_] = tuple_ptr;
@@ -2092,7 +2024,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Add the called dependency map entry
map_dependency_i (dependency, // called handle
@@ -2102,7 +2033,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
@@ -2118,7 +2048,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Add the called dependency map entry
map_dependency_i (handle, // called handle
@@ -2128,7 +2057,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
default:
@@ -2156,7 +2084,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -2200,7 +2127,6 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
number_of_calls,
dependency_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Remove the called dependency map entry
unmap_dependency_i (dependency, // called handle
@@ -2209,7 +2135,6 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
number_of_calls,
dependency_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
// In a one-way call, the called operation depends on the
@@ -2223,7 +2148,6 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
number_of_calls,
dependency_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Remove the called dependency map entry
unmap_dependency_i (handle, // called handle
@@ -2232,7 +2156,6 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
number_of_calls,
dependency_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
default:
@@ -2285,7 +2208,6 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update the called dependency map entry
map_dependency_enable_state_i (dependency, // called handle
@@ -2295,7 +2217,6 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
// In a one-way call, the called operation depends on the
@@ -2310,7 +2231,6 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update the called dependency map entry
map_dependency_enable_state_i (handle, // called handle
@@ -2320,7 +2240,6 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
dependency_type,
enabled
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
default:
@@ -2359,7 +2278,6 @@ map_dependency_i (RtecScheduler::handle_t key,
ACE_NEW_THROW_EX (dependency_set,
RtecScheduler::Dependency_Set,
CORBA::NO_MEMORY ());
- ACE_CHECK;
if (dependency_map.bind (key, dependency_set) != 0)
{
@@ -2515,7 +2433,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
// has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+dfs_traverse_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL))
{
@@ -2555,7 +2473,7 @@ dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
// checks for loops, marks unresolved remote dependencies.
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
+detect_cycles_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL,
RtecScheduler::CYCLIC_DEPENDENCIES))
@@ -2602,7 +2520,7 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
+perform_admission_i (void)
ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
CORBA::SystemException,
RtecScheduler::INTERNAL))
@@ -2665,7 +2583,7 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+crit_dfs_traverse_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL))
{
@@ -2701,7 +2619,7 @@ crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
+propagate_criticalities_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL))
{
@@ -2745,7 +2663,7 @@ propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
// Propagates periods, sets total frame size.
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
+propagate_characteristics_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL,
RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
@@ -2788,7 +2706,7 @@ propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
// Sets last scheduled priority.
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
+assign_priorities_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL,
RtecScheduler::DUPLICATE_NAME))
@@ -2887,7 +2805,6 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (new_config_info,
RtecScheduler::Config_Info,
CORBA::NO_MEMORY ());
- ACE_CHECK;
// Make sure the new config info is cleaned up if we exit abruptly.
ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info);
@@ -2936,7 +2853,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_DECL)
+refresh_tuple_ptr_array_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL))
{
@@ -3168,7 +3085,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
+compute_utilization_i (void)
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 431ad92bda1..e147e057790 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -116,7 +116,7 @@ public:
RtecScheduler::INTERNAL));
// Initializes the scheduler with the passed information.
- void close (ACE_ENV_SINGLE_ARG_DECL)
+ void close (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL,
RtecScheduler::UNKNOWN_TASK,
@@ -358,7 +358,7 @@ public:
RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
// Provides the thread priority and queue type for the given priority level.
- virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+ virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::SYNCHRONIZATION_FAILURE,
RtecScheduler::NOT_SCHEDULED));
@@ -587,20 +587,20 @@ protected:
RtecScheduler::UNKNOWN_TASK));
// This method updates the enable state of a dependency in a dependency set map.
- virtual void dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void dfs_traverse_i (void)
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 (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void detect_cycles_i (void)
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.
- void perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
+ void perform_admission_i (void)
ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
CORBA::SystemException,
RtecScheduler::INTERNAL));
@@ -608,7 +608,7 @@ protected:
// rate tuples.
- void crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+ void crit_dfs_traverse_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL));
// Traverses criticality dependency graph, assigning a topological
@@ -616,20 +616,20 @@ protected:
// DFS map.
- void propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
+ void propagate_criticalities_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL));
// Propagates criticalities.
- void propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
+ void propagate_characteristics_i (void)
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 (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void assign_priorities_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL,
RtecScheduler::DUPLICATE_NAME));
@@ -637,13 +637,13 @@ protected:
// priorities and subpriorities in one pass. (Re)computes utilization
// and sets last scheduled priority and last feasible priority.
- void refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_DECL)
+ void refresh_tuple_ptr_array_i (void)
ACE_THROW_SPEC ((CORBA::SystemException,
RtecScheduler::INTERNAL));
// Refreshes the array of tuple pointers, corrects the count.
/* WSOA merge - commented out
- virtual void compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void compute_utilization_i (void)
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 f8fd77a1709..b05f178e9ea 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -163,8 +163,7 @@ static_server (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- server_ = ace_scheduler_factory_data->scheduler_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_ = ace_scheduler_factory_data->scheduler_._this ();
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT("ACE_Scheduler_Factory - configured static server\n")));
@@ -205,12 +204,10 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
CORBA::Object_var objref =
naming->resolve (schedule_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
server_ =
RtecScheduler::Scheduler::_narrow(objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 20216f4a905..244b3dd3e6e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -31,7 +31,7 @@ TAO::Security::EstablishTrustPolicy::policy_type (
}
CORBA::Policy_ptr
-TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::Security::EstablishTrustPolicy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::Security::EstablishTrustPolicy *policy = 0;
@@ -42,19 +42,18 @@ TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return policy;
}
void
-TAO::Security::EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
::Security::EstablishTrust
-TAO::Security::EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::trust (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->trust_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index b7910c316d9..fc9fa6fd086 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -64,19 +64,19 @@ namespace TAO
* @name CORBA::Policy Methods
*/
//@{
- virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::PolicyType policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Policy_ptr copy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
/// Return the "establish trust" value associated with this
/// policy.
- virtual ::Security::EstablishTrust trust (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::Security::EstablishTrust trust (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 9175ac608b0..cf08adc0434 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -22,14 +22,14 @@ TAO::Security::QOPPolicy::~QOPPolicy (void)
}
CORBA::PolicyType
-TAO::Security::QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return ::Security::SecQOPPolicy;
}
CORBA::Policy_ptr
-TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::Security::QOPPolicy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::Security::QOPPolicy * policy = 0;
@@ -40,19 +40,18 @@ TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return policy;
}
void
-TAO::Security::QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
Security::QOP
-TAO::Security::QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::qop (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->qop_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index ff8b99e2309..2eb71919ffb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -61,19 +61,19 @@ namespace TAO
* @name CORBA::Policy Methods
*/
//@{
- virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::PolicyType policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Policy_ptr copy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
/// Return the Quality-of-Protection value associated with this
/// policy.
- virtual ::Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::Security::QOP qop (void)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 22b8d7ad961..ce1f7d6f1f9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -38,7 +38,7 @@ TAO::SL3::ContextEstablishmentPolicy::creds_directive (
}
SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ContextEstablishmentPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
SecurityLevel3::OwnCredentialsList * creds = 0;
@@ -46,7 +46,6 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (creds,
SecurityLevel3::OwnCredentialsList (this->creds_list_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (creds);
return creds;
}
@@ -92,7 +91,7 @@ TAO::SL3::ContextEstablishmentPolicy::policy_type (
}
CORBA::Policy_ptr
-TAO::SL3::ContextEstablishmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ContextEstablishmentPolicy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Policy_ptr p = CORBA::Policy::_nil ();
@@ -105,7 +104,6 @@ TAO::SL3::ContextEstablishmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
this->use_confidentiality_,
this->use_integrity_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (p);
return p;
}
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 266c1dd31f6..dfb5b5a2516 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -89,13 +89,13 @@ namespace TAO
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::PolicyType policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Policy_ptr copy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 6555f46469c..d9b4e0db1b2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -76,7 +76,7 @@ TAO::SL3::CredentialsCurator::_nil (void)
}
SecurityLevel3::AcquisitionMethodList *
-TAO::SL3::CredentialsCurator::supported_methods (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::supported_methods (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
SecurityLevel3::AcquisitionMethodList * list;
@@ -128,14 +128,13 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
}
SecurityLevel3::OwnCredentialsList *
-TAO::SL3::CredentialsCurator::default_creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::default_creds_list (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
SecurityLevel3::OwnCredentialsList * list;
ACE_NEW_THROW_EX (list,
SecurityLevel3::OwnCredentialsList,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
SecurityLevel3::OwnCredentialsList_var creds_list = list;
@@ -161,7 +160,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (ACE_ENV_SINGLE_ARG_DECL)
}
SecurityLevel3::CredentialsIdList *
-TAO::SL3::CredentialsCurator::default_creds_ids (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::default_creds_ids (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
SecurityLevel3::CredentialsIdList * list;
@@ -265,8 +264,7 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
ACE_ENV_ARG_DECL)
{
CORBA::String_var credentials_id =
- credentials->creds_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ credentials->creds_id ();
SecurityLevel3::OwnCredentials_var creds =
SecurityLevel3::OwnCredentials::_duplicate (credentials);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index 69cac1d1ae1..3088ce32014 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -21,7 +21,7 @@ TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void)
}
SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ObjectCredentialsPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
SecurityLevel3::OwnCredentialsList * creds = 0;
@@ -29,7 +29,6 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (creds,
SecurityLevel3::OwnCredentialsList (this->creds_list_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (creds);
return creds;
}
@@ -43,20 +42,19 @@ TAO::SL3::ObjectCredentialsPolicy::policy_type (
}
CORBA::Policy_ptr
-TAO::SL3::ObjectCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ObjectCredentialsPolicy::copy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Policy_ptr p = CORBA::Policy::_nil ();
ACE_NEW_THROW_EX (p,
TAO::SL3::ObjectCredentialsPolicy (this->creds_list_),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (p);
return p;
}
void
-TAO::SL3::ObjectCredentialsPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ObjectCredentialsPolicy::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->creds_list_.length (0);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index c4479d9aa8e..37a3dfd6ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -69,13 +69,13 @@ namespace TAO
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::PolicyType policy_type (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Policy_ptr copy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 959a93e4885..8fc5eec666e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -37,7 +37,6 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
arg->use_confidentiality,
arg->use_integrity),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (policy);
}
else if (type == SecurityLevel3::ObjectCredentialsPolicyType)
{
@@ -49,7 +48,6 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
ACE_NEW_THROW_EX (policy,
TAO::SL3::ObjectCredentialsPolicy (*creds),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (policy);
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index db6609f803b..04ada737774 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -27,7 +27,7 @@ TAO::SL3::SecurityCurrent::~SecurityCurrent (void)
}
SecurityLevel3::ClientCredentials_ptr
-TAO::SL3::SecurityCurrent::client_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::SecurityCurrent::client_credentials (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
@@ -39,11 +39,11 @@ TAO::SL3::SecurityCurrent::client_credentials (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
SecurityLevel3::ClientCredentials::_nil ());
- return impl->client_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->client_credentials ();
}
CORBA::Boolean
-TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::SecurityCurrent::request_is_local (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
@@ -54,7 +54,7 @@ TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
if (impl == 0)
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), false);
- return impl->request_is_local (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->request_is_local ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index b592530c19e..b995b51cd25 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -73,7 +73,7 @@ namespace TAO
ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean request_is_local (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 1cf548a4f2e..d675bbb17c3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -61,7 +61,6 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
use_confidentiality,
use_integrity),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (policy);
return policy;
}
@@ -76,7 +75,6 @@ TAO::SL3::SecurityManager::create_object_creds_policy (
ACE_NEW_THROW_EX (policy,
TAO::SL3::ObjectCredentialsPolicy (creds_list),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (policy);
return policy;
}
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 0470c54ab17..7e0edc5be59 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -55,7 +55,7 @@ TAO_Security_Current::received_credentials (
if (impl == 0)
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
- return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return impl->received_credentials ();
}
int
@@ -72,7 +72,6 @@ TAO_Security_Current::init (void)
argv,
this->orb_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->orb_core_ = orb.in ()->orb_core ();
@@ -89,7 +88,6 @@ TAO_Security_Current::init (void)
result = -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return result;
}
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 396f2116aa0..f735c30dcbf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -31,7 +31,6 @@ TAO::Security::ORBInitializer::pre_init (
TAO_ORBInitInfo_var tao_info =
TAO_ORBInitInfo::_narrow (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (tao_info.in ()))
{
@@ -49,10 +48,8 @@ TAO::Security::ORBInitializer::pre_init (
// // thread-specific portion of Security::Current.
// size_t old_tss_slot = tao_info->allocate_tss_slot_id (0
// ACE_ENV_ARG_PARAMETER);
-// ACE_CHECK;
-// CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-// ACE_CHECK;
+// CORBA::String_var orb_id = info->orb_id ();
// // Create the SecurityLevel2::Current object.
// SecurityLevel2::Current_ptr current = SecurityLevel2::Current::_nil ();
@@ -63,7 +60,6 @@ TAO::Security::ORBInitializer::pre_init (
// TAO::VMCID,
// ENOMEM),
// CORBA::COMPLETED_NO));
-// ACE_CHECK;
// SecurityLevel2::Current_var security_current = current;
@@ -72,14 +68,12 @@ TAO::Security::ORBInitializer::pre_init (
// info->register_initial_reference ("SecurityCurrent",
// security_current.in ()
// ACE_ENV_ARG_PARAMETER);
-// ACE_CHECK;
// Reserve a TSS slot in the ORB core internal TSS resources for the
// thread-specific portion of SecurityLevel3::SecurityCurrent
// object.
size_t tss_slot = tao_info->allocate_tss_slot_id (0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the SecurityLevel3::Current object.
@@ -92,7 +86,6 @@ TAO::Security::ORBInitializer::pre_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
SecurityLevel3::SecurityCurrent_var security_current3 = current3;
@@ -101,7 +94,6 @@ TAO::Security::ORBInitializer::pre_init (
info->register_initial_reference ("SecurityLevel3:SecurityCurrent",
security_current3.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the SecurityLevel3::CredentialsCurator object.
SecurityLevel3::CredentialsCurator_ptr curator;
@@ -112,7 +104,6 @@ TAO::Security::ORBInitializer::pre_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
SecurityLevel3::CredentialsCurator_var credentials_curator = curator;
@@ -121,7 +112,6 @@ TAO::Security::ORBInitializer::pre_init (
info->register_initial_reference ("SecurityLevel3:CredentialsCurator",
credentials_curator.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the SecurityLevel3::SecurityManager object.
SecurityLevel3::SecurityManager_ptr manager3;
@@ -132,7 +122,6 @@ TAO::Security::ORBInitializer::pre_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
SecurityLevel3::SecurityManager_var security_manager3 = manager3;
@@ -141,7 +130,6 @@ TAO::Security::ORBInitializer::pre_init (
info->register_initial_reference ("SecurityLevel3:SecurityManager",
security_manager3.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -152,7 +140,6 @@ TAO::Security::ORBInitializer::post_init (
{
this->register_policy_factories (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -172,7 +159,6 @@ TAO::Security::ORBInitializer::register_policy_factories (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
this->policy_factory_ = policy_factory;
}
@@ -187,51 +173,43 @@ TAO::Security::ORBInitializer::register_policy_factories (
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = ::Security::SecMechanismsPolicy;
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = ::Security::SecInvocationCredentialsPolicy;
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = ::Security::SecFeaturePolicy; // Deprecated
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = ::Security::SecDelegationDirectivePolicy;
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = ::Security::SecEstablishTrustPolicy;
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = SecurityLevel3::ContextEstablishmentPolicyType;
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
type = SecurityLevel3::ObjectCredentialsPolicyType;
info->register_policy_factory (type,
this->policy_factory_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// ----------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 96f0ddbb787..624827950ef 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -53,7 +53,6 @@ TAO::Security::PolicyFactory::create_policy (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return qop_policy;
}
@@ -80,7 +79,6 @@ TAO::Security::PolicyFactory::create_policy (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return trust_policy;
}
@@ -113,7 +111,6 @@ TAO::Security::PolicyFactory::create_policy (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return policy;
}
@@ -140,7 +137,6 @@ TAO::Security::PolicyFactory::create_policy (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (CORBA::Policy::_nil ());
return policy;
}
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 55708a8dc13..1d842a19e35 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -20,7 +20,7 @@ TAO_TIO::~TAO_TIO (void)
// This is the get method for the attribute time interval.
TimeBase::IntervalT
-TAO_TIO::time_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TIO::time_interval (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return attr_time_interval;
@@ -48,20 +48,16 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
TimeBase::TimeT up1 =
this->time_interval ().upper_bound;
- TimeBase::TimeT tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ TimeBase::TimeT tmp1 = uto->time ();
- TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ TimeBase::TimeT tmp2 = uto->inaccuracy ();
TimeBase::TimeT lb2 = tmp1 - tmp2;
- tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tmp1 = uto->time ();
- tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ tmp2 = uto->inaccuracy ();
TimeBase::TimeT up2 = tmp1 + tmp2;
@@ -70,8 +66,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
ACE_NEW_RETURN (tio,
TAO_TIO (lb1, up1),
CosTime::OTNoOverlap);
- overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio->_this ();
return CosTime::OTOverlap;
}
@@ -82,7 +77,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
CosTime::OTNoOverlap);
overlap = tio->_this ();
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
return CosTime::OTContained;
}
@@ -92,8 +86,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
TAO_TIO (lb2, up2),
CosTime::OTNoOverlap);
- overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio->_this ();
return CosTime::OTContained;
}
@@ -105,8 +98,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
TAO_TIO (0, 0),
CosTime::OTNoOverlap);
- overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio->_this ();
return CosTime::OTNoOverlap;
}
@@ -115,8 +107,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
ACE_NEW_RETURN (tio,
TAO_TIO (lb2, up1),
CosTime::OTNoOverlap);
- overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio->_this ();
return CosTime::OTOverlap;
}
@@ -128,8 +119,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
TAO_TIO (0, 0),
CosTime::OTNoOverlap);
- overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio->_this ();
return CosTime::OTNoOverlap;
}
@@ -139,8 +129,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
TAO_TIO (lb1, up2),
CosTime::OTNoOverlap);
- overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio->_this ();
}
}
ACE_CATCHANY
@@ -148,7 +137,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
return CosTime::OTNoOverlap;
}
@@ -185,10 +173,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
TAO_TIO (lb1, up1),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
- overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio_i->_this ();
return CosTime::OTOverlap;
}
@@ -197,10 +183,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
ACE_NEW_THROW_EX (tio_i,
TAO_TIO (lb1, up1),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
- overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio_i->_this ();
return CosTime::OTContained;
}
@@ -209,10 +193,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
ACE_NEW_THROW_EX (tio_i,
TAO_TIO (lb2, up2),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
- overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio_i->_this ();
return CosTime::OTContained;
}
@@ -223,9 +205,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
ACE_NEW_THROW_EX (tio_i,
TAO_TIO (0, 0),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
- overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio_i->_this ();
return CosTime::OTNoOverlap;
}
@@ -234,10 +214,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
ACE_NEW_THROW_EX (tio_i,
TAO_TIO (lb2, up1),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
- overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio_i->_this ();
return CosTime::OTOverlap;
}
@@ -247,10 +225,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
ACE_NEW_THROW_EX (tio_i,
TAO_TIO (0, 0),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
- overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+ overlap = tio_i->_this ();
return CosTime::OTNoOverlap;
}
@@ -259,7 +235,6 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
ACE_NEW_THROW_EX (tio_i,
TAO_TIO (lb1, up2),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::OTNoOverlap);
overlap = tio_i->_this ();
}
@@ -267,7 +242,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
}
CosTime::UTO_ptr
-TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_TIO::time (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_UTO *uto = 0;
@@ -280,9 +255,8 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
0),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index ff4f0e8ab36..1eec9784995 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -80,7 +80,7 @@ public:
* time interval in the TIO and time value is the midpoint of the
* interval.
*/
- virtual CosTime::UTO_ptr time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosTime::UTO_ptr time (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 710c8fad7ee..3d1fc0acc62 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -40,7 +40,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
// in a UTO.
CosTime::UTO_ptr
-TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Clerk::universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable))
{
@@ -51,10 +51,9 @@ TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
this->inaccuracy (),
this->time_displacement_factor ()),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
// Return the global time as a UTO.
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
// This method returns the global time in a UTO only if the time can
@@ -62,7 +61,7 @@ TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
// implemented currently.
CosTime::UTO_ptr
-TAO_Time_Service_Clerk::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Clerk::secure_universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable))
{
@@ -86,9 +85,8 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
inaccuracy,
tdf),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
// This creates a new UTO given a time in the UtcT form.
@@ -112,8 +110,7 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
inaccuracy,
utc.tdf),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
// This creates a new TIO with the given parameters.
@@ -130,8 +127,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
TAO_TIO (lower,
upper),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::TIO::_nil ());
- return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return tio->_this ();
}
CORBA::ULongLong
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index ef8d5a9a3dd..d4efbe75f93 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -60,7 +60,7 @@ public:
/// This operation returns the global time and an estimate of
/// inaccuracy in a UTO.
- virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosTime::UTO_ptr universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable));
@@ -70,7 +70,7 @@ public:
* operation is not implemented and throws a CORBA::NO_IMPLEMENT
* exception, if called.
*/
- virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosTime::UTO_ptr secure_universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable));
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 6fc4cf2b98e..5d083a12023 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -27,7 +27,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
// inaccuracy in a UTO.
CosTime::UTO_ptr
-TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Server::universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable))
{
@@ -43,13 +43,12 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
0),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
"Returning a UTO\n"));
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
// This method returns the current time in a UTO only if the time can
@@ -57,7 +56,7 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
// implemented currently.
CosTime::UTO_ptr
-TAO_Time_Service_Server::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Server::secure_universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable))
{
@@ -81,9 +80,8 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
inaccuracy,
tdf),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
// This creates a new UTO given a time in the UtcT form.
@@ -100,9 +98,8 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
utc.inacclo + utc.inacchi,
utc.tdf),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::UTO::_nil ());
- return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return uto->_this ();
}
// This creates a new TIO with the given parameters.
@@ -119,9 +116,8 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
TAO_TIO (lower,
upper),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CosTime::TIO::_nil ());
- return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return tio->_this ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index c87d563935a..3aec44a728d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -48,7 +48,7 @@ public:
/// This operation returns the current system time and an estimate of
/// inaccuracy in a UTO.
- virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosTime::UTO_ptr universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable));
@@ -57,7 +57,7 @@ public:
* can be guaranteed to have been obtained securely. Currently this operation
* is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called.
*/
- virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosTime::UTO_ptr secure_universal_time (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTime::TimeUnavailable));
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index c9ea818a549..249be17323a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -47,7 +47,7 @@ TAO_UTO::~TAO_UTO (void)
// Get Method for the readonly attribute time.
TimeBase::TimeT
-TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::time (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return attr_utc_time_.time;
@@ -56,7 +56,7 @@ TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// Get method for the readonly attribute inaccuracy.
TimeBase::InaccuracyT
-TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::inaccuracy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Construct the Inaccuracy from the
@@ -71,7 +71,7 @@ TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// Get method for the readonly attribute tdf.
TimeBase::TdfT
-TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::tdf (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return attr_utc_time_.tdf;
@@ -80,7 +80,7 @@ TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// Get method for the readonly attribute utc_time.
TimeBase::UtcT
-TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::utc_time (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return attr_utc_time_;
@@ -90,7 +90,7 @@ TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// the Base Time, UTC and Distributed Time Sync. Algos. [3].
CosTime::UTO_ptr
-TAO_UTO::absolute_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::absolute_time (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CosTime::UTO::_nil ();
@@ -105,16 +105,13 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::TCIndeterminate);
+ TimeBase::TimeT uto_time = uto->time ();
TimeBase::InaccuracyT this_inaccuracy =
- this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::TCIndeterminate);
+ this->inaccuracy ();
TimeBase::InaccuracyT uto_inaccuracy =
- uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTime::TCIndeterminate);
+ uto->inaccuracy ();
if (comparison_type == CosTime::MidC)
{
@@ -172,8 +169,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
ACE_TRY
{
- TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ TimeBase::TimeT uto_time = uto->time ();
if (this->time () > uto_time)
{
@@ -182,7 +178,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
this->time ()),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
}
else
{
@@ -191,7 +186,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
uto_time),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -200,16 +194,15 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
return CosTime::TIO::_nil ();
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosTime::TIO::_nil ());
- return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return tio->_this ();
}
// Returns a TIO object representing the error interval around the
// time value in the UTO.
CosTime::TIO_ptr
-TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UTO::interval (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_TIO *tio = 0;
@@ -217,8 +210,7 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
TimeBase::TimeT this_inaccuracy =
- this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->inaccuracy ();
TimeBase::TimeT lower =
this->time () - this_inaccuracy;
@@ -230,7 +222,6 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
TAO_TIO (lower,
upper),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -238,9 +229,8 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
return CosTime::TIO::_nil ();
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosTime::TIO::_nil ());
- return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return tio->_this ();
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b4e72e090da..c6319056f35 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -59,16 +59,16 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// For the readonly attribute <inaccuracy>.
- virtual TimeBase::InaccuracyT inaccuracy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual TimeBase::InaccuracyT inaccuracy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// For the readonly attribute <tdf>, which is the "time displacement
/// factor".
- virtual TimeBase::TdfT tdf (ACE_ENV_SINGLE_ARG_DECL)
+ virtual TimeBase::TdfT tdf (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// For the readonly attribute <utc_time>.
- virtual TimeBase::UtcT utc_time (ACE_ENV_SINGLE_ARG_DECL)
+ virtual TimeBase::UtcT utc_time (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -76,7 +76,7 @@ public:
* ?? Find out more about the Base Time, UTC and
* Distributed Time Sync. Algos. [3
*/
- CosTime::UTO_ptr absolute_time (ACE_ENV_SINGLE_ARG_DECL)
+ CosTime::UTO_ptr absolute_time (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Compares the time contained in the object with the time in the
@@ -99,7 +99,7 @@ public:
/// Returns a TIO object representing the error interval around the
/// time value in the UTO.
- CosTime::TIO_ptr interval (ACE_ENV_SINGLE_ARG_DECL)
+ CosTime::TIO_ptr interval (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 47923f8dba3..2c2c23d95e7 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -56,8 +56,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
{
// This is a remote call.
CosTime::UTO_var UTO_server =
- (*value)->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (*value)->universal_time ();
#if defined (ACE_LACKS_LONGLONG_T)
@@ -89,8 +88,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
#endif
CORBA::ULongLong curr_server_time =
- UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ UTO_server->time ();
sum += curr_server_time;
@@ -148,7 +146,6 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 90b01c53853..49871b384c5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -30,7 +30,6 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
ACE_NEW_THROW_EX (this->root_,
TAO_Literal_Constraint ((CORBA::Boolean) 1),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
else
{
@@ -54,7 +53,6 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
ACE_NEW_THROW_EX (this->root_,
TAO_Literal_Constraint ((CORBA::Boolean) 1),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
else
{
@@ -99,7 +97,6 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter (
ACE_NEW_THROW_EX (this->root_,
TAO_Noop_Constraint (TAO_FIRST),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
else
{
@@ -124,7 +121,6 @@ TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
ACE_NEW_THROW_EX (this->root_,
TAO_Noop_Constraint (TAO_FIRST),
CORBA::NO_MEMORY ());
- ACE_CHECK;
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 5507d9ed689..250eda650cc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -313,8 +313,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
CORBA::TCKind corba_type = CORBA::tk_null;
ACE_TRY
{
- corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ corba_type = type->kind ();
}
ACE_CATCHANY
{
@@ -506,8 +505,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
CORBA::TCKind kind = CORBA::tk_null;
ACE_TRY
{
- kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ kind = type->kind ();
}
ACE_CATCHANY
{
@@ -546,9 +544,9 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
CORBA::TCKind kind = CORBA::tk_void;
ACE_TRY_EX (label2)
{
- CORBA::TypeCode_var typecode = type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var typecode = type->content_type ();
ACE_TRY_CHECK_EX (label2);
- kind = typecode->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+ kind = typecode->kind ();
ACE_TRY_CHECK_EX (label2);;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 621aef465e1..8de809e2631 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -525,14 +525,12 @@ sequence_does_contain (CORBA::Any* sequence,
{
sequence_type =
TAO_Sequence_Extracter_Base::sequence_type (type.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
return return_value;
}
ACE_ENDTRY;
- // ACE_CHECK_RETURN (return_value);
if (sequence_type == CORBA::tk_void)
return return_value;
@@ -616,8 +614,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::Short value = dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short value = dyn_any.get_short ();
return_value = (value == element);
}
ACE_CATCHANY
@@ -635,8 +632,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::UShort value = dyn_any.get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::UShort value = dyn_any.get_ushort ();
return_value = (value == element);
}
ACE_CATCHANY
@@ -654,8 +650,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::Long value = dyn_any.get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Long value = dyn_any.get_long ();
return_value = (value == element);
}
ACE_CATCHANY
@@ -673,8 +668,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::ULong value = dyn_any.get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::ULong value = dyn_any.get_ulong ();
return_value = (value == element);
}
ACE_CATCHANY
@@ -692,8 +686,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::LongLong value = dyn_any.get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::LongLong value = dyn_any.get_longlong ();
return_value = (value == element);
}
ACE_CATCHANY
@@ -711,8 +704,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::ULongLong value = dyn_any.get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::ULongLong value = dyn_any.get_ulonglong ();
return_value = (value == element);
}
ACE_CATCHANY
@@ -730,8 +722,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::Float value = dyn_any.get_float (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Float value = dyn_any.get_float ();
return_value = (value == element);
}
ACE_CATCHANY {} ACE_ENDTRY;
@@ -746,8 +737,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::Double value = dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Double value = dyn_any.get_short ();
return_value = (value == element);
}
ACE_CATCHANY {} ACE_ENDTRY;
@@ -762,8 +752,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short ();
return_value = (value == element);
}
ACE_CATCHANY {} ACE_ENDTRY;
@@ -778,8 +767,7 @@ operator () (TAO_DynSequence_i& dyn_any,
int return_value = 0;
ACE_TRY_NEW_ENV
{
- const char* value = dyn_any.get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ const char* value = dyn_any.get_string ();
return_value = (ACE_OS::strcmp (value, element) == 0);
}
ACE_CATCHANY {} ACE_ENDTRY;
@@ -1069,7 +1057,6 @@ visit_in (TAO_Binary_Constraint* binary_in)
{
seq_type =
TAO_Sequence_Extracter_Base::sequence_type (prop_type ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 993d47ad0e0..045c750ca75 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -14,8 +14,7 @@ sequence_type (CORBA::TypeCode* type_code
{
// @@ Seth, why do you use a comma to separate the two statements?
CORBA::TCKind return_value = CORBA::tk_void,
- type_kind = type_code->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ type_kind = type_code->kind ();
if (type_kind == CORBA::tk_alias
|| type_kind == CORBA::tk_sequence)
@@ -24,28 +23,23 @@ sequence_type (CORBA::TypeCode* type_code
for (;;)
{
- CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ CORBA::TCKind base_kind = base->kind ();
if (base_kind == CORBA::tk_alias)
{
- base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ base = base->content_type ();
}
else
break;
}
- CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ CORBA::TCKind base_kind = base->kind ();
if (base_kind == CORBA::tk_sequence)
{
- base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ base = base->content_type ();
- base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ base_kind = base->kind ();
return_value = base_kind;
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index 5474d4fb694..791eab90f62 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -20,22 +20,18 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
ACE_TRY
{
dyn_seq.init (sequence ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length =
dyn_seq.get_length ( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
-
+
dyn_seq.rewind( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0 ; i < length && ! return_value; i++)
{
if (functor (dyn_seq, element))
return_value = 1;
-
+
dyn_seq.next( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 9401c5366c0..381e6bc2b5d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -162,7 +162,6 @@ remove_offer (const CosTrading::OfferId offer_id
stype,
index
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->remove_offer (stype,
index) == -1)
@@ -183,7 +182,6 @@ lookup_offer (const CosTrading::OfferId offer_id,
CORBA::ULong index;
CosTrading::Offer* offer = 0;
this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (offer);
if ((offer = this->lookup_offer (type_name, index)) == 0)
ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
@@ -204,7 +202,6 @@ lookup_offer (const CosTrading::OfferId offer_id
CosTrading::Offer* offer = 0;
this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (offer);
if ((offer = this->lookup_offer (type_name, index)) == 0)
ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index da8ad797031..63a06f1ca20 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -16,21 +16,18 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
}
void
-TAO_Offer_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Remove self from POA
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
TAO_Query_Only_Offer_Iterator::
@@ -52,7 +49,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
}
CORBA::ULong
-TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Query_Only_Offer_Iterator::max_left (void)
ACE_THROW_SPEC((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
@@ -96,8 +93,7 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
ACE_TRY_NEW_ENV
{
- offer_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_iter->destroy ();
CORBA::release (offer_iter);
}
@@ -131,7 +127,6 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
ACE_NEW_THROW_EX (offers,
CosTrading::OfferSeq,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (return_value);
while (offers_left > 0 && ! this->iters_.is_empty ())
{
@@ -148,13 +143,11 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
iter->next_n (offers_left,
CosTrading::OfferSeq_out (out_offers.out ())
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
// If we've exhausted this iterator, destroy it.
if (any_left == 0)
{
- iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ iter->destroy ();
CORBA::release (iter);
}
else
@@ -177,7 +170,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
}
void
-TAO_Offer_Iterator_Collection::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator_Collection::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Destroy all iterators in the collection.
@@ -188,26 +181,22 @@ TAO_Offer_Iterator_Collection::destroy (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::OfferIterator** iter = 0;
iters_iter.next (iter);
- (*iter)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ (*iter)->destroy ();
}
// Remove self from POA
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator_Collection::max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
@@ -235,7 +224,7 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
}
CORBA::ULong
-TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Id_Iterator::max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
@@ -243,22 +232,19 @@ TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_Offer_Id_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Id_Iterator::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Remove self from POA
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 247664b6f77..6bf784f63e9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -59,7 +59,7 @@ public:
* destroyed.
* END SPEC
*/
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Add an offer to the collection of offers the iterator will
@@ -67,7 +67,7 @@ public:
virtual void add_offer (CosTrading::OfferId offer_id,
const CosTrading::Offer* offer) = 0;
- virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::ULong max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft)) = 0;
@@ -138,7 +138,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the number of items left in the iterator.
- virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::ULong max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft));
@@ -192,11 +192,11 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Destroy the collection of iterators.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Determine how many offers are left in the collection.
- virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::ULong max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft));
@@ -248,7 +248,7 @@ class TAO_Offer_Id_Iterator :
* identifiers (e.g., if the iterator determines its set of offer
* identifiers through lazy evaluation).
*/
- virtual CORBA::ULong max_left(ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::ULong max_left(void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft));
@@ -257,7 +257,7 @@ class TAO_Offer_Id_Iterator :
* operations can be invoked on an iterator after it has been
* destroyed.
*/
- virtual void destroy(ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy(void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index f8ad8bd3a6f..436fd76fb55 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -39,7 +39,7 @@ add_offer (CosTrading::OfferId id,
template <class MAP_LOCK_TYPE> CORBA::ULong
TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
@@ -62,7 +62,6 @@ next_n (CORBA::ULong n,
ACE_NEW_THROW_EX (offers,
CosTrading::OfferSeq,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
offers->length (max_possible_offers_in_sequence);
@@ -79,7 +78,6 @@ next_n (CORBA::ULong n,
CosTrading::OfferId_var offerid_var (id);
CosTrading::Offer* offer = this->db_.lookup_offer (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (offer != 0)
this->pfilter_.filter_offer (offer,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 8aa992e9add..43dea0ef133 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -65,7 +65,7 @@ public:
* the trader will have all the offers it has now when the time
* to return them comes.
*/
- virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft));
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 106cc5e3045..13a9b952490 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -45,7 +45,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
}
CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-TAO_Service_Type_Repository::incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Service_Type_Repository::incarnation (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
@@ -93,7 +93,6 @@ add_type (const char *name,
ACE_UNUSED_ARG (inc_num);
ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
- ACE_CHECK_RETURN (inc_num);
// Make sure Type name is valid.
if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
@@ -110,13 +109,11 @@ add_type (const char *name,
this->validate_properties (prop_map,
props
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (this->incarnation_);
// Check that all super_types exist, and none are duplicated.
this->validate_supertypes (super_map,
super_types
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (this->incarnation_);
// NOTE: I don't really know a way to do this without an Interface
// Repository, since the Interface Repository IDs don't contain
@@ -124,7 +121,6 @@ add_type (const char *name,
//
// make sure interface name is legal.
// this->validate_interface (if_name, super_types ACE_ENV_ARG_PARAMETER);
- // ACE_CHECK_RETURN (this->incarnation);
//
// Instead, we do this:
//
@@ -138,7 +134,6 @@ add_type (const char *name,
this->validate_inheritance (prop_map,
super_types
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (this->incarnation_);
// We can now use prop_map to construct a sequence of all properties
// the this type.
@@ -174,7 +169,6 @@ TAO_Service_Type_Repository::remove_type (const char *name
ACE_THROW (CosTrading::IllegalServiceType (name));
ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
- ACE_CHECK;
// Check if the type exists.
Service_Type_Map::ENTRY* type_entry = 0; ;
@@ -199,7 +193,6 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
CORBA::ULong i = 0;
CORBA::ULong length = static_cast<CORBA::ULong> (this->type_map_.current_size ());
@@ -256,7 +249,6 @@ describe_type (const char * name
ace_mon,
*this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// Make sure the type exists.
CORBA::String_var type_name (name);
@@ -301,7 +293,6 @@ fully_describe_type (const char *name
0);
ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
// Make sure the type exists.
CORBA::String_var type_name (name);
@@ -616,7 +607,6 @@ validate_inheritance (Prop_Map &prop_map,
compare =
super_props[j].value_type->equal (prop_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -627,7 +617,6 @@ validate_inheritance (Prop_Map &prop_map,
property_in_map));
}
ACE_ENDTRY;
- ACE_CHECK;
if (compare == 0
|| super_props[j].mode > property_in_map.mode)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 4f5b959b216..347e35c59e0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -43,7 +43,7 @@ public:
~TAO_Service_Type_Repository (void);
virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
- incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ incarnation (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index 818934b10bb..387b859dbd5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -38,14 +38,12 @@ visit_property (TAO_Property_Constraint* literal)
ACE_TRY
{
value = this->prop_eval_.property_value (prop_index ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
return -1;
}
ACE_ENDTRY;
- // ACE_CHECK_RETURN (-1);
if (value != 0)
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 393d73a2e83..b75fbbae2f1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -63,13 +63,11 @@ query (const char *type,
{
// Instantiate a class to help interpret query policies.
TAO_Policies policies (this->trader_, in_policies ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// If a federated query returns to us, ignore it to prevent
// redundant results and infinite loops.
CosTrading::Admin::OctetSeq* request_id = 0;
int check = this->seen_request_id (policies, request_id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (check)
{
@@ -86,8 +84,7 @@ query (const char *type,
// If the importer has specified a starting trader, foward the
// query.
CosTrading::TraderName* trader_name =
- policies.starting_trader (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ policies.starting_trader ();
if (! CORBA::is_nil (link_if) && trader_name != 0)
{
@@ -105,7 +102,6 @@ query (const char *type,
returned_offer_iterator,
returned_limits_applied
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return;
}
@@ -116,7 +112,6 @@ query (const char *type,
support_attrs.service_type_repos ();
CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ Should throw a NO_MEMORY exception here...
ACE_NEW (returned_offers,
@@ -137,16 +132,13 @@ query (const char *type,
// constraints.
TAO_Offer_Filter offer_filter (policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Trader_Constraint_Validator validator (type_struct.in ());
TAO_Constraint_Interpreter constr_inter (validator,
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Preference_Interpreter pref_inter (validator,
preferences
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Try to find the map of offers of desired service type.
offer_filter.configure_type (type_struct.ptr ());
@@ -156,8 +148,7 @@ query (const char *type,
pref_inter,
offer_filter);
- CORBA::Boolean result = policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Boolean result = policies.exact_type_match ();
if (!result)
{
@@ -175,7 +166,6 @@ query (const char *type,
pref_inter,
offer_filter
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Take note of the limits applied in this query.
@@ -191,7 +181,6 @@ query (const char *type,
*returned_offers.ptr (),
returned_offer_iterator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The following steps are only appropriate for a linked trader.
if (! CORBA::is_nil (link_if))
@@ -204,7 +193,6 @@ query (const char *type,
offers_returned,
CosTrading::LinkNameSeq_out (links.out ())
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (should_follow && links->length () != 0)
{
@@ -222,7 +210,6 @@ query (const char *type,
returned_offer_iterator.ptr (),
*returned_limits_applied.ptr ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -311,7 +298,6 @@ lookup_all_subtypes (const char* type,
sst.incarnation (inc_num);
all_types = rep->list_types (sst ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Scan all types inserted after the super types. If the transitive
// closure of a type's super type relation includes the super type
@@ -325,7 +311,6 @@ lookup_all_subtypes (const char* type,
// Obtain a description of the prospective type.
type_struct = rep->fully_describe_type (all_types[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
super_types = type_struct->super_types;
@@ -375,13 +360,11 @@ fill_receptacles (const char* /* type */,
// END SPEC
TAO_Property_Filter prop_filter (desired_props ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// RETURNING: Calculate how many offers go into the sequence
// Calculate how many go into the iterator
- CORBA::ULong return_card = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CORBA::ULong return_card = policies.return_card ();
CORBA::ULong i = 0;
CORBA::ULong size = static_cast<CORBA::ULong> (pref_inter.num_offers ());
@@ -425,11 +408,9 @@ fill_receptacles (const char* /* type */,
this->create_offer_iterator (prop_filter);
// Register it with the POA.
- offer_itr = oi->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (total_offers - offers_in_iterator);
+ offer_itr = oi->_this ();
- oi->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (total_offers - offers_in_iterator);
+ oi->_remove_ref ();
// Add to the iterator
for (i = 0; i < offers_in_iterator; i++)
@@ -501,8 +482,7 @@ retrieve_links (TAO_Policies& policies,
CosTrading::Lookup::PolicyTypeMismatch))
{
CORBA::Boolean should_follow = 0;
- CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (should_follow);
+ CosTrading::FollowOption follow_rule = policies.link_follow_rule ();
// Determine whether or not a federated query is warranted. A query
// is waranted if the follow_rule governing this query is 'always'
@@ -510,8 +490,7 @@ retrieve_links (TAO_Policies& policies,
if ((follow_rule == CosTrading::always ||
(follow_rule == CosTrading::if_no_local && offers_returned == 0)))
{
- CORBA::ULong hc = policies.hop_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CORBA::ULong hc = policies.hop_count ();
if (hc > 0)
should_follow = 1;
@@ -524,8 +503,7 @@ retrieve_links (TAO_Policies& policies,
CosTrading::Link_ptr link_if =
this->trader_.trading_components ().link_if ();
- links = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ links = link_if->list_links ();
// Determine which of the links registered with the Link
// interface are suitable to follow.
@@ -537,12 +515,10 @@ retrieve_links (TAO_Policies& policies,
// Grab the link information.
CosTrading::Link::LinkInfo_var
link_info (link_if->describe_link (links[i] ACE_ENV_ARG_PARAMETER));
- ACE_CHECK_RETURN (should_follow);
// Compute the link follow rule.
CosTrading::FollowOption link_rule =
policies.link_follow_rule (link_info.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (should_follow);
// Determine if the link follow rule applies.
if (link_rule == CosTrading::always
@@ -616,7 +592,6 @@ federated_query (const CosTrading::LinkNameSeq& links,
CosTrading::PolicySeq policies_to_pass;
policies.copy_to_pass (policies_to_pass, request_id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
for (int i = links.length () - 1; i >= 0; i--)
{
@@ -629,13 +604,11 @@ federated_query (const CosTrading::LinkNameSeq& links,
// Obtain information about the link we're traversing.
CosTrading::Link::LinkInfo_var link_info =
link_interface->describe_link (links[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set the link follow policy for the query over the link.
policies.copy_in_follow_option (policies_to_pass,
link_info.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTrading::Lookup_var remote_lookup =
CosTrading::Lookup::_duplicate (link_info->target.in ());
@@ -651,7 +624,6 @@ federated_query (const CosTrading::LinkNameSeq& links,
CosTrading::OfferIterator_out (out_offer_iter),
CosTrading::PolicyNameSeq_out (out_limits)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong j = 0;
CosTrading::OfferSeq_var out_offers_var (out_offers);
@@ -684,18 +656,15 @@ federated_query (const CosTrading::LinkNameSeq& links,
// Ah, well, this query failed, move on to the next one.
}
ACE_ENDTRY;
- // ACE_CHECK;
}
// Sort the sequence in preference order.
this->order_merged_sequence (pref_inter, offers);
// Return the collection of offer iterators.
- offer_iter = offer_iter_collection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ offer_iter = offer_iter_collection->_this ();
- offer_iter_collection->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ offer_iter_collection->_remove_ref ();
}
template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -769,17 +738,14 @@ forward_query (const char* next_hop,
{
CosTrading::Link::LinkInfo_var link_info =
link_interface->describe_link (next_hop ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTrading::Lookup_var remote_lookup =
CosTrading::Lookup::_duplicate (link_info->target.in ());
- CORBA::Object_var us = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Object_var us = this->_this ();
CORBA::Boolean self_loop =
remote_lookup->_is_equivalent (us.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (! self_loop)
{
@@ -794,7 +760,6 @@ forward_query (const char* next_hop,
offer_itr,
limits_applied
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -808,7 +773,6 @@ forward_query (const char* next_hop,
offer_itr,
limits_applied
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -819,7 +783,6 @@ forward_query (const char* next_hop,
ACE_TRY_THROW (CosTrading::Lookup::InvalidPolicyValue (policy));
}
ACE_ENDTRY;
- // ACE_CHECK;
}
template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -833,15 +796,13 @@ seen_request_id (TAO_Policies& policies,
{
CORBA::Boolean return_value = 0;
- seq = policies.request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ seq = policies.request_id ();
if (seq == 0)
{
CosTrading::Admin_ptr admin_if =
this->trader_.trading_components ().admin_if ();
- seq = admin_if->request_id_stem (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ seq = admin_if->request_id_stem ();
}
else
{
@@ -850,7 +811,6 @@ seen_request_id (TAO_Policies& policies,
ACE_NEW_THROW_EX (seq,
CosTrading::Admin::OctetSeq (*seq),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (1);
}
ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1);
@@ -932,7 +892,6 @@ _cxx_export (CORBA::Object_ptr reference,
// properties match the type definition.
CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Oops the type is masked, we shouldn't let exporters know the type
// exists.
@@ -942,7 +901,6 @@ _cxx_export (CORBA::Object_ptr reference,
// TAO-specific way to determine if an object is derived from or is
// an interface type.
int check = (! reference->_is_a (type_struct->if_name ACE_ENV_ARG_PARAMETER));
- ACE_CHECK_RETURN (0);
if (check)
ACE_THROW_RETURN (CosTrading::Register::
InterfaceTypeMismatch (type, reference), 0);
@@ -950,11 +908,9 @@ _cxx_export (CORBA::Object_ptr reference,
// Validate that the properties defined for this offer are correct
// to their types and strength.
this->validate_properties (type, type_struct.ptr (), properties ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// CORBA::ULong plength = properties.length ();
ACE_NEW_THROW_EX (offer, CosTrading::Offer, CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
// No copying, no memory leaks. Violates the "in" parameter semantics
// when this object is colocated with the client, however.
@@ -1008,11 +964,9 @@ describe (const char *id
// Perform a lookup to find the offer.
CosTrading::Offer* offer =
offer_database.lookup_offer ((CosTrading::OfferId) id, type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CosTrading::Register::OfferInfo *offer_info = 0;
ACE_NEW_THROW_EX (offer_info, CosTrading::Register::OfferInfo, CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
offer_info->reference = CORBA::Object::_duplicate (offer->reference.in ());
offer_info->type = CORBA::string_dup (type);
@@ -1047,8 +1001,7 @@ modify (const char *id,
{
// Throw an exception if the trader is not configured
// to support properties modification.
- int check = (! this->supports_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
+ int check = (! this->supports_modifiable_properties ());
if (check)
ACE_THROW (CosTrading::NotImplemented ());
@@ -1062,22 +1015,18 @@ modify (const char *id,
CosTrading::Offer* offer = offer_database.
lookup_offer (const_cast<CosTrading::OfferId> (id), type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (offer != 0)
{
// Yank our friend, the type struct.
CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer);
// Delete, add, and change properties of the offer.
offer_mod.delete_properties (del_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
offer_mod.merge_properties (modify_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Alter our reference to the offer. We do this last, since the
// spec says: modify either suceeds completely or fails
@@ -1109,7 +1058,6 @@ withdraw_using_constraint (const char *type,
// Retrieve the type struct
CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Try to find the map of offers of desired service type.
// @@ Again, should be Offer_Database::offer_iterator
@@ -1128,7 +1076,6 @@ withdraw_using_constraint (const char *type,
TAO_Trader_Constraint_Validator validator (type_struct.in ());
TAO_Constraint_Interpreter constr_inter (validator, constr ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
while (offer_iter.has_more_offers ())
{
@@ -1151,7 +1098,6 @@ withdraw_using_constraint (const char *type,
ids.dequeue_head (offer_id);
offer_database.remove_offer (offer_id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::string_free (offer_id);
}
}
@@ -1189,18 +1135,15 @@ resolve (const CosTrading::TraderName &name
{
// Ensure that the link to the next trader exists.
link_info = link_if->describe_link (name[0] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
remote_reg =
CosTrading::Register::_narrow (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_TRY_THROW (CosTrading::Register::UnknownTraderName (name));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CosTrading::Register::_nil ());
// Ensure that the register pointer isn't nil.
if (! CORBA::is_nil (remote_reg.in ()))
@@ -1217,7 +1160,6 @@ resolve (const CosTrading::TraderName &name
trader_name[i] = name[i + 1];
return_value = remote_reg->resolve (trader_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosTrading::Register::_nil ());
}
return return_value;
@@ -1240,7 +1182,6 @@ validate_properties (const char* type,
const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
prop_types = type_struct->props;
TAO_Property_Evaluator_By_Name prop_eval (properties ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Perform property validation
length = prop_types.length ();
@@ -1266,7 +1207,6 @@ validate_properties (const char* type,
int check =
(! prop_type->equal (prop_struct.value_type.in ()
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK;
if (check)
{
// Offer cannot redefine the type of an property.
@@ -1347,7 +1287,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
CosTrading::Admin::OctetSeq *
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
@@ -1623,14 +1563,11 @@ list_offers (CORBA::ULong how_many,
if (how_many > 0)
{
int check = offer_id_iter->next_n (how_many, ids ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (check == 1)
{
- id_itr = offer_id_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- offer_id_iter->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ id_itr = offer_id_iter->_this ();
+ offer_id_iter->_remove_ref ();
}
else
delete offer_id_iter;
@@ -1703,8 +1640,7 @@ add_link (const char *name,
// Ensure that the limiting link behavior for this link doesn't
// exceed the maximum allowed for a link.
CosTrading::FollowOption follow_policy =
- this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->max_link_follow_policy ();
if (limiting_follow_rule < follow_policy)
ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
(limiting_follow_rule, follow_policy));
@@ -1716,7 +1652,6 @@ add_link (const char *name,
link_info.def_pass_on_follow_rule = def_pass_on_follow_rule;
link_info.limiting_follow_rule = limiting_follow_rule;
- ACE_CHECK;
// Insert this link into the collection of links.
this->links_.bind (link_name, link_info);
@@ -1770,7 +1705,6 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
ACE_NEW_THROW_EX (new_link_info,
CosTrading::Link::LinkInfo,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
new_link_info->def_pass_on_follow_rule = old_link_info.def_pass_on_follow_rule;
new_link_info->limiting_follow_rule = old_link_info.limiting_follow_rule;
@@ -1781,8 +1715,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
// This avoids the nested upcall that would occur were we to invoke
// this method in the add_link method.
- new_link_info->target_reg = old_link_info.target->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (new_link_info);
+ new_link_info->target_reg = old_link_info.target->register_if ();
// return the link information for this link name.
return new_link_info;
@@ -1790,7 +1723,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
CosTrading::LinkNameSeq*
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Allocate space for the link names.
@@ -1840,8 +1773,7 @@ modify_link (const char *name,
// Ensure that the limiting link behavior for this link doesn't
// exceed the maximum allowed for a link.
CosTrading::FollowOption follow_policy =
- this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->max_link_follow_policy ();
if (limiting_follow_rule < follow_policy)
ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 2b1db71d3bc..a8ea0c35422 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -697,7 +697,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosTrading::Admin::OctetSeq*
- request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ request_id_stem (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CosTrading::Admin::OctetSeq*
@@ -871,7 +871,7 @@ public:
// state.
// END SPEC
- virtual CosTrading::LinkNameSeq* list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::LinkNameSeq* list_links (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// BEGIN SPEC
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 74c5a327976..29b46370049 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -26,10 +26,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
ACE_NEW (lookup,
(TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
- this->trading_components ().lookup_if (lookup->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
- lookup->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->trading_components ().lookup_if (lookup->_this ());
+ lookup->_remove_ref ();
this->ifs_[LOOKUP_IF] = lookup;
}
@@ -40,10 +38,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
ACE_NEW (reg,
(TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
- this->trading_components ().register_if (reg->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
- reg->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->trading_components ().register_if (reg->_this ());
+ reg->_remove_ref ();
this->ifs_[REGISTER_IF] = reg;
}
@@ -54,10 +50,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
ACE_NEW (admin,
(TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
- this->trading_components ().admin_if (admin->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
- admin->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->trading_components ().admin_if (admin->_this ());
+ admin->_remove_ref ();
this->ifs_[ADMIN_IF] = admin;
}
@@ -68,10 +62,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
ACE_NEW (proxy,
(TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
- this->trading_components ().proxy_if (proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
- proxy->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->trading_components ().proxy_if (proxy->_this ());
+ proxy->_remove_ref ();
this->ifs_[PROXY_IF] = proxy;
}
@@ -82,10 +74,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
ACE_NEW (link,
(TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
- this->trading_components ().link_if (link->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK;
- link->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->trading_components ().link_if (link->_this ());
+ link->_remove_ref ();
this->ifs_[LINK_IF] = link;
}
@@ -105,15 +95,12 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
ACE_TRY
{
PortableServer::POA_var poa =
- this->ifs_[i]->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ifs_[i]->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this->ifs_[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -146,35 +133,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
}
template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::lookup_if (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
}
template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::register_if (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CosTrading::Register::_duplicate (this->comps_.register_if ());
}
template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::admin_if (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
}
template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::proxy_if (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
}
template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::link_if (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CosTrading::Link::_duplicate (this->comps_.link_if ());
@@ -187,21 +174,21 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
}
template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_modifiable_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.supports_modifiable_properties ();
}
template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_dynamic_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.supports_dynamic_properties ();
}
template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_proxy_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.supports_proxy_offers ();
@@ -222,77 +209,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_search_card (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.def_search_card ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_search_card (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_search_card ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_match_card (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.def_match_card ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_match_card (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_match_card ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_return_card (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.def_return_card ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_return_card (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_return_card ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_list (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_list ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_hop_count (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.def_hop_count ();
}
template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_hop_count (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_hop_count ();
}
template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_follow_policy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.def_follow_policy ();
}
template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_follow_policy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_follow_policy ();
@@ -306,7 +293,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
}
template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Link_Attributes<IF>::max_link_follow_policy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->attrs_.max_link_follow_policy ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index cf892279bcc..825725ee266 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -115,27 +115,27 @@ public:
// = CosTrading::TraderComponents methods.
/// Returns an object reference to the Lookup interface of the trader.
/// Returns nil if the trader does not support Lookup interface.
- virtual CosTrading::Lookup_ptr lookup_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::Lookup_ptr lookup_if (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns object reference for the Register interface of the trader.
/// Returns nil if the trader does not support Register interface.
- virtual CosTrading::Register_ptr register_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::Register_ptr register_if (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns object reference for the Link interface of the trader.
/// Returns nil if the trader does not support Link interface.
- virtual CosTrading::Link_ptr link_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::Link_ptr link_if (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns object reference to the Proxy interface of the trader.
/// Returns nil if the trader does not support Proxy interface.
- virtual CosTrading::Proxy_ptr proxy_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::Proxy_ptr proxy_if (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns object reference for the Admin interface of the trader.
/// Returns nil if the trader does not support Admin interface.
- virtual CosTrading::Admin_ptr admin_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::Admin_ptr admin_if (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -152,16 +152,16 @@ public:
// = CosTrading::SupportAttributes methods.
- virtual CORBA::Boolean supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::Boolean supports_modifiable_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::Boolean supports_dynamic_properties (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::Boolean supports_proxy_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CosTrading::TypeRepository_ptr type_repos (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::TypeRepository_ptr type_repos (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -178,47 +178,47 @@ public:
// = CosTrading::ImportAttributes methods.
- virtual CORBA::ULong def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong def_search_card (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong max_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong max_search_card (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Search cardinality determines the maximum number of offers searched
// before not considering other offers.
- virtual CORBA::ULong def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong def_match_card (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong max_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong max_match_card (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Match cardinality determines the maximum number of offers
// matched to the constraints before not considering other offers..
- virtual CORBA::ULong def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong def_return_card (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong max_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong max_return_card (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Return cardinality determines the maximum number of offers marked
// to return before not considering other offers.
- virtual CORBA::ULong max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong max_list (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong def_hop_count (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CORBA::ULong max_hop_count (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CosTrading::FollowOption def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::FollowOption def_follow_policy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CosTrading::FollowOption max_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::FollowOption max_follow_policy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
@@ -235,7 +235,7 @@ public:
TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
// = CosTrading::LinkAttributes methods
- virtual CosTrading::FollowOption max_link_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual CosTrading::FollowOption max_link_follow_policy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 4de7d0c8638..60c11374b88 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -243,7 +243,6 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
ACE_DECLARE_NEW_CORBA_ENV;
CORBA::Boolean equal = type->equal (CosTradingDynamic::_tc_DynamicProp
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (equal)
return_value = 1;
@@ -297,7 +296,6 @@ TAO_Property_Evaluator::property_value (int index
{
// Retrieve the value of the dynamic property.
prop_val = dp_eval->evalDP(name, type, info ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->dp_cache_ != 0)
this->dp_cache_[index] = prop_val;
@@ -308,7 +306,6 @@ TAO_Property_Evaluator::property_value (int index
(CosTradingDynamic::DPEvalFailure (name, type, info));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (prop_val);
}
}
@@ -407,7 +404,6 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name
prop_value =
this->TAO_Property_Evaluator::property_value (index
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return prop_value;
@@ -464,11 +460,9 @@ construct_dynamic_prop (const char* name,
// Seth, we need a way to either propagate exceptions out.
ACE_DECLARE_NEW_CORBA_ENV;
- this->prop_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->prop_ = this->_this ();
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->_remove_ref ();
}
dp_struct->eval_if =
@@ -488,17 +482,14 @@ TAO_Dynamic_Property::destroy (void)
{
// @@ Seth, we need a way to propagate exceptions out.
ACE_DECLARE_NEW_CORBA_ENV;
- PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var poa = this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -627,7 +618,6 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
CORBA::TypeCode_var type = value.type ();
CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
if (!equal_ulong)
ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -643,21 +633,21 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
}
CORBA::ULong
-TAO_Policies::search_card (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::search_card (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->ulong_prop (SEARCH_CARD ACE_ENV_ARG_PARAMETER);
}
CORBA::ULong
-TAO_Policies::match_card (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::match_card (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->ulong_prop (MATCH_CARD ACE_ENV_ARG_PARAMETER);
}
CORBA::ULong
-TAO_Policies::return_card (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::return_card (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->ulong_prop (RETURN_CARD ACE_ENV_ARG_PARAMETER);
@@ -699,7 +689,6 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
CORBA::Boolean equal_boolean =
type->equal (CORBA::_tc_boolean ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
if (!equal_boolean)
ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -719,28 +708,28 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
CORBA::Boolean
-TAO_Policies::use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_modifiable_properties (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->boolean_prop (USE_MODIFIABLE_PROPERTIES ACE_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_dynamic_properties (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->boolean_prop (USE_DYNAMIC_PROPERTIES ACE_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_proxy_offers (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->boolean_prop (USE_PROXY_OFFERS ACE_ENV_ARG_PARAMETER);
}
CORBA::Boolean
-TAO_Policies::exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::exact_type_match (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->boolean_prop (EXACT_TYPE_MATCH ACE_ENV_ARG_PARAMETER);
@@ -748,7 +737,7 @@ TAO_Policies::exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
CosTrading::TraderName*
-TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::starting_trader (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
CosTrading::Lookup::InvalidPolicyValue))
{
@@ -762,11 +751,9 @@ TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
CORBA::Boolean equal_tradername =
type->equal (CosTrading::_tc_TraderName ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (trader_name);
CORBA::Boolean equal_linknameseq =
type->equal (CosTrading::_tc_LinkNameSeq ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (trader_name);
if (!equal_tradername ||
!equal_linknameseq)
@@ -780,7 +767,7 @@ TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
}
CosTrading::FollowOption
-TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::link_follow_rule (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
CosTrading::FollowOption return_value =
@@ -798,7 +785,6 @@ TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
// Extract the link follow rule
CORBA::Boolean type_equal =
type->equal (CosTrading::_tc_FollowOption ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
if (!type_equal)
ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -829,8 +815,7 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
// If not defined defaults to trader.def_link_follow_rule
CosTrading::FollowOption query_link_follow_rule =
- this->link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (return_value);
+ this->link_follow_rule ();
return_value = (query_link_follow_rule < trader_max_follow_policy)
? query_link_follow_rule : trader_max_follow_policy;
@@ -841,14 +826,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
}
CORBA::ULong
-TAO_Policies::hop_count (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::hop_count (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
return this->ulong_prop (HOP_COUNT ACE_ENV_ARG_PARAMETER);
}
CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::request_id (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
{
CosTrading::Admin::OctetSeq* request_id = 0;
@@ -861,7 +846,6 @@ TAO_Policies::request_id (ACE_ENV_SINGLE_ARG_DECL) const
CORBA::Boolean equal_octetseq =
type->equal (CosTrading::Admin::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (request_id);
if (!equal_octetseq)
ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -888,8 +872,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
if (this->policies_[LINK_FOLLOW_RULE] != 0)
{
CosTrading::FollowOption query_link_follow_rule =
- this->link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->link_follow_rule ();
follow_option = (CosTrading::FollowOption)
(link_info.limiting_follow_rule < trader_max_follow_policy
@@ -958,8 +941,7 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
// We always require a hop count.
if (i == HOP_COUNT)
{
- CORBA::ULong count = this->hop_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULong count = this->hop_count ();
new_policy.name = POLICY_NAMES[HOP_COUNT];
new_policy.value <<= count - 1;
@@ -1192,7 +1174,6 @@ merge_properties (const CosTrading::PropertySeq& modifies
CORBA::Boolean td_equal =
type_def->equal (prop_type.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!td_equal)
ACE_THROW (CosTrading::PropertyTypeMismatch (mname, modifies[i]));
@@ -1268,24 +1249,18 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
ACE_ENV_ARG_DECL)
{
- search_card_ = policies.search_card (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ search_card_ = policies.search_card ();
- match_card_ = policies.match_card (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ match_card_ = policies.match_card ();
- return_card_ = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ return_card_ = policies.return_card ();
- dp_ = policies.use_dynamic_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ dp_ = policies.use_dynamic_properties ();
- mod_ = policies.use_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ mod_ = policies.use_modifiable_properties ();
CORBA::Boolean exact_type_match =
- policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ policies.exact_type_match ();
if (exact_type_match == 1)
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 70b5717dde7..e9beaec6ab3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -285,7 +285,7 @@ public:
~TAO_Policies (void);
- CORBA::ULong search_card (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::ULong search_card (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -297,7 +297,7 @@ public:
// trader's def_search_card attribute is used.
// END SPEC
- CORBA::ULong match_card (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::ULong match_card (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -309,7 +309,7 @@ public:
// attribute is used.
// END SPEC
- CORBA::ULong return_card (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::ULong return_card (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -323,7 +323,7 @@ public:
// = Offer consideration policies
- CORBA::Boolean use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::Boolean use_modifiable_properties (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -336,7 +336,7 @@ public:
// included.
// END SPEC
- CORBA::Boolean use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::Boolean use_dynamic_properties (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -349,7 +349,7 @@ public:
// included.
// END SPEC
- CORBA::Boolean use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::Boolean use_proxy_offers (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -361,7 +361,7 @@ public:
// specified, such offers will be included.
// END SPEC
- CORBA::Boolean exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::Boolean exact_type_match (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -390,12 +390,12 @@ public:
* "starting_trader" policy with the first component removed.
* END SPEC
*/
- CosTrading::TraderName* starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
+ CosTrading::TraderName* starting_trader (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
CosTrading::Lookup::InvalidPolicyValue));
/// Determine the link follow policy for this query overall.
- CosTrading::FollowOption link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
+ CosTrading::FollowOption link_follow_rule (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -422,7 +422,7 @@ public:
CosTrading::Link::IllegalLinkName,
CosTrading::Link::UnknownLinkName));
- CORBA::ULong hop_count (ACE_ENV_SINGLE_ARG_DECL) const
+ CORBA::ULong hop_count (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
// BEGIN SPEC
@@ -439,7 +439,7 @@ public:
/// Return the request_id passed to the query method across a link to
/// another trader.
- CosTrading::Admin::OctetSeq* request_id (ACE_ENV_SINGLE_ARG_DECL) const
+ CosTrading::Admin::OctetSeq* request_id (void) const
ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
/// Policies to forward to the next trader in a federated query.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index a4f3bfd4e5d..aa452de16c3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -90,7 +90,6 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[])
this->orb_manager_.init (command_line.get_argc(),
command_line.get_ASCII_argv()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
this->orb_manager_.orb ();
@@ -98,7 +97,6 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[])
// Initializes and sets up the Trading Service
CORBA::Object_var object =
this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -123,8 +121,7 @@ TAO_Trading_Loader::fini (void)
trd_comp.link_if ();
CosTrading::LinkNameSeq_var link_name_seq =
- our_link->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ our_link->list_links ();
ACE_DEBUG ((LM_DEBUG,
"*** Unlinking from federated traders.\n"));
@@ -141,14 +138,12 @@ TAO_Trading_Loader::fini (void)
CosTrading::Link::LinkInfo_var link_info =
our_link->describe_link (link_name_seq[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"*** Removing link to %s.\n",
static_cast<const char *> (link_name_seq[i])));
our_link->remove_link (link_name_seq[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTrading::Lookup_ptr remote_lookup;
remote_lookup =
@@ -157,8 +152,7 @@ TAO_Trading_Loader::fini (void)
ACE_DEBUG ((LM_DEBUG,
"*** Retrieving its link interface.\n"));
CosTrading::Link_var remote_link =
- remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ remote_lookup->link_if ();
ACE_DEBUG ((LM_DEBUG,
"*** Removing its link to us.\n"));
@@ -167,13 +161,11 @@ TAO_Trading_Loader::fini (void)
{
remote_link->remove_link ("Bootstrap"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
remote_link->remove_link (this->name_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -188,11 +180,10 @@ TAO_Trading_Loader::fini (void)
}
int
-TAO_Trading_Loader::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Trading_Loader::run (void)
{
int return_value =
- this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_manager_.run ();
return return_value;
}
@@ -208,8 +199,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
// Activating the poa manager
- this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ this->orb_manager_.activate_poa_manager ();
// Create a Trader Object and set its Service Type Repository.
auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
@@ -222,8 +212,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
TAO_Trading_Components_i &trd_comp =
this->trader_->trading_components ();
- sup_attr.type_repos (this->type_repos_._this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ sup_attr.type_repos (this->type_repos_._this ());
// The Spec says: return a reference to the Lookup interface from
// the resolve_initial_references method.
@@ -233,7 +222,6 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
this->ior_ =
orb->object_to_string (lookup
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
// Parse the args
if (this->parse_args (argc, argv) == -1)
@@ -250,21 +238,18 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
CORBA::Object_var table_object =
orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (CORBA::is_nil (adapter.in ()))
{
ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
- }
+ }
else
{
adapter->bind ("TradingService",
this->ior_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
if (this->federate_)
@@ -274,8 +259,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
// @@ Could do other things. For example, every timeout
// period try to federate again, but let's not hardcode that
// policy.
- int rc = this->bootstrap_to_federation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ int rc = this->bootstrap_to_federation ();
if (rc == -1)
this->init_multicast_server ();
@@ -287,7 +271,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
}
int
-TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Trading_Loader::bootstrap_to_federation (void)
{
// If all traders follow this strategy, it creates a complete graph
// of all known traders on a multicast network.
@@ -298,7 +282,6 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
"*** Bootstrapping to another Trading Service.\n"));
CORBA::Object_var trading_obj =
orb->resolve_initial_references ("TradingService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (trading_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -311,13 +294,11 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::Lookup_var lookup_if =
CosTrading::Lookup::_narrow (trading_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"*** Obtaining the link interface.\n"));
CosTrading::Link_var link_if =
- lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ lookup_if->link_if ();
TAO_Trading_Components_i &trd_comp =
this->trader_->trading_components ();
@@ -333,7 +314,6 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::always,
CosTrading::always
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"*** Linking self to found trader.\n"));
@@ -342,13 +322,11 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::always,
CosTrading::always
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"*** Retrieving list of known linked traders.\n"));
CosTrading::LinkNameSeq_var link_name_seq =
- link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ link_if->list_links ();
ACE_DEBUG ((LM_DEBUG,
"*** Linking self to all linked traders.\n"));
@@ -366,7 +344,6 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::Link::LinkInfo_var link_info =
link_if->describe_link (link_name_seq[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosTrading::Lookup_ptr remote_lookup;
remote_lookup = link_info->target.in ();
@@ -374,8 +351,7 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG,
"*** Retrieving its link interface.\n"));
CosTrading::Link_var remote_link =
- remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ remote_lookup->link_if ();
ACE_DEBUG ((LM_DEBUG,
"*** Creating a link to me from it.\n"));
@@ -384,7 +360,6 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::always,
CosTrading::always
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"*** Creating a link to it from me.\n"));
@@ -393,7 +368,6 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::always,
CosTrading::always
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 3b344cd9333..9a14bb345cd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -49,7 +49,7 @@ public:
// Called by the Service Configurator framework to remove the
// Event Service. Defined in <ace/Service_Config.h>
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the Trading Service
CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
@@ -66,7 +66,7 @@ protected:
// Enable the Trading Service to answer multicast requests for its
// IOR.
- int bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL);
+ int bootstrap_to_federation (void);
// Bootstrap to another trader, and attach to its trader network.
int parse_args (int &argc, ACE_TCHAR *argv []);
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index a7d70ac5c85..a8c5085b91a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -37,14 +37,12 @@ ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
reject_interceptor;
info->add_server_request_interceptor (safe_reject_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index 004cd30266a..c9ee46f95bc 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -40,7 +40,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
}
void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index 6cd4e89a956..3ef3babc13a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -27,7 +27,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index b68487ba367..b9d71afb69a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -73,7 +73,7 @@ parse_args (int argc, char *argv[])
int
main (int argc, char *argv[])
{
-
+
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+ ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -98,18 +98,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Roundtrip_var roundtrip =
Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (roundtrip.in ()))
{
@@ -123,7 +120,6 @@ main (int argc, char *argv[])
{
ACE_hrtime_t start = 0;
(void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_Sample_History history (niterations);
@@ -149,7 +145,6 @@ main (int argc, char *argv[])
(void) roundtrip->test_method (start, number
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
@@ -179,8 +174,7 @@ main (int argc, char *argv[])
if (do_shutdown)
{
- roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ roundtrip->shutdown ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index ed3756bffbe..cbfdc4b9066 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -78,12 +78,10 @@ join_object_group (CORBA::ORB_ptr orb,
CORBA::Object_var ns_object =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CosNaming::NamingContext_var nc =
CosNaming::NamingContext::_narrow (ns_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CosNaming::Name name (1);
name.length (1);
@@ -97,7 +95,6 @@ join_object_group (CORBA::ORB_ptr orb,
{
group = nc->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
{
@@ -123,7 +120,6 @@ join_object_group (CORBA::ORB_ptr orb,
criteria,
fcid.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (foo)
{
@@ -194,7 +190,6 @@ join_object_group (CORBA::ORB_ptr orb,
lm->set_default_properties (props
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
{
@@ -209,28 +204,23 @@ join_object_group (CORBA::ORB_ptr orb,
ACE_TRY_CHECK_EX (foo);
}
ACE_ENDTRY;
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
Roundtrip * roundtrip_impl;
ACE_NEW_THROW_EX (roundtrip_impl,
Roundtrip (orb),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableServer::ServantBase_var owner_transfer (roundtrip_impl);
Test::Roundtrip_var roundtrip =
- roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ roundtrip_impl->_this ();
group = lm->add_member (group.in (),
location,
roundtrip.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return group._retn ();
}
@@ -238,7 +228,7 @@ join_object_group (CORBA::ORB_ptr orb,
int
main (int argc, char *argv[])
{
-
+
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+ ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -261,7 +251,7 @@ main (int argc, char *argv[])
"server (%P|%t): sched_params failed\n"));
}
-
+
ACE_TRY_NEW_ENV
{
@@ -274,17 +264,14 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -294,60 +281,49 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var lm_object =
orb->resolve_initial_references ("LoadManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_var load_manager =
CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_LB_CPU_Utilization_Monitor * monitor_servant;
ACE_NEW_THROW_EX (monitor_servant,
TAO_LB_CPU_Utilization_Monitor,
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
PortableServer::ServantBase_var safe_monitor_servant (monitor_servant);
CosLoadBalancing::LoadMonitor_var load_monitor =
- monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ monitor_servant->_this ();
PortableGroup::Location_var location =
- load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ load_monitor->the_location ();
CORBA::Object_var roundtrip =
::join_object_group (orb.in (),
load_manager.in (),
location.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
CosLoadBalancing::LoadAlert_var load_alert =
- alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ alert_servant._this ();
CORBA::String_var ior =
orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -362,23 +338,18 @@ main (int argc, char *argv[])
load_manager->register_load_monitor (location.in (),
load_monitor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
load_manager->register_load_alert (location.in (),
load_alert.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 6ebd0450558..b421b7feb6a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -37,14 +37,12 @@ ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var sr_interceptor =
this->interceptor_;
info->add_server_request_interceptor (sr_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
ACE_NEW_THROW_EX (reject_interceptor,
@@ -54,14 +52,12 @@ ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
reject_interceptor;
info->add_server_request_interceptor (safe_reject_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 1a640f3cbf7..a9ea95abd62 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -30,7 +30,7 @@ RPS_Monitor::~RPS_Monitor (void)
}
CosLoadBalancing::Location *
-RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::the_location (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosLoadBalancing::Location * location;
@@ -41,13 +41,12 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
return location;
}
CosLoadBalancing::LoadList *
-RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::loads (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
@@ -72,7 +71,6 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
CosLoadBalancing::LoadList_var load_list = tmp;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 9a6a6ccd10e..dceba1eea0f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -17,7 +17,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
Test::Timestamp
Roundtrip::test_method (Test::Timestamp send_time,
- Test::number cl_number
+ Test::number cl_number
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -34,7 +34,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
}
void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index 6cd4e89a956..3ef3babc13a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -27,7 +27,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index bba0ca52470..2f8d5ab91cb 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -14,14 +14,14 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void)
}
char *
-ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("ServerRequestInterceptor");
}
void
-ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index 1e85d70efd2..6e350ceb444 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -60,10 +60,10 @@ public:
* ServerRequestInterceptors.
*/
//@{
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index 94221caa7bd..abd035a418e 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -98,18 +98,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Roundtrip_var roundtrip =
Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (roundtrip.in ()))
{
@@ -122,7 +119,6 @@ main (int argc, char *argv[])
{
ACE_hrtime_t start = 0;
(void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_Sample_History history (niterations);
@@ -148,7 +144,6 @@ main (int argc, char *argv[])
(void) roundtrip->test_method (start, number
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
@@ -178,8 +173,7 @@ main (int argc, char *argv[])
if (do_shutdown)
{
- roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ roundtrip->shutdown ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index f6ce3d00373..ba8896407be 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -81,12 +81,10 @@ join_object_group (CORBA::ORB_ptr orb,
CORBA::Object_var ns_object =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CosNaming::NamingContext_var nc =
CosNaming::NamingContext::_narrow (ns_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CosNaming::Name name (1);
name.length (1);
@@ -100,7 +98,6 @@ join_object_group (CORBA::ORB_ptr orb,
{
group = nc->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
{
@@ -126,7 +123,6 @@ join_object_group (CORBA::ORB_ptr orb,
criteria,
fcid.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_TRY_EX (foo)
{
@@ -197,7 +193,6 @@ join_object_group (CORBA::ORB_ptr orb,
lm->set_default_properties (props
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
{
@@ -212,28 +207,23 @@ join_object_group (CORBA::ORB_ptr orb,
ACE_TRY_CHECK_EX (foo);
}
ACE_ENDTRY;
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
Roundtrip * roundtrip_impl;
ACE_NEW_THROW_EX (roundtrip_impl,
Roundtrip (orb),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableServer::ServantBase_var owner_transfer (roundtrip_impl);
Test::Roundtrip_var roundtrip =
- roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ roundtrip_impl->_this ();
group = lm->add_member (group.in (),
location,
roundtrip.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return group._retn ();
}
@@ -274,17 +264,14 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -294,61 +281,50 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var lm_object =
orb->resolve_initial_references ("LoadManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_var load_manager =
CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RPS_Monitor * monitor_servant;
ACE_NEW_THROW_EX (monitor_servant,
RPS_Monitor (initializer->interceptor ()),
CORBA::NO_MEMORY ());
- ACE_TRY_CHECK;
PortableServer::ServantBase_var safe_monitor_servant (monitor_servant);
CosLoadBalancing::LoadMonitor_var load_monitor =
- monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ monitor_servant->_this ();
PortableGroup::Location_var location =
- load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ load_monitor->the_location ();
CORBA::Object_var roundtrip =
::join_object_group (orb.in (),
load_manager.in (),
location.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
CosLoadBalancing::LoadAlert_var load_alert =
- alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ alert_servant._this ();
CORBA::String_var ior =
orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -363,23 +339,18 @@ main (int argc, char *argv[])
load_manager->register_load_monitor (location.in (),
load_monitor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
load_manager->register_load_alert (location.in (),
load_alert.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 280e7ba2efa..cd50b2cd388 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -45,7 +45,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Client_Options options (argc, argv);
if (argc != 1)
@@ -71,20 +70,16 @@ int main (int argc, char *argv[])
rt_class,
1 // options.nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var ec_poa (rtserver_setup.poa ());
@@ -105,24 +100,19 @@ int main (int argc, char *argv[])
rtserver_setup.rtcorba_setup ()
ACE_ENV_ARG_PARAMETER)
);
- ACE_TRY_CHECK;
- ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl->activate ();
PortableServer::ObjectId_var ec_id =
ec_poa->activate_object (ec_impl.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var ec_object =
ec_poa->id_to_reference (ec_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
EC_Destroyer ec_destroyer (ec.in ());
@@ -163,7 +153,6 @@ int main (int argc, char *argv[])
{
high_priority_group.connect (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
high_priority_disconnect = &high_priority_group;
}
@@ -193,7 +182,6 @@ int main (int argc, char *argv[])
{
high_priority_group.connect (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
high_priority_disconnect = &high_priority_group;
}
Send_Task high_priority_task;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 8720b8bb599..2c2c4b42538 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -137,7 +137,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -147,20 +146,16 @@ int main (int argc, char *argv[])
rt_class,
nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
@@ -170,29 +165,23 @@ int main (int argc, char *argv[])
rt_class
ACE_ENV_ARG_PARAMETER)
);
- ACE_TRY_CHECK;
Federated_Test::Peer_var peer =
- peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ peer_impl->_this ();
ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n"));
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Federated_Test::Control_var control =
Federated_Test::Control::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
control->join (peer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
@@ -243,7 +232,6 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
this->event_channel_.in (),
&the_barrier
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
#endif
Client_Pair high_priority_group;
@@ -256,7 +244,6 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
this->poa_.in ());
high_priority_group.connect (this->event_channel_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
Auto_Disconnect<Client_Pair> high_priority_disconnect (&high_priority_group);
Send_Task high_priority_task;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 677cf6870f5..5e8e6e8f462 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -84,7 +84,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -94,20 +93,16 @@ int main (int argc, char *argv[])
rt_class,
nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var control_poa (rtserver_setup.poa ());
Servant_var<Control> control_impl (
@@ -119,12 +114,10 @@ int main (int argc, char *argv[])
);
Federated_Test::Control_var control =
- control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ control_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (control.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the ior to the <ior_output_file>
FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -136,11 +129,9 @@ int main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index d4ef62e9781..0a3e935184a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -4,8 +4,8 @@
#include "Roundtrip.h"
#include "ace/High_Res_Timer.h"
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline,
- Roundtrip,
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline,
+ Roundtrip,
"$Id$")
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
@@ -22,7 +22,7 @@ Roundtrip::test_method (Test::Timestamp send_time,
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
CORBA::Long elapsed = 0;
-
+
while (elapsed < workload_in_usecs)
{
elapsed =
@@ -30,12 +30,12 @@ Roundtrip::test_method (Test::Timestamp send_time,
(ACE_OS::gethrtime () - start) / this->gsf_
);
}
-
+
return send_time;
}
void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index a4b01ce89b1..9f6947e047e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -22,7 +22,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index a3caafe3b54..8a6664016af 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -34,7 +34,7 @@ public:
{
}
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void run_test (void) = 0;
virtual int svc (void)
{
@@ -42,8 +42,7 @@ public:
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run_test ();
}
ACE_CATCHANY
{
@@ -76,7 +75,7 @@ public:
{
}
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void run_test (void)
{
for (int i = 0; i != this->iterations_; ++i)
{
@@ -88,7 +87,6 @@ public:
(void) this->roundtrip_->test_method (start,
this->workload_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start;
this->sample_history.sample (elapsed);
@@ -128,7 +126,7 @@ public:
this->stopped_ = 1;
}
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void run_test (void)
{
for (;;)
{
@@ -146,7 +144,6 @@ public:
(void) this->roundtrip_->test_method (dummy,
this->workload_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
} ACE_CATCHANY {
} ACE_ENDTRY;
@@ -171,7 +168,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Client_Options options (argc, argv);
if (argc != 1)
@@ -197,23 +193,19 @@ int main (int argc, char *argv[])
rt_class,
options.nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
CORBA::Object_var object =
orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Roundtrip_var roundtrip =
Test::Roundtrip::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::PolicyList_var inconsistent_policies;
(void) roundtrip->_validate_connection (inconsistent_policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int thread_count = 1 + options.nthreads;
ACE_Barrier the_barrier (thread_count);
@@ -263,8 +255,7 @@ int main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n"));
- roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ roundtrip->shutdown ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index f82199ba24e..01059c47fcc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -67,7 +67,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -77,20 +76,16 @@ int main (int argc, char *argv[])
rt_class,
nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var the_poa (rtserver_setup.poa ());
@@ -99,16 +94,13 @@ int main (int argc, char *argv[])
PortableServer::ObjectId_var id =
the_poa->activate_object (roundtrip.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
the_poa->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the ior to the <ior_output_file>
FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -120,8 +112,7 @@ int main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 134dc30f9b3..4a4350c98c0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -5,8 +5,8 @@
#include "Implicit_Deactivator.h"
#include "ace/OS_NS_time.h"
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
- Callback,
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+ Callback,
"$Id$")
Callback::Callback (int iterations,
@@ -36,7 +36,7 @@ Callback::sample (Test::Timestamp the_timestamp
}
PortableServer::POA_ptr
-Callback::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Callback::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
index 520895f1cab..6e1e0a33af5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
@@ -40,7 +40,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index 5c7627717eb..7e320974dcb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -4,8 +4,8 @@
#include "Session.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
- Session,
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+ Session,
"$Id$")
Session::Session (Test::Callback_ptr cb,
@@ -25,7 +25,7 @@ Session::sample (Test::Timestamp the_timestamp
}
void
-Session::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Session::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
Implicit_Deactivator deactivator (this
@@ -33,7 +33,7 @@ Session::shutdown (ACE_ENV_SINGLE_ARG_DECL)
}
PortableServer::POA_ptr
-Session::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Session::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index 65d8f4b6507..2b00c6ce028 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -22,10 +22,10 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index 735a8d0ec84..02df9d17977 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -5,8 +5,8 @@
#include "Session.h"
#include "Servant_var.h"
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
- Session_Factory,
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+ Session_Factory,
"$Id$")
Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
@@ -24,18 +24,18 @@ Session_Factory::create_new_session (Test::Callback_ptr cb
Servant_var<Session> session_impl (new Session (cb,
this->poa_.in ()));
- return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return session_impl->_this ();
}
void
-Session_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Session_Factory::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
PortableServer::POA_ptr
-Session_Factory::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Session_Factory::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index 875535d6b93..336f28af5e2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -22,10 +22,10 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 420b6d15b95..053b5a3fb0b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -40,7 +40,7 @@ public:
{
}
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void run_test (void) = 0;
virtual int svc (void)
{
@@ -48,8 +48,7 @@ public:
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run_test ();
}
ACE_CATCHANY
{
@@ -81,18 +80,16 @@ public:
{
}
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void run_test (void)
{
Test::Callback_var cb =
- callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ callback->_this ();
Implicit_Deactivator deactivator (callback);
Test::Session_var session =
this->session_factory_->create_new_session (cb.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
@@ -112,7 +109,6 @@ public:
ACE_hrtime_t start = ACE_OS::gethrtime ();
(void) session->sample (start
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
} ACE_CATCHANY {
} ACE_ENDTRY;
}
@@ -146,18 +142,16 @@ public:
this->stopped_ = 1;
}
- virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void run_test (void)
{
Test::Callback_var cb =
- callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ callback->_this ();
Implicit_Deactivator deactivator (callback);
Test::Session_var session =
this->session_factory_->create_new_session (cb.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
@@ -176,7 +170,6 @@ public:
CORBA::ULongLong dummy = 0;
(void) session->sample (dummy
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
} ACE_CATCHANY {
} ACE_ENDTRY;
@@ -202,7 +195,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Client_Options options (argc, argv);
if (argc != 1)
@@ -228,20 +220,16 @@ int main (int argc, char *argv[])
rt_class,
options.nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var the_poa (rtserver_setup.poa ());
@@ -255,17 +243,14 @@ int main (int argc, char *argv[])
CORBA::Object_var object =
orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Session_Factory_var session_factory =
Test::Session_Factory::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::PolicyList_var inconsistent_policies;
(void) session_factory->_validate_connection (inconsistent_policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int thread_count = 1 + options.nthreads;
ACE_Barrier the_barrier (thread_count);
@@ -318,8 +303,7 @@ int main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n"));
- session_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ session_factory->shutdown ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index 59d0eb001d2..c4c38a88f3c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -70,7 +70,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -80,20 +79,16 @@ int main (int argc, char *argv[])
rt_class,
nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var the_poa (rtserver_setup.poa ());
@@ -111,12 +106,10 @@ int main (int argc, char *argv[])
);
CORBA::Object_var object =
- session_factory->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ session_factory->_this ();
CORBA::String_var ior =
orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the ior to the <ior_output_file>
FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -128,8 +121,7 @@ int main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 5e723b3cca5..5a585876a19 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -39,7 +39,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Client_Options options (argc, argv);
if (argc != 1)
@@ -65,20 +64,16 @@ int main (int argc, char *argv[])
rt_class,
1 // options.nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var the_poa (rtserver_setup.poa ());
@@ -95,19 +90,16 @@ int main (int argc, char *argv[])
CORBA::Object_var object =
orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
EC_Destroyer ec_destroyer (ec.in ());
CORBA::PolicyList_var inconsistent_policies;
(void) ec->_validate_connection (inconsistent_policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Found EC, validated connection\n"));
@@ -146,7 +138,6 @@ int main (int argc, char *argv[])
{
high_priority_group.connect (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
high_priority_disconnect = &high_priority_group;
}
@@ -176,7 +167,6 @@ int main (int argc, char *argv[])
{
high_priority_group.connect (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
high_priority_disconnect = &high_priority_group;
}
Send_Task high_priority_task;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 8c7d83af31a..77e4f6f2d5c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -74,7 +74,6 @@ int main (int argc, char *argv[])
{
ORB_Holder orb (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -84,20 +83,16 @@ int main (int argc, char *argv[])
rt_class,
nthreads
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
RIR_Narrow<PortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
PortableServer::POA_var ec_poa (rtserver_setup.poa ());
@@ -115,28 +110,22 @@ int main (int argc, char *argv[])
rtserver_setup.rtcorba_setup ()
ACE_ENV_ARG_PARAMETER)
);
- ACE_TRY_CHECK;
- ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl->activate ();
PortableServer::ObjectId_var ec_id =
ec_poa->activate_object (ec_impl.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var ec_object =
ec_poa->id_to_reference (ec_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the ior to the <ior_output_file>
FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -151,7 +140,6 @@ int main (int argc, char *argv[])
do {
ACE_Time_Value tv (1, 0);
orb->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
} while (ec_impl->destroyed () == 0);
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
index 3a09d5c68cf..e6da5c6d119 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
@@ -13,8 +13,7 @@ Disconnect<Client>::operator () (Client *client)
ACE_DECLARE_NEW_ENV;
ACE_TRY
{
- client->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client->disconnect ();
}
ACE_CATCHANY { };
ACE_ENDTRY;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 7daaf4ae6b4..5e7d3cfa0ac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -13,8 +13,8 @@
#include "Client_Group.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- Client_Group,
+ACE_RCSID (TAO_PERF_RTEC,
+ Client_Group,
"$Id$")
void
@@ -61,7 +61,6 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec
Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
loopback_pair_disconnect.release ();
@@ -69,7 +68,7 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec
}
void
-Client_Group::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Group::disconnect (void)
{
Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
index ef93ba153c1..4b0dbb68bba 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
@@ -75,7 +75,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
//@{
/** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index 9f32c911ff2..8b1439975b2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -13,8 +13,8 @@
#include "Client_Pair.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- Client_Pair,
+ACE_RCSID (TAO_PERF_RTEC,
+ Client_Pair,
"$Id$")
void
@@ -63,11 +63,9 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
ACE_ENV_ARG_DECL)
{
this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
consumer_disconnect.release ();
@@ -75,7 +73,7 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
}
void
-Client_Pair::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Pair::disconnect (void)
{
Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
index 8dc4e8b03b2..e0bc5e5f195 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
@@ -78,7 +78,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
//@{
/** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 5fc7489897e..20c01a4f80b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -11,8 +11,8 @@
#include "orbsvcs/Event_Service_Constants.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID (TAO_PERF_RTEC,
- Consumer,
+ACE_RCSID (TAO_PERF_RTEC,
+ Consumer,
"$Id$")
Consumer::Consumer (CORBA::Long experiment_id,
@@ -35,8 +35,7 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
ACE_ENV_ARG_DECL)
{
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -44,13 +43,11 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
return;
this->proxy_supplier_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
}
RtecEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
RtecEventChannelAdmin::ConsumerQOS consumer_qos;
consumer_qos.is_gateway = 0;
@@ -68,11 +65,10 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
this->proxy_supplier_->connect_push_consumer (consumer.in (),
consumer_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
{
RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
{
@@ -84,11 +80,9 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
Implicit_Deactivator deactivator (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY {
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_supplier ();
} ACE_CATCHANY {
} ACE_ENDTRY;
}
@@ -125,7 +119,7 @@ Consumer::push (const RtecEventComm::EventSet &events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -134,7 +128,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
PortableServer::POA_ptr
-Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index f9206fe4ba2..516936d79dc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -42,7 +42,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Access the history of samples
ACE_Sample_History &sample_history (void);
@@ -53,9 +53,9 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index b35d809551c..c52cf21cd5b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -18,8 +18,8 @@
#include "ace/Basic_Stats.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID (TAO_RTEC_Perf,
- Control,
+ACE_RCSID (TAO_RTEC_Perf,
+ Control,
"$Id$")
Control::Control (size_t peers_expected,
@@ -86,7 +86,6 @@ Control::join (Federated_Test::Peer_ptr peer
{
this->peers_[j]->connect (this->peers_[i].in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -122,7 +121,6 @@ Control::join (Federated_Test::Peer_ptr peer
this->peers_[j]->setup_loopback (experiment_id,
base_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_AUTO_PTR_RESET (disconnects[lcount],
new Loopback_Disconnect (
@@ -135,7 +133,6 @@ Control::join (Federated_Test::Peer_ptr peer
this->peers_[j]->setup_loopback (experiment_id,
base_event_type + 2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_AUTO_PTR_RESET (disconnects[lcount],
new Loopback_Disconnect (
@@ -150,7 +147,6 @@ Control::join (Federated_Test::Peer_ptr peer
this->peers_[i]->run_experiment (experiment_id,
this->iterations_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Sample_History history (results->length ());
for (CORBA::ULong k = 0; k != results->length (); ++k)
@@ -172,7 +168,7 @@ Control::join (Federated_Test::Peer_ptr peer
}
PortableServer::POA_ptr
-Control::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Control::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
index 9b09d063fb0..4b1428e802c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -42,7 +42,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 220c8c3957c..1142519068c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -12,8 +12,8 @@
#include "EC_Destroyer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- EC_Destroyer,
+ACE_RCSID (TAO_PERF_RTEC,
+ EC_Destroyer,
"$Id$")
EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
@@ -25,8 +25,7 @@ EC_Destroyer::~EC_Destroyer (void)
{
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY {
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_->destroy ();
} ACE_CATCH (CORBA::Exception, ex) {
// @@ TODO Log this event, check the Servant_var.cpp comments for
// details.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
index ded3aa19ae6..b559160c34a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
@@ -19,12 +19,10 @@ Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
this->poa_ =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
this->id_ =
this->poa_->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
Implicit_Deactivator::Implicit_Deactivator (Implicit_Deactivator &rhs)
@@ -54,7 +52,6 @@ Implicit_Deactivator::~Implicit_Deactivator ()
ACE_TRY {
this->poa_->deactivate_object (this->id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
} ACE_CATCHANY {
// @@ TODO This event should be logged. Cannot throw because that
// would make it impossible to use this class effectively.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index 41c08b2a882..04c666bc7c5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -30,11 +30,10 @@ Loopback::Loopback (CORBA::Long experiment_id,
}
void
-Loopback::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback::disconnect (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
index 384c42cd3cb..05919f2145d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -36,7 +36,7 @@ public:
//@{
/** @name The Federated_Test::Loopback methods
*/
- virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 2c3d1f8084e..c5ec117f31f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -10,8 +10,8 @@
#include "Implicit_Deactivator.h"
#include "orbsvcs/Event_Service_Constants.h"
-ACE_RCSID (PERF_RTEC,
- Loopback_Consumer,
+ACE_RCSID (PERF_RTEC,
+ Loopback_Consumer,
"$Id$")
Loopback_Consumer::
@@ -31,8 +31,7 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
ACE_ENV_ARG_DECL)
{
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -40,13 +39,11 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
return;
this->proxy_supplier_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
}
RtecEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
RtecEventChannelAdmin::ConsumerQOS consumer_qos;
consumer_qos.is_gateway = 0;
@@ -64,11 +61,10 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
this->proxy_supplier_->connect_push_consumer (consumer.in (),
consumer_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback_Consumer::disconnect (void)
{
RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
{
@@ -80,12 +76,10 @@ Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
Implicit_Deactivator deactivator (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY
{
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_supplier ();
}
ACE_CATCHANY {} ACE_ENDTRY;
}
@@ -100,7 +94,7 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events
}
void
-Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -109,7 +103,7 @@ Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
PortableServer::POA_ptr
-Loopback_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Consumer::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index 4ff3203146c..d35c8e79453 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -39,7 +39,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
//@{
/** @name The RtecEventComm::PushConsumer methods
@@ -47,9 +47,9 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index 5a0c80aed0c..a68ac6883ce 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -13,8 +13,8 @@
#include "Loopback_Pair.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- Loopback_Pair,
+ACE_RCSID (TAO_PERF_RTEC,
+ Loopback_Pair,
"$Id$")
void
@@ -37,11 +37,9 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
ACE_ENV_ARG_DECL)
{
this->loopback_supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
this->loopback_consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
loopback_consumer_disconnect.release ();
@@ -49,7 +47,7 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
}
void
-Loopback_Pair::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Pair::disconnect (void)
{
Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
index d70b8bfd9a4..ba586aa44c9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
@@ -57,7 +57,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
//@{
/** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index 1e516958c44..b16ae72c2a5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -9,8 +9,8 @@
#include "Loopback_Supplier.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID (TAO_PERF_RTEC,
- Loopback_Supplier,
+ACE_RCSID (TAO_PERF_RTEC,
+ Loopback_Supplier,
"$Id$")
Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
@@ -28,8 +28,7 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
ACE_ENV_ARG_DECL)
{
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_suppliers ();
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -37,13 +36,11 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
return;
this->proxy_consumer_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
}
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
RtecEventChannelAdmin::SupplierQOS supplier_qos;
supplier_qos.is_gateway = 0;
@@ -56,11 +53,10 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
this->proxy_consumer_->connect_push_supplier (supplier.in (),
supplier_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback_Supplier::disconnect (void)
{
RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
{
@@ -72,11 +68,9 @@ Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
Implicit_Deactivator deactivator (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY {
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
} ACE_CATCHANY {
} ACE_ENDTRY;
}
@@ -118,7 +112,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source
}
void
-Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -127,7 +121,7 @@ Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
PortableServer::POA_ptr
-Loopback_Supplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Supplier::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 24f2055cf04..3611bf805ba 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -41,7 +41,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
void push (const RtecEventComm::EventSet &events
ACE_ENV_ARG_DECL_NOT_USED)
@@ -50,9 +50,9 @@ public:
//@{
/** @name The RtecEventComm::PushSupplier methods
*/
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
index 36154df9fcd..234764d7780 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
@@ -59,7 +59,6 @@ Low_Priority_Setup (int consumer_count,
consumer_poa);
this->clients_[i].connect (ec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Automatically disconnect the group if the connection was
// successful
this->disconnect_[i] = &this->clients_[i];
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index a2ee9263b1f..1c546280710 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -12,8 +12,8 @@
#include "ORB_Holder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- ORB_Holder,
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Holder,
"$Id$")
ORB_Holder::ORB_Holder (int &argc, char *argv[],
@@ -28,8 +28,7 @@ ORB_Holder::~ORB_Holder (void)
{
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY {
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
} ACE_CATCH (CORBA::Exception, ex) {
// @@ TODO Log this event, check the Servant_var.cpp comments for
// details.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
index 13fbb623600..50b1d374110 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
@@ -16,7 +16,6 @@ ORB_Shutdown::operator () (CORBA::ORB_ptr orb)
{
orb->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY { };
ACE_ENDTRY;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 369d7f358fa..ce73357a916 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -27,8 +27,7 @@ ORB_Task::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index 42bc3fb5676..5eb74cd2775 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -23,7 +23,6 @@ ORB_Task_Activator::~ORB_Task_Activator (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY {
(*this->task_)->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
} ACE_CATCHANY {
} ACE_ENDTRY;
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 2b0a05a1eee..aa7265da3ff 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -34,24 +34,19 @@ Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
rtserver_setup.rtcorba_setup ()
ACE_ENV_ARG_PARAMETER)
);
- ACE_CHECK;
- ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl->activate ();
PortableServer::ObjectId_var ec_id =
this->poa_->activate_object (ec_impl.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var ec_object =
this->poa_->id_to_reference (ec_id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_channel_ =
RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
Peer_Base::~Peer_Base (void)
@@ -59,7 +54,7 @@ Peer_Base::~Peer_Base (void)
}
void
-Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Peer_Base::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
{
@@ -72,7 +67,7 @@ Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Object_ptr
-Peer_Base::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Base::channel (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::Object::_duplicate (this->event_channel_.in ());
@@ -85,28 +80,23 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer
{
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
CORBA::Object_var remote_ec_object =
- remote_peer->channel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ remote_peer->channel ();
RtecEventChannelAdmin::EventChannel_var remote_ec =
RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
gateway->init (remote_ec.in (),
this->event_channel_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RtecEventChannelAdmin::Observer_var observer =
- gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ gateway->_this ();
RtecEventChannelAdmin::Observer_Handle h =
this->event_channel_->append_observer (observer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
gateway->observer_handle (h);
}
@@ -124,13 +114,11 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
this->poa_.in (),
this->event_channel_.in ()
ACE_ENV_ARG_PARAMETER));
- ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ());
Auto_Disconnect<Loopback> disconnect (loopback);
Federated_Test::Loopback_var lb =
- loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ());
+ loopback->_this ();
disconnect.release ();
@@ -138,7 +126,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
}
PortableServer::POA_ptr
-Peer_Base::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Base::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 948ef5b20a1..bc81d6c255a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -41,11 +41,11 @@ public:
//@{
/** @name The Federated_Test::Peer methods
*/
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Object_ptr
- channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ channel (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void connect (Federated_Test::Peer_ptr remote_peer
@@ -57,7 +57,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index bbb980bde7b..196ab2d93ac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -14,8 +14,8 @@
#include "PriorityBand_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- PriorityBand_Setup,
+ACE_RCSID (TAO_PERF_RTEC,
+ PriorityBand_Setup,
"$Id$")
PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
@@ -26,13 +26,11 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
RIR_Narrow<CORBA::PolicyManager>::resolve (orb,
"ORBPolicyManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::RTORB_var rtorb =
RIR_Narrow<RTCORBA::RTORB>::resolve (orb,
"RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes ();
@@ -48,14 +46,11 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
policy_list[0] =
rtorb->create_priority_banded_connection_policy (priority_bands
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policy_manager->set_policy_overrides (policy_list,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ policy_list[0]->destroy ();
}
PriorityBand_Setup::~PriorityBand_Setup (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index ba719129de4..57a0f32e6ff 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -27,10 +27,8 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
CORBA::Object_var object =
orb->resolve_initial_references (object_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
interface = Interface::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (interface.in ()))
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
index b5c6d99ae37..4b08ed77d4c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
@@ -16,8 +16,8 @@
#include "RTCORBA_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- RTCORBA_Setup,
+ACE_RCSID (TAO_PERF_RTEC,
+ RTCORBA_Setup,
"$Id$")
RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
@@ -30,7 +30,6 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
RIR_Narrow<RTCORBA::PriorityMappingManager>::resolve (orb,
"PriorityMappingManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->priority_mapping_ =
this->priority_mapping_manager_->mapping ();
@@ -39,7 +38,6 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
RIR_Narrow<RTCORBA::Current>::resolve (orb,
"RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::Priority corba_prc_priority;
this->priority_mapping_->to_CORBA (rtclass.priority_process (),
@@ -47,22 +45,18 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
current->the_priority (corba_prc_priority
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->lanes_.length (3);
this->setup_lane (rtclass.priority_high (),
this->lanes_[0]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->setup_lane (rtclass.priority_process (),
this->lanes_[1]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->setup_lane (rtclass.priority_low (),
this->lanes_[2]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->lanes_[2].static_threads = nthreads;
this->process_priority_ = this->lanes_[1].lane_priority;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index 6e3d06125f6..e67964e0482 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -16,8 +16,8 @@
#include "RTClient_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- RTClient_Setup,
+ACE_RCSID (TAO_PERF_RTEC,
+ RTClient_Setup,
"$Id$")
RTClient_Setup::RTClient_Setup (int use_rt_corba,
@@ -28,7 +28,6 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba,
: use_rt_corba_ (use_rt_corba)
, syncscope_setup_ (orb ACE_ENV_ARG_PARAMETER)
{
- ACE_CHECK;
if (use_rt_corba)
{
@@ -39,7 +38,6 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba,
ACE_ENV_ARG_PARAMETER),
RTCORBA_Setup
);
- ACE_CHECK;
#if 0
ACE_AUTO_PTR_RESET (this->priorityband_setup_,
@@ -48,8 +46,7 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba,
ACE_ENV_ARG_PARAMETER),
PriorityBand_Setup
);
- ACE_CHECK;
-
+
#endif /* 0 */
}
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index fdaaee06d30..da8163160b6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -17,8 +17,8 @@
#include "RTPOA_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- RTPOA_Setup,
+ACE_RCSID (TAO_PERF_RTEC,
+ RTPOA_Setup,
"$Id$")
RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
@@ -29,13 +29,11 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
RIR_Narrow<RTPortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::RTORB_var rtorb =
RIR_Narrow<RTCORBA::RTORB>::resolve (orb,
"RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const CORBA::ULong stacksize = 1024 * 1024; // 1 Mb
const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes ();
@@ -52,7 +50,6 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
max_buffered_requests,
max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ We need an 'auto_ptr for thread pools' here!
CORBA::PolicyList policies (4); policies.length (4);
@@ -60,17 +57,14 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
rtcorba_setup.process_priority ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policies[1] =
root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policies[2] =
root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#if 0
policies.length (3);
@@ -78,23 +72,19 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
policies[3] =
rtorb->create_threadpool_policy (pool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
#endif /* 0 */
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa->the_POAManager ();
this->poa_ =
root_poa->create_POA ("RTEC_Perf",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
for (CORBA::ULong i = 0; i != policies.length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ policies[i]->destroy ();
}
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index 609f8f7b314..0bd232c2feb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -16,8 +16,8 @@
#include "RTServer_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (TAO_PERF_RTEC,
- RTServer_Setup,
+ACE_RCSID (TAO_PERF_RTEC,
+ RTServer_Setup,
"$Id$")
RTServer_Setup::RTServer_Setup (int use_rt_corba,
@@ -31,7 +31,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
nthreads
ACE_ENV_ARG_PARAMETER)
{
- ACE_CHECK;
if (use_rt_corba)
{
@@ -41,7 +40,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
ACE_ENV_ARG_PARAMETER),
RTPOA_Setup
);
- ACE_CHECK;
this->poa_ =
this->rtpoa_setup_->poa ();
@@ -52,6 +50,5 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
RIR_Narrow<RTPortableServer::POA>::resolve (orb,
"RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 125e75c85e7..5c294a3bdb7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -115,7 +115,6 @@ Send_Task::svc (void)
{
// push one event...
this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
index 7e154ad088b..0f5f58f6cd6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
@@ -24,8 +24,7 @@ Servant_var<SERVANT>::~Servant_var ()
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY {
- this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ptr_->_remove_ref ();
} ACE_CATCHANY {
// @@ TODO This event should be logged. Cannot throw because that
// would make it impossible to use this class effectively.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
index aa5af0895cb..45b3b310c67 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
@@ -12,8 +12,7 @@ Shutdown<Client>::operator () (Client *client)
ACE_DECLARE_NEW_ENV;
ACE_TRY
{
- client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client->shutdown ();
}
ACE_CATCHANY { };
ACE_ENDTRY;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 11c14e80232..1964145efac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -9,8 +9,8 @@
#include "Supplier.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID (TAO_PERF_RTEC,
- Supplier,
+ACE_RCSID (TAO_PERF_RTEC,
+ Supplier,
"$Id$")
Supplier::Supplier (CORBA::Long experiment_id,
@@ -29,8 +29,7 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
ACE_ENV_ARG_DECL)
{
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_suppliers ();
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -38,13 +37,11 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
return;
this->proxy_consumer_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
}
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
RtecEventChannelAdmin::SupplierQOS supplier_qos;
supplier_qos.is_gateway = 0;
@@ -60,11 +57,10 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
this->proxy_consumer_->connect_push_supplier (supplier.in (),
supplier_qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
{
RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
{
@@ -76,12 +72,10 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
Implicit_Deactivator deactivator (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TRY
{
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
}
ACE_CATCHANY {} ACE_ENDTRY;
}
@@ -105,7 +99,7 @@ Supplier::push (const RtecEventComm::EventSet &events
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -114,7 +108,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
PortableServer::POA_ptr
-Supplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::_default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index 4ae8d76a414..3dc90af4fc0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -42,7 +42,7 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
void push (const RtecEventComm::EventSet &events
ACE_ENV_ARG_DECL_NOT_USED)
@@ -51,9 +51,9 @@ public:
//@{
/** @name The RtecEventComm::PushSupplier methods
*/
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual PortableServer::POA_ptr _default_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index b0f66d12d9e..ef94e88f1b4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -42,7 +42,6 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb,
RIR_Narrow<CORBA::PolicyManager>::resolve (orb,
"ORBPolicyManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::PolicyList policy_list (1);
policy_list.length (1);
@@ -56,14 +55,11 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb,
orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
sync_scope
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
policy_manager->set_policy_overrides (policy_list,
CORBA::ADD_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ policy_list[0]->destroy ();
}
SyncScope_Setup::~SyncScope_Setup (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index baded47bc1f..c82b13dfd65 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -166,7 +166,6 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
this->sender_context_ =
this->naming_client_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// We reach here if there was no exception raised in
@@ -181,7 +180,6 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
this->receiver_context_ =
this->sender_context_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
{
@@ -197,7 +195,6 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
CORBA::Object_var object =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sender_context_ =
CosNaming::NamingContext::_narrow (object.in ());
@@ -209,16 +206,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
object =
this->sender_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->receiver_context_ =
CosNaming::NamingContext::_narrow (object.in ());
- this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->find_receivers ();
}
ACE_ENDTRY;
- ACE_CHECK;
name [0].id =
CORBA::string_dup (this->sender_name_.c_str ());
@@ -227,11 +221,10 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
this->sender_context_->rebind (name,
sender
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::find_receivers (void)
{
CosNaming::BindingIterator_var iterator;
CosNaming::BindingList_var binding_list;
@@ -242,12 +235,10 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
binding_list,
iterator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Add the receivers found in the bindinglist to the <receivers>.
this->add_to_receivers (binding_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (iterator.in ()))
{
@@ -259,11 +250,9 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
more = iterator->next_n (chunk,
binding_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->add_to_receivers (binding_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -376,8 +365,7 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
// Register streamctrl.
AVStreams::StreamCtrl_var streamctrl_object =
- streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ streamctrl->_this ();
// Bind the flowname and the corresponding stream controller to
// the stream controller map
@@ -390,7 +378,6 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -423,7 +410,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
CORBA::Object_var object =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// We reach here if there was no exception raised in <resolve>.
@@ -441,7 +427,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
object =
this->sender_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->receiver_context_ =
CosNaming::NamingContext::_narrow (object.in ());
@@ -455,7 +440,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
this->sender_context_ =
this->naming_client_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
name [0].id =
CORBA::string_dup ("Receivers");
@@ -464,10 +448,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
this->receiver_context_ =
this->sender_context_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK;
//
// At this point we either have resolved the receiver context or we
@@ -480,7 +462,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
this->receiver_context_->rebind (name,
receiver
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
//
// Check if the sender was registered. Note that if we created the
@@ -508,12 +489,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
// No problem if the sender was not there.
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
void
-Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_sender (void)
{
if (CORBA::is_nil (this->sender_.in ()))
return;
@@ -578,8 +558,7 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
// Register streamctrl.
AVStreams::StreamCtrl_var streamctrl_object =
- streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ streamctrl->_this ();
//
// Since senders terminate the streams, we don't need the streamctrl
@@ -598,7 +577,6 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (result == 0)
ACE_ERROR ((LM_ERROR,
@@ -608,7 +586,6 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec start_spec;
streamctrl->start (start_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -620,7 +597,6 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
CORBA::Any_var streamctrl_any =
endpoint->get_property_value ("Related_StreamCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 8045519e6bc..f78741c6acb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -66,10 +66,10 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
// Bind receiver to the sender.
- void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void connect_to_sender (void);
// Connect to the sender that we found.
- void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void destroy (void);
// Destroy all streams.
void destroy (const ACE_CString &flowname
@@ -93,7 +93,7 @@ public:
ACE_Null_Mutex>
Protocol_Objects;
-
+
// Map of streamctrl.
typedef ACE_Hash_Map_Manager<ACE_CString,
@@ -113,12 +113,12 @@ public:
StreamCtrls &streamctrls (void);
void load_ep_addr (const char* file_name);
-
+
protected:
- void find_receivers (ACE_ENV_SINGLE_ARG_DECL);
+ void find_receivers (void);
void add_to_receivers (CosNaming::BindingList &binding_list
ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 34239319d22..3f868652ea3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -183,8 +183,7 @@ Distributer::init (int argc,
this->distributer_sender_mmdevice_;
AVStreams::MMDevice_var distributer_sender_mmdevice =
- this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->distributer_sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
TAO_MMDevice (&this->receiver_endpoint_strategy_),
@@ -192,30 +191,25 @@ Distributer::init (int argc,
AVStreams::MMDevice_var distributer_receiver_mmdevice =
- this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->distributer_receiver_mmdevice_->_this ();
// Bind to receivers.
this->connection_manager_.bind_to_receivers (this->distributer_name_,
distributer_sender_mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Connect to receivers
this->connection_manager_.connect_to_receivers (distributer_sender_mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Bind to sender.
this->connection_manager_.bind_to_sender (this->sender_name_,
this->distributer_name_,
distributer_receiver_mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Connect to sender.
- this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->connection_manager_.connect_to_sender ();
return 0;
}
@@ -245,46 +239,38 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Distributer
int result =
DISTRIBUTER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
while (!DISTRIBUTER::instance ()->done ())
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work ();
}
// Hack for now....
@@ -296,7 +282,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
DISTRIBUTER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 437bf6d21b7..dcba1c310d4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -67,7 +67,6 @@ Receiver_Callback::handle_destroy (void)
ACE_TRY_NEW_ENV
{
done=1;
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -124,19 +123,16 @@ Receiver::init (int,
this->mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Bind to sender.
this->connection_manager_.bind_to_sender (this->sender_name_,
this->receiver_name_,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Connect to the sender.
- this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->connection_manager_.connect_to_sender ();
return 0;
}
@@ -196,31 +192,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Receiver receiver;
int result =
@@ -247,7 +237,6 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
@@ -256,7 +245,6 @@ main (int argc,
while(!done)
{
orb->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Hack for now....
@@ -269,7 +257,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index e97f210997e..3ee3d9b895b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -140,27 +140,24 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
// Register the object reference with the Naming Service and bind to
// the receivers
this->connection_manager_.bind_to_receivers (this->sender_name_,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Connect to the receivers
this->connection_manager_.connect_to_receivers (mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -239,7 +236,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -300,45 +296,37 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Client.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
"client::init failed\n"), -1);
- SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ SENDER::instance ()->pace_data ();
}
ACE_CATCHANY
@@ -347,7 +335,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index b4392ed9a4c..d76f69bcf85 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -66,7 +66,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 3683e3e7ba2..9756c58ad40 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -120,7 +120,6 @@ Receiver_Callback::handle_destroy (void)
{
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -230,8 +229,7 @@ Receiver::init (int argc,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -250,7 +248,6 @@ Receiver::init (int argc,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -280,29 +277,23 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Make sure we have a valid <output_file>
output_file = ACE_OS::fopen (output_file_name,
@@ -321,23 +312,19 @@ main (int argc,
RECEIVER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// // Start sending data.
- // result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- // ACE_TRY_CHECK;
+ // result = SENDER::instance ()->pace_data ();
if (result != 0)
return result;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Hack for now....
ACE_OS::sleep (1);
- //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ //orb->destroy ();
}
ACE_CATCHANY
{
@@ -345,7 +332,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 2e806a208a2..226e438300b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -112,12 +112,10 @@ Sender::shutdown (void)
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -160,7 +158,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -171,12 +169,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var receiver_mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->receiver_mmdevice_ =
AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -226,8 +222,7 @@ Sender::init (int argc,
"File opened successfully\n"));
// Resolve the object reference of the receiver from the Naming Service.
- result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->bind_to_receiver ();
if (result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -270,8 +265,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->streamctrl_,
TAO_StreamCtrl,
@@ -287,7 +281,6 @@ Sender::init (int argc,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -299,7 +292,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -378,7 +371,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -408,12 +400,10 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
//TAO_AV_CORE::instance ()->orb ()->shutdown (1,
// ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -437,42 +427,34 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
/* TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER); */
- ACE_TRY_CHECK;
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -493,11 +475,9 @@ main (int argc,
"File Opened Successfully\n"));
// Start sending data.
- result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = SENDER::instance ()->pace_data ();
ACE_Time_Value tv(3,0);
orb->run (tv);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -506,7 +486,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index 16a78c88b96..6e3f0835713 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -93,7 +93,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -107,7 +107,7 @@ private:
int parse_args (int argc, char **argv);
// Method to parse the command line arguments.
- int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_receiver (void);
// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index c532f635976..857de365dc0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -46,7 +46,6 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
this->sender_context_ =
this->naming_client_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// We reach here if there was no exception raised in
@@ -61,7 +60,6 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
this->receiver_context_ =
this->sender_context_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
{
@@ -77,7 +75,6 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
CORBA::Object_var object =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sender_context_ =
CosNaming::NamingContext::_narrow (object.in ());
@@ -89,16 +86,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
object =
this->sender_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->receiver_context_ =
CosNaming::NamingContext::_narrow (object.in ());
- this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->find_receivers ();
}
ACE_ENDTRY;
- ACE_CHECK;
name [0].id =
CORBA::string_dup (this->sender_name_.c_str ());
@@ -107,11 +101,10 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
this->sender_context_->rebind (name,
sender
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::find_receivers (void)
{
CosNaming::BindingIterator_var iterator;
CosNaming::BindingList_var binding_list;
@@ -122,12 +115,10 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
binding_list,
iterator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Add the receivers found in the bindinglist to the <receivers>.
this->add_to_receivers (binding_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (iterator.in ()))
{
@@ -139,11 +130,9 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
more = iterator->next_n (chunk,
binding_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->add_to_receivers (binding_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -185,7 +174,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
}
void
-Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_receivers (void)
{
// Connect to all receivers that we know about.
for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -224,8 +213,7 @@ Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
// Register streamctrl.
AVStreams::StreamCtrl_var streamctrl_object =
- streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ streamctrl->_this ();
// Bind the flowname and the corresponding stream controller to
// the stream controller map
@@ -238,7 +226,6 @@ Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -273,7 +260,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
CORBA::Object_var object =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// We reach here if there was no exception raised in <resolve>.
@@ -291,7 +277,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
object =
this->sender_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->receiver_context_ =
CosNaming::NamingContext::_narrow (object.in ());
@@ -305,7 +290,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
this->sender_context_ =
this->naming_client_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
name [0].id =
CORBA::string_dup ("Receivers");
@@ -314,10 +298,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
this->receiver_context_ =
this->sender_context_->bind_new_context (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK;
//
// At this point we either have resolved the receiver context or we
@@ -330,7 +312,6 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
this->receiver_context_->rebind (name,
receiver
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
//
// Check if the sender was registered. Note that if we created the
@@ -358,12 +339,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
// No problem if the sender was not there.
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
void
-Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_sender (void)
{
if (CORBA::is_nil (this->sender_.in ()))
return;
@@ -399,8 +379,7 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
// Register streamctrl.
AVStreams::StreamCtrl_var streamctrl_object =
- streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ streamctrl->_this ();
//
// Since senders terminate the streams, we don't need the streamctrl
@@ -419,7 +398,6 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (result == 0)
ACE_ERROR ((LM_ERROR,
@@ -429,7 +407,6 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec start_spec;
streamctrl->start (start_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -441,7 +418,6 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
CORBA::Any_var streamctrl_any =
endpoint->get_property_value ("Related_StreamCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
@@ -465,7 +441,6 @@ Connection_Manager::destroy (const ACE_CString &flowname
this->receivers_.unbind (flowname);
this->streamctrls_.unbind(flowname);
- ACE_CHECK;
}
void
@@ -489,7 +464,6 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
CORBA::Object_var object =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var sender_context =
CosNaming::NamingContext::_narrow (object.in ());
@@ -559,7 +533,6 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
CORBA::Object_var object =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var sender_context =
CosNaming::NamingContext::_narrow (object.in ());
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 5af3fec6390..54f04b4ec81 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -52,7 +52,7 @@ public:
// Method that binds the sender to the Naming Service and retreives
// the references of any registered receivers.
- void connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void connect_to_receivers (void);
// Connect to the receivers that we found.
void bind_to_sender (const ACE_CString &sender_name,
@@ -61,7 +61,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
// Bind receiver to the sender.
- void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void connect_to_sender (void);
// Connect to the sender that we found.
void destroy (const ACE_CString &flowname
@@ -108,7 +108,7 @@ public:
protected:
- void find_receivers (ACE_ENV_SINGLE_ARG_DECL);
+ void find_receivers (void);
void add_to_receivers (CosNaming::BindingList &binding_list
ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index bcc4f71458d..d4276837c31 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -343,8 +343,7 @@ Distributer::init (int argc,
this->distributer_sender_mmdevice_;
AVStreams::MMDevice_var distributer_sender_mmdevice =
- this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->distributer_sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
TAO_MMDevice (&this->receiver_endpoint_strategy_),
@@ -355,8 +354,7 @@ Distributer::init (int argc,
this->distributer_receiver_mmdevice_;
AVStreams::MMDevice_var distributer_receiver_mmdevice =
- this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->distributer_receiver_mmdevice_->_this ();
/// Bind to sender.
@@ -364,21 +362,17 @@ Distributer::init (int argc,
this->distributer_name_,
distributer_receiver_mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
/// Connect to sender.
- this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->connection_manager_.connect_to_sender ();
/// Bind to receivers.
this->connection_manager_.bind_to_receivers (this->distributer_name_,
distributer_sender_mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
/// Connect to receivers
- this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->connection_manager_.connect_to_receivers ();
return 0;
}
@@ -390,26 +384,23 @@ Distributer::done (void) const
}
void
-Distributer::shut_down (ACE_ENV_SINGLE_ARG_DECL)
+Distributer::shut_down (void)
{
ACE_TRY
{
AVStreams::MMDevice_var receiver_mmdevice =
- this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->distributer_receiver_mmdevice_->_this ();
DISTRIBUTER::instance ()->connection_manager ().unbind_receiver (this->sender_name_,
this->distributer_name_,
receiver_mmdevice.in ());
AVStreams::MMDevice_var sender_mmdevice =
- this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->distributer_sender_mmdevice_->_this ();
DISTRIBUTER::instance ()->connection_manager ().unbind_sender (this->distributer_name_,
sender_mmdevice.in ());
- // DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- // ACE_TRY_CHECK;
+ // DISTRIBUTER::instance ()->connection_manager ().destroy ();
}
ACE_CATCHANY
@@ -438,60 +429,49 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
/// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Initialize the Distributer
int result =
DISTRIBUTER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
while (!DISTRIBUTER::instance ()->done ())
{
- CORBA::Boolean wp = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Boolean wp = orb->work_pending ();
if (wp)
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->perform_work ();
- ACE_TRY_CHECK;
}
}
- DISTRIBUTER::instance ()->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ DISTRIBUTER::instance ()->shut_down ();
// orb->shutdown(1 ACE_ENV_ARG_PARAMETER);
-// ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -500,7 +480,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
DISTRIBUTER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index ab6f4753a14..8fd3a3fb14a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -194,7 +194,7 @@ public:
void stream_destroyed (void);
/// Called when stream destroyed
- void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void shut_down (void);
///Unbind the sender and receiver from the Naming Service
protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 573fdb12f34..71666340404 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -204,19 +204,16 @@ Receiver::init (int,
this->mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
/// Bind to sender.
this->connection_manager_.bind_to_sender (this->sender_name_,
this->receiver_name_,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
/// Connect to the sender.
- this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->connection_manager_.connect_to_sender ();
return 0;
}
@@ -261,14 +258,13 @@ Receiver::output_file_name (void)
}
void
-Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL)
+Receiver::shut_down (void)
{
ACE_TRY
{
AVStreams::MMDevice_var mmdevice_obj =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->mmdevice_->_this ();
- ACE_TRY_CHECK;
this->connection_manager_.unbind_receiver (this->sender_name_,
this->receiver_name_,
@@ -297,31 +293,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
/// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Receiver receiver;
int result =
@@ -348,19 +338,16 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
while (!done)
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work ();
}
- receiver.shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ receiver.shut_down ();
ACE_OS::fclose (output_file);
}
@@ -370,7 +357,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 19a9c673b8c..4f5ed8938e7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -121,7 +121,7 @@ public:
ACE_CString sender_name (void);
ACE_CString receiver_name (void);
- void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void shut_down (void);
protected:
Connection_Manager connection_manager_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 34c878c4584..6fb186dc19c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -150,18 +150,16 @@ Sender::~Sender (void)
}
void
-Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL)
+Sender::shut_down (void)
{
ACE_TRY
{
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->sender_mmdevice_->_this ();
SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -266,26 +264,23 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
/// Register the object reference with the Naming Service and bind to
/// the receivers
this->connection_manager_.bind_to_receivers (this->sender_name_,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
/// Connect to the receivers
- this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->connection_manager_.connect_to_receivers ();
return 0;
}
/// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
/// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -314,8 +309,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG,
"Shut Down called\n"));
- this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->shut_down ();
break;
}
@@ -337,8 +331,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
- this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->shut_down ();
break;
@@ -381,7 +374,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
/// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -462,45 +454,37 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
/// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Initialize the Client.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
"client::init failed\n"), -1);
- SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ SENDER::instance ()->pace_data ();
orb->destroy ();
}
@@ -510,7 +494,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 6b5e8ef9e76..4fdf3f1d7de 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -109,14 +109,14 @@ public:
~Sender (void);
/// Destructor
- void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void shut_down (void);
int init (int argc,
char **argv
ACE_ENV_ARG_DECL_NOT_USED);
/// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
/// Method to pace and send data from a file.
Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 16d694eb261..0231f24b995 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -50,10 +50,8 @@ FTP_Client_Callback::handle_timeout (void *)
ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
AVStreams::flowSpec stop_spec (1);
CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
- ACE_TRY_CHECK;
return 0;
}
else
@@ -236,13 +234,10 @@ Client::init (int argc,char **argv)
this->flowname_ = "Data";
sep_a_ = this->streamendpoint_a_->_this( ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- fep_a_obj_ = this->fep_a_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fep_a_obj_ = this->fep_a_->_this ();
CORBA::String_var s1 = sep_a_->add_fep( fep_a_obj_.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
@@ -264,7 +259,6 @@ Client::init (int argc,char **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -311,23 +305,19 @@ Client::run (void)
the_qos.inout(),
flow_spec
ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
timer.stop ();
timer.elapsed_time (elapsed);
elapsed.dump ();
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind failed\n"),-1);
AVStreams::flowSpec start_spec (1);
this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Schedule a timer for the for the flow handler.
ACE_Time_Value tv (10000,0);
this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -338,7 +328,6 @@ Client::run (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -353,7 +342,6 @@ main (int argc,
argv);
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -361,7 +349,6 @@ main (int argc,
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result = 0;
@@ -371,10 +358,8 @@ main (int argc,
result = CLIENT::instance ()->run ();
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ orb->destroy ();
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
@@ -387,7 +372,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
CLIENT::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 7a7a0686962..2b7d82f3161 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -15,14 +15,12 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
{
this->set_protocol_restriction (protocols
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint\n");
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
@@ -126,14 +124,11 @@ Server::init (int argc,
ACE_NEW_RETURN (this->fep_b_, FTP_Server_FlowEndPoint, -1);
- sep_b_ = this->streamendpoint_b_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sep_b_ = this->streamendpoint_b_->_this ();
- fep_b_obj_ = this->fep_b_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fep_b_obj_ = this->fep_b_->_this ();
CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
@@ -147,7 +142,6 @@ Server::init (int argc,
this->my_naming_client_->rebind (server_sep_b_name,
sep_b_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
@@ -157,7 +151,6 @@ Server::init (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -167,8 +160,7 @@ Server::run (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -176,7 +168,6 @@ Server::run (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -232,7 +223,6 @@ main (int argc,
argv);
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -240,7 +230,6 @@ main (int argc,
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -248,7 +237,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
result = FTP_SERVER::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 07ce3c8e804..456c03ca610 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -88,7 +88,6 @@ int main (int argc, char *argv[])
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -101,7 +100,6 @@ int main (int argc, char *argv[])
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Connect the two streams and run them...
AVStreams::flowSpec flow_spec (2);
@@ -130,20 +128,15 @@ int main (int argc, char *argv[])
TAO_StreamCtrl stream_control_impl;
AVStreams::StreamCtrl_var stream_control =
- stream_control_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ stream_control_impl._this ();
obj = orb->string_to_object (ping_ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::MMDevice_var ping_sender =
AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = orb->string_to_object (pong_ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::MMDevice_var pong_sender =
AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::streamQoS_var the_qos =
new AVStreams::streamQoS;
@@ -153,23 +146,18 @@ int main (int argc, char *argv[])
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
flow_spec.length (0);
stream_control->start (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Time_Value tv (100, 0);
orb->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// flow_spec.length (0);
// stream_control->stop (flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 886394ae9f9..d8473f3d267 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -105,7 +105,6 @@ int main (int argc, char *argv[])
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -118,7 +117,6 @@ int main (int argc, char *argv[])
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Register the video mmdevice object with the ORB
Reactive_Strategy *reactive_strategy;
@@ -132,12 +130,10 @@ int main (int argc, char *argv[])
1);
AVStreams::MMDevice_var mmdevice =
- mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mmdevice_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -164,23 +160,18 @@ int main (int argc, char *argv[])
1);
AVStreams::FDev_var ping_fdev =
- ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ping_fdev_impl->_this ();
AVStreams::FDev_var pong_fdev =
- pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ pong_fdev_impl->_this ();
mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (respond == 1)
{
mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
orb->run ();
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 42979b096e9..897a82e4d39 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -122,7 +122,6 @@ int main (int argc, char *argv[])
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -135,7 +134,6 @@ int main (int argc, char *argv[])
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Reactive_Strategy *reactive_strategy;
ACE_NEW_RETURN (reactive_strategy,
@@ -148,12 +146,10 @@ int main (int argc, char *argv[])
1);
AVStreams::MMDevice_var mmdevice =
- mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mmdevice_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -180,22 +176,17 @@ int main (int argc, char *argv[])
1);
AVStreams::FDev_var ping_fdev =
- ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ping_fdev_impl->_this ();
AVStreams::FDev_var pong_fdev =
- pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ pong_fdev_impl->_this ();
mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (respond == 1)
{
mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
orb->run ( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index f9dc8ccefca..df1bc0d2543 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -24,7 +24,6 @@ Receiver_StreamEndPoint::get_callback (const char *,
CORBA::Any_ptr streamctrl_any =
this->get_property_value ("Related_StreamCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
*streamctrl_any >>= streamctrl;
@@ -104,7 +103,6 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
// Initiate the modifying of the qos for the flows.
this->streamctrl_->modify_QoS (qos, flow_spec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
ACE_DEBUG ((LM_DEBUG,
"Stream Ctrl available....Modify QoS called\n"));
@@ -144,7 +142,6 @@ Receiver_Callback::handle_destroy (void)
{
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -191,8 +188,7 @@ Receiver::init (int,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -211,7 +207,6 @@ Receiver::init (int,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -256,31 +251,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
parse_args (argc,
@@ -307,19 +296,16 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Hack for now....
ACE_OS::sleep (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -327,7 +313,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 5788046dcb9..5d70b218b74 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -123,7 +123,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -134,12 +134,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var receiver_mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->receiver_mmdevice_ =
AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -189,8 +187,7 @@ Sender::init (int argc,
"File opened successfully\n"));
// Resolve the object reference of the receiver from the Naming Service.
- result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->bind_to_receiver ();
if (result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -223,8 +220,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->streamctrl_,
TAO_StreamCtrl,
@@ -240,7 +236,6 @@ Sender::init (int argc,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -252,7 +247,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
@@ -325,7 +320,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -354,11 +348,9 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// File reading is complete, destroy the stream.
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -382,38 +374,31 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -421,8 +406,7 @@ main (int argc,
-1);
// Start sending data.
- result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = SENDER::instance ()->pace_data ();
}
ACE_CATCHANY
@@ -432,7 +416,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 22483881f89..fffabe98d41 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -68,7 +68,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
/// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
/// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -78,7 +78,7 @@ private:
int parse_args (int argc, char **argv);
/// Method to parse the command line arguments.
- int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_receiver (void);
/// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index ee6b23f62df..7288a85600f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -55,11 +55,8 @@ FTP_Client_Callback::handle_timeout (void *)
AVStreams::flowSpec stop_spec (1);
//ACE_DECLARE_NEW_CORBA_ENV;
CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
-// ACE_TRY_CHECK;
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
- ACE_TRY_CHECK;
return 0;
}
ACE_CATCHANY
@@ -197,12 +194,10 @@ Client::bind_to_server (const char *name)
CORBA::Object_var server_mmdevice_obj =
my_naming_client_->resolve (server_mmdevice_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->server_mmdevice_ =
AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->server_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -215,7 +210,6 @@ Client::bind_to_server (const char *name)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -268,7 +262,6 @@ Client::run (void)
AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
AVStreams::flowSpec flow_spec (1);
- ACE_TRY_CHECK;
ACE_INET_Addr addr (this->address_);
ACE_NEW_RETURN (this->flowname_,
char [BUFSIZ],
@@ -287,8 +280,7 @@ Client::run (void)
ACE_DEBUG ((LM_DEBUG, "(%N,%l) Flowspec: %s\n", entry.entry_to_string() ));
AVStreams::MMDevice_var client_mmdevice
- = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = this->client_mmdevice_._this ();
CORBA::Boolean result =
this->streamctrl_.bind_devs (client_mmdevice.in (),
@@ -296,7 +288,6 @@ Client::run (void)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->bind_to_server ("Server_MMDevice1") == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) Error binding to the naming service\n"),
@@ -306,7 +297,6 @@ Client::run (void)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->bind_to_server ("Server_MMDevice2") == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) Error binding to the naming service\n"),
@@ -316,7 +306,6 @@ Client::run (void)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
@@ -324,13 +313,11 @@ Client::run (void)
start_spec.length (1);
start_spec [0] = CORBA::string_dup (this->flowname_);
this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Schedule a timer for the for the flow handler.
//TAO_AV_CORE::instance ()->run ();
ACE_Time_Value tv (10000,0);
TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -342,7 +329,6 @@ Client::run (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -357,7 +343,6 @@ main (int argc,
argv);
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -365,7 +350,6 @@ main (int argc,
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result = 0;
result = CLIENT::instance ()->init (argc,argv);
@@ -382,7 +366,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
CLIENT::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 343079ff7dd..f04fe3c5150 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -95,8 +95,7 @@ Server::init (int argc,
CosNaming::Name server_mmdevice_name (1);
server_mmdevice_name.length (1);
server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
- AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this ();
ACE_TRY_EX (bind)
{
@@ -112,10 +111,8 @@ Server::init (int argc,
this->my_naming_client_->bind (server_mmdevice_name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
ACE_CATCHANY
{
@@ -123,7 +120,6 @@ Server::init (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -137,18 +133,14 @@ Server::run (void)
while( !done )
{
- CORBA::Boolean wp = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Boolean wp = orb->work_pending ();
if (wp)
{
orb->perform_work( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
}
- ACE_TRY_CHECK;
orb->shutdown( 1 ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -158,7 +150,6 @@ Server::run (void)
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -209,7 +200,6 @@ main (int argc,
{
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -217,7 +207,6 @@ main (int argc,
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -225,7 +214,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
result = FTP_SERVER::instance ()->init (argc,argv);
if (result < 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 11a0624b3f4..5acc7722599 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -51,7 +51,6 @@ FTP_Client_Callback::handle_timeout (void *)
AVStreams::flowSpec stop_spec (1);
ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n"));
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
- ACE_TRY_CHECK;
return 0;
}
ACE_CATCHANY
@@ -209,12 +208,10 @@ Client::bind_to_server (const char *name)
CORBA::Object_var server_mmdevice_obj =
my_naming_client_->resolve (server_mmdevice_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->server_mmdevice_ =
AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->server_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -227,7 +224,6 @@ Client::bind_to_server (const char *name)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -259,10 +255,8 @@ Client::init (int argc,char **argv)
ACE_OS::sprintf (this->flowname_,
"Data");
this->fdev_->flowname (this->flowname ());
- AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this ();
+ AVStreams::FDev_var fdev = this->fdev_->_this ();
mmdevice->add_fdev (fdev.in ()
ACE_ENV_ARG_PARAMETER);
@@ -284,7 +278,6 @@ Client::init (int argc,char **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -315,8 +308,7 @@ Client::run (void)
flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
AVStreams::MMDevice_var client_mmdevice =
- this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->client_mmdevice_._this ();
CORBA::Boolean result =
this->streamctrl_.bind_devs (client_mmdevice.in (),
@@ -324,7 +316,6 @@ Client::run (void)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for client_mmdevice failed\n"),-1);
@@ -337,11 +328,9 @@ Client::run (void)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) streamctrl::bind_devs for mmdevice 1 failed\n"),-1);
- ACE_TRY_CHECK;
if (this->bind_to_server ("Server_MMDevice2") == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) Error binding to the naming service\n"),
@@ -351,7 +340,6 @@ Client::run (void)
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) streamctrl::bind_devs for mmdevice 2 failed\n"),-1);
@@ -359,13 +347,11 @@ Client::run (void)
start_spec.length (1);
start_spec [0] = CORBA::string_dup (this->flowname_);
this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Schedule a timer for the for the flow handler.
//TAO_AV_CORE::instance ()->run ();
ACE_Time_Value tv (10000,0);
TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -377,7 +363,6 @@ Client::run (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -395,7 +380,6 @@ main (int argc,
{
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -403,7 +387,6 @@ main (int argc,
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -411,7 +394,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
int result = 0;
result = CLIENT::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index a83a5b623da..635ee864624 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -14,14 +14,12 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
{
this->set_protocol_restriction (protocols
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint");
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
@@ -89,8 +87,7 @@ FTP_Server_Callback::handle_end_stream (void)
// ACE_NEW_RETURN (endpoint,
// FTP_Server_FlowEndPoint,
// 0);
-// return endpoint->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-// ACE_CHECK_RETURN (0);
+// return endpoint->_this ();
// }
Server::Server (void)
@@ -148,13 +145,10 @@ Server::init (int argc,
FTP_Server_FDev,
-1);
this->fdev_->flowname ("Data");
- AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this ();
+ AVStreams::FDev_var fdev = this->fdev_->_this ();
mmdevice->add_fdev (fdev.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Register the mmdevice with the naming service.
CosNaming::Name server_mmdevice_name (1);
@@ -174,10 +168,8 @@ Server::init (int argc,
this->my_naming_client_->bind (server_mmdevice_name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
}
ACE_CATCHANY
{
@@ -185,7 +177,6 @@ Server::init (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -195,8 +186,7 @@ Server::run (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- TAO_AV_CORE::instance ()->orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ TAO_AV_CORE::instance ()->orb ()->run ();
}
ACE_CATCHANY
{
@@ -204,7 +194,6 @@ Server::run (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -255,7 +244,6 @@ main (int argc,
{
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa
= PortableServer::POA::_narrow (obj.in ());
@@ -263,7 +251,6 @@ main (int argc,
TAO_AV_CORE::instance ()->init (orb.in (),
poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -271,7 +258,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
int result = 0;
result = FTP_SERVER::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index ef33207328f..b059768db7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -197,8 +197,7 @@ Receiver::init (int argc,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -217,7 +216,6 @@ Receiver::init (int argc,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -241,52 +239,43 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
RECEIVER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
while (endstream != 2)
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work ();
}
// Hack for now....
ACE_OS::sleep (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -294,7 +283,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
RECEIVER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 79169527b6d..e0383cd2677 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -54,18 +54,16 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
}
void
-Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Sender::shutdown (void)
{
// File reading is complete, destroy the stream.
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -103,7 +101,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -114,12 +112,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var receiver_mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->receiver_mmdevice_ =
AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -169,8 +165,7 @@ Sender::init (int argc,
"File opened successfully\n"));
// Resolve the object reference of the receiver from the Naming Service.
- result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->bind_to_receiver ();
if (result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -213,8 +208,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->streamctrl_,
TAO_StreamCtrl,
@@ -230,7 +224,6 @@ Sender::init (int argc,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -242,7 +235,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -321,7 +314,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -353,8 +345,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
} // end while
- this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->shutdown ();
}
ACE_CATCHANY
{
@@ -378,38 +369,31 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -417,8 +401,7 @@ main (int argc,
-1);
// Start sending data.
- result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = SENDER::instance ()->pace_data ();
}
ACE_CATCHANY
{
@@ -427,7 +410,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index d37c46f21b9..aeae3cd03bd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -69,19 +69,19 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
// Set the protocol object corresponding to the transport protocol chosen.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
private:
int parse_args (int argc, char **argv);
// Method to parse the command line arguments.
- int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_receiver (void);
// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index d3519e0114f..df81a527c38 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -128,7 +128,7 @@ Client::frame_rate (void)
// Method to get the object reference of the server
int
-Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL)
+Client::bind_to_server (void)
{
// Initialize the naming services
if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -145,12 +145,10 @@ Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var server_mmdevice_obj =
my_naming_client_->resolve (server_mmdevice_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->server_mmdevice_ =
AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->server_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -191,8 +189,7 @@ Client::init (int argc,
-1);
result
- = this->bind_to_server (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ = this->bind_to_server ();
// Resolve the object reference of the server from the Naming Service.
if (result != 0)
@@ -269,8 +266,7 @@ Client::init (int argc,
flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
AVStreams::MMDevice_var client_mmdevice =
- this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->client_mmdevice_._this ();
// Bind/Connect the client and server MMDevices.
CORBA::Boolean bind_result =
@@ -279,7 +275,6 @@ Client::init (int argc,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
@@ -289,7 +284,7 @@ Client::init (int argc,
// Method to send data at the specified rate
int
-Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Client::pace_data (void)
{
// Rate at which frames of data need to be sent.
@@ -373,7 +368,6 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// run the orb for the wait time so the client can continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -397,11 +391,9 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec stop_spec (1);
CLIENT::instance ()->streamctrl ()->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -425,50 +417,41 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV STream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// INitialize the Client.
int result = 0;
result = CLIENT::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
"client::init failed\n"),1);
// Start sending data.
- result = CLIENT::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = CLIENT::instance ()->pace_data ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ orb->destroy ();
}
ACE_CATCHANY
@@ -477,7 +460,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
CLIENT::close ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 4f405b5a9da..9bb270d1059 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -95,7 +95,7 @@ public:
void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
// Set the protocol object corresponding to the transport protocol chosen.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
FILE *file (void);
@@ -114,7 +114,7 @@ private:
int parse_args (int argc, char **argv);
// Method to parse the command line arguments.
- int bind_to_server (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_server (void);
// Method that binds the ftp client to the server
ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index db4658830c7..57a9e378949 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -94,8 +94,7 @@ Server::init (int,
server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->mmdevice_->_this ();
// Initialize the naming services
if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -108,7 +107,6 @@ Server::init (int,
this->my_naming_client_->rebind (server_mmdevice_name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -151,7 +149,6 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
parse_args (argc,
@@ -175,33 +172,27 @@ main (int argc,
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Server server;
result =
server.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
@@ -210,13 +201,11 @@ main (int argc,
{
if ( orb->work_pending( ACE_ENV_SINGLE_ARG_PARAMETER ) )
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work ();
}
}
orb->shutdown( 1 ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -224,7 +213,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index d24c92414ff..cf7bf293187 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -112,8 +112,7 @@ Receiver::init (int,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -132,7 +131,6 @@ Receiver::init (int,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -179,31 +177,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
parse_args (argc,
@@ -230,22 +222,19 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
while (!endstream)
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work ();
}
// Hack for now....
ACE_OS::sleep (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -253,7 +242,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 9af1f2ba80b..47a09d91a75 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -87,7 +87,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -98,12 +98,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var receiver_mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->receiver_mmdevice_ =
AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -153,8 +151,7 @@ Sender::init (int argc,
"File opened successfully\n"));
// Resolve the object reference of the receiver from the Naming Service.
- result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->bind_to_receiver ();
if (result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -187,8 +184,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->streamctrl_,
TAO_StreamCtrl,
@@ -204,7 +200,6 @@ Sender::init (int argc,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -216,7 +211,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -295,7 +290,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -325,12 +319,10 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -361,33 +353,27 @@ main (int argc,
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -395,8 +381,7 @@ main (int argc,
-1);
// Start sending data.
- result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = SENDER::instance ()->pace_data ();
}
ACE_CATCHANY
{
@@ -405,7 +390,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 20e9dc6ef50..116e369e801 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -66,7 +66,7 @@ public:
ACE_ENV_ARG_DECL);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL);
+ int pace_data (void);
// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -76,7 +76,7 @@ private:
int parse_args (int argc, char **argv);
// Method to parse the command line arguments.
- int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_receiver (void);
// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index dd2c65abfdd..f2c7cc50544 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -83,7 +83,6 @@ Distributer_Receiver_Callback::handle_destroy (void)
AVStreams::flowSpec stop_spec;
DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// We can close down now.
DISTRIBUTER::instance ()->done (1);
@@ -142,12 +141,10 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
CORBA::Object_var mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
mmdevice =
AVStreams::MMDevice::_narrow (mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -179,14 +176,12 @@ Distributer::init (int /*argc*/,
this->bind_to_mmdevice (this->receiver_mmdevice_.out (),
mmdevice_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Bind to the sender mmdevice
mmdevice_name = "Sender";
this->bind_to_mmdevice (this->sender_mmdevice_.out (),
mmdevice_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Initialize the QoS
AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
@@ -214,8 +209,7 @@ Distributer::init (int /*argc*/,
this->distributer_sender_mmdevice_;
AVStreams::MMDevice_var distributer_sender_mmdevice =
- this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->distributer_sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
TAO_MMDevice (&this->receiver_endpoint_strategy_),
@@ -226,8 +220,7 @@ Distributer::init (int /*argc*/,
this->distributer_receiver_mmdevice_;
AVStreams::MMDevice_var distributer_receiver_mmdevice =
- this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->distributer_receiver_mmdevice_->_this ();
ACE_NEW_RETURN (this->receiver_streamctrl_,
TAO_StreamCtrl,
@@ -244,7 +237,6 @@ Distributer::init (int /*argc*/,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create the forward flow specification to describe the flow.
TAO_Forward_FlowSpec_Entry sender_entry ("Data_Sender",
@@ -275,7 +267,6 @@ Distributer::init (int /*argc*/,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (res == 0)
ACE_ERROR_RETURN ((LM_ERROR,"Streamctrl::bind_devs failed\n"),-1);
@@ -314,46 +305,38 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Distributer
int result =
DISTRIBUTER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
while (!DISTRIBUTER::instance ()->done ())
{
- orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work ();
}
// Hack for now....
@@ -365,7 +348,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
DISTRIBUTER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 7a64da3488c..af74f75cf6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -68,7 +68,6 @@ Receiver_Callback::handle_destroy (void)
{
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -113,8 +112,7 @@ Receiver::init (int,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -133,7 +131,6 @@ Receiver::init (int,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -178,31 +175,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
parse_args (argc,
@@ -229,19 +220,16 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Hack for now....
ACE_OS::sleep (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -249,7 +237,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 9e766993cf7..2121f1ead25 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -26,7 +26,6 @@ Sender_StreamEndPoint::get_callback (const char *,
CORBA::Any_ptr streamctrl_any =
this->get_property_value ("Related_StreamCtrl"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
*streamctrl_any >>= streamctrl;
@@ -162,8 +161,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ this->sender_mmdevice_->_this ();
CosNaming::Name name (1);
name.length (1);
@@ -174,14 +172,13 @@ Sender::init (int argc,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -209,7 +206,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
ACE_Time_Value wait_time (5);
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Continue to send data till the file is read to the end.
@@ -271,7 +267,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -304,7 +299,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -333,41 +327,34 @@ main (int argc,
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
"Sender::init failed\n"),
-1);
- SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ SENDER::instance ()->pace_data ();
ACE_Time_Value tv (10);
orb->run (tv);
@@ -381,7 +368,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index a5e40f9134e..ead95dc625d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -66,7 +66,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 31bdd2c32e2..f82dfc0a159 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -131,7 +131,6 @@ Receiver_Callback::handle_destroy (void)
{
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -176,8 +175,7 @@ Receiver::init (int,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -196,7 +194,6 @@ Receiver::init (int,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -245,31 +242,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
parse_args (argc,
@@ -296,19 +287,16 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Hack for now....
ACE_OS::sleep (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
@@ -318,7 +306,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index c98b0bed8bb..9cbfec084ab 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -141,7 +141,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -152,12 +152,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var receiver_mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->receiver_mmdevice_ =
AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -207,8 +205,7 @@ Sender::init (int argc,
"File opened successfully\n"));
// Resolve the object reference of the receiver from the Naming Service.
- result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->bind_to_receiver ();
if (result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -272,8 +269,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->streamctrl_,
TAO_StreamCtrl,
@@ -289,7 +285,6 @@ Sender::init (int argc,
the_qos.inout (),
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -301,7 +296,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -383,7 +378,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -416,12 +410,10 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -449,33 +441,27 @@ main (int argc,
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -483,8 +469,7 @@ main (int argc,
-1);
// Start sending data.
- result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = SENDER::instance ()->pace_data ();
}
ACE_CATCHANY
{
@@ -493,7 +478,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 32cbf2856c9..f6efd750075 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -66,7 +66,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -76,7 +76,7 @@ private:
int parse_args (int argc, char **argv);
// Method to parse the command line arguments.
- int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_receiver (void);
// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
@@ -117,7 +117,7 @@ private:
char* address_;
// Destination Address.
-
+
char* peer_address_;
// Destination Address.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 527be2f6f10..8286f776dd8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -69,7 +69,6 @@ Receiver_Callback::handle_destroy (void)
{
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -116,8 +115,7 @@ Receiver::init (int,
this->mmdevice_;
CORBA::Object_var mmdevice =
- this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->mmdevice_->_this ();
// Register the mmdevice with the naming service.
CosNaming::Name name (1);
@@ -136,7 +134,6 @@ Receiver::init (int,
this->naming_client_->rebind (name,
mmdevice.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -181,31 +178,25 @@ main (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AVStreams components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int result =
parse_args (argc,
@@ -232,19 +223,16 @@ main (int argc,
receiver.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result != 0)
return result;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Hack for now....
ACE_OS::sleep (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -252,7 +240,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 05bc380156d..995fcf04e94 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -25,7 +25,6 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
"Sender_StreamEndPoint::modify_QoS\n"));
int result = this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (result != 0)
return 0;
@@ -47,8 +46,7 @@ Sender_StreamEndPoint::get_callback (const char *,
TAO_Negotiator,
-1);
AVStreams::Negotiator_var negotiator_obj =
- negotiator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ negotiator->_this ();
this->set_negotiator (negotiator_obj.in ());
@@ -192,7 +190,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -203,12 +201,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var receiver_mmdevice_obj =
this->naming_client_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->receiver_mmdevice_ =
AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -258,8 +254,7 @@ Sender::init (int argc,
"File opened successfully\n"));
// Resolve the object reference of the receiver from the Naming Service.
- result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->bind_to_receiver ();
if (result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -325,8 +320,7 @@ Sender::init (int argc,
this->sender_mmdevice_;
AVStreams::MMDevice_var mmdevice =
- this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->sender_mmdevice_->_this ();
ACE_NEW_RETURN (this->streamctrl_,
TAO_StreamCtrl,
@@ -346,7 +340,6 @@ Sender::init (int argc,
qos,
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (bind_result == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -358,7 +351,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
{
@@ -436,7 +429,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -477,7 +469,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
this->streamctrl_->modify_QoS (qos,
flow_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
} // end while
@@ -486,12 +477,10 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
AVStreams::flowSpec stop_spec;
this->streamctrl_->destroy (stop_spec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -520,33 +509,27 @@ main (int argc,
CORBA::Object_var obj
= orb->resolve_initial_references ("RootPOA"
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 ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var mgr
- = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ = root_poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
// Initialize the AV Stream components.
TAO_AV_CORE::instance ()->init (orb.in (),
root_poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Initialize the Sender.
int result = 0;
result = SENDER::instance ()->init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -554,8 +537,7 @@ main (int argc,
-1);
// Start sending data.
- result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = SENDER::instance ()->pace_data ();
}
ACE_CATCHANY
{
@@ -564,7 +546,6 @@ main (int argc,
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index a314624ed28..6325ee5aa15 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -72,7 +72,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
// Method to initialize the various data components.
- int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int pace_data (void);
// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -85,7 +85,7 @@ private:
int parse_args (int argc, char **argv);
// Method to parse the command line arguments.
- int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ int bind_to_receiver (void);
// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 23f3ff6baf8..0cac4721d4b 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -11,15 +11,15 @@ class Time_impl :
{
public:
virtual TimeModule::TimeOfDay
- get_gmt (ACE_ENV_SINGLE_ARG_DECL)
+ get_gmt (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- void Shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ void Shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
-TimeModule::TimeOfDay Time_impl::get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TimeModule::TimeOfDay Time_impl::get_gmt (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -36,7 +36,7 @@ TimeModule::TimeOfDay Time_impl::get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Time_impl::Shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
exit(0);
@@ -55,24 +55,20 @@ main(int argc, char * argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get reference to Root POA.
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var rootpoa =
PortableServer::POA::_narrow (obj.in ());
// Activate POA manager
PortableServer::POAManager_var mgr =
- rootpoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rootpoa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
PortableServer::POA_var poa;
@@ -82,12 +78,10 @@ main(int argc, char * argv[])
PolicyList [0] =
rootpoa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PolicyList [1] =
rootpoa->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any CallbackPolicy;
CallbackPolicy <<= BiDirPolicy::BOTH;
@@ -97,13 +91,11 @@ main(int argc, char * argv[])
orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
CallbackPolicy
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa = rootpoa->create_POA (sServerPoaName,
mgr.in(),
PolicyList
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::ObjectId_var ServerId =
@@ -116,7 +108,6 @@ main(int argc, char * argv[])
poa->activate_object_with_id (ServerId.in (),
time_servant
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference after activating the object
TimeModule::Time_var tm = time_servant->_this();
@@ -125,7 +116,6 @@ main(int argc, char * argv[])
CORBA::Object_var name_obj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var inc =
CosNaming::NamingContext::_narrow (name_obj.in ());
@@ -144,7 +134,6 @@ main(int argc, char * argv[])
inc->rebind (service_name,
tm.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run the event loop for fun
ACE_Time_Value tv (3, 0);
@@ -152,13 +141,10 @@ main(int argc, char * argv[])
// Accept requests
orb->run (&tv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
rootpoa->destroy (0 , 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -168,7 +154,6 @@ main(int argc, char * argv[])
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 52e3543d1ee..bda834f18fb 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -14,7 +14,6 @@ int main( int argc, char *argv[] )
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ;
- ACE_TRY_CHECK;
ACE_TRY_EX (nested)
{
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index bb7e3d1142d..965bdda1adb 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -10,22 +10,18 @@ int main(int argc, char** argv)
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb_->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var interfaces =
repo_->contents (CORBA::dk_Interface, // Any type of contained object.
1 // Exclude parents of interfaces.
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong length = interfaces->length ();
@@ -40,7 +36,6 @@ int main(int argc, char** argv)
CORBA::InterfaceDef_var the_interface =
CORBA::InterfaceDef::_narrow (interfaces[first_one]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var name = the_interface->name();
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index dbfcefcb23b..87944856506 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -16,19 +16,15 @@ Test_i::Test_i (CORBA::ORB_ptr orb) :
CORBA::Object_var obj =
orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->root_poa_ =
PortableServer::POA::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies_.length(1);
policies_[0] =
root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->poa_mgr_ =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
}
ACE_CATCHANY
{
@@ -46,7 +42,7 @@ Test_i::~Test_i (void)
}
int
-Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::try_and_create_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -56,7 +52,6 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
poa_mgr_.in (),
this->policies_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::TRANSIENT, ex)
{
@@ -79,7 +74,7 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index 6e548f96463..59e2f65f292 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -18,12 +18,12 @@ public:
~Test_i (void);
/// Try and create a persistant POA
- int try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ int try_and_create_POA (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-
+
protected:
CORBA::ORB_var orb_;
PortableServer::POA_var root_poa_;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 69909f4e3d5..a33f0a4c648 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -19,7 +19,7 @@ parse_args (int argc, char *argv[])
ior = get_opts.opt_arg ();
break;
case 's':
- shutdown_server = 1;
+ shutdown_server = 1;
break;
case '?':
default:
@@ -42,18 +42,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_var server =
Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -65,17 +62,14 @@ main (int argc, char *argv[])
if (shutdown_server)
{
- server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown();
}
else
{
- result = server->try_and_create_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = server->try_and_create_POA();
}
-
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 65c1f4c8a2b..e13495b805c 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -40,11 +40,9 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,11 +51,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -66,15 +62,12 @@ main (int argc, char *argv[])
root_poa->activate_object (&server_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var server = server_impl._this();
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -101,12 +94,10 @@ main (int argc, char *argv[])
}
poa_manager->activate();
-
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+ orb->run ();
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index fffe62a0cba..ab463ae6c08 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -19,17 +19,14 @@ int main (int argc, char* argv[])
// Initialise ORB.
//
CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Find the Interface Repository.
//
ACE_DEBUG((LM_DEBUG, ". Find IFR\n"));
CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, ". Narrow IFR\n"));
CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if( CORBA::is_nil( ifr.in() ) )
{
@@ -47,7 +44,6 @@ int main (int argc, char* argv[])
"interface865",
"1.0",
baseInterfaces ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
// Add an operation to the interface.
// First get some useful things.
@@ -55,19 +51,15 @@ int main (int argc, char* argv[])
ACE_DEBUG((LM_DEBUG, ". Get primitive (void)\n"));
CORBA::PrimitiveDef_var voidPrimitive =
ifr->get_primitive( CORBA::pk_void ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, ". Get primitive (char)\n"));
CORBA::PrimitiveDef_var charPrimitive =
ifr->get_primitive( CORBA::pk_char ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, ". Get primitive (long)\n"));
CORBA::PrimitiveDef_var longPrimitive =
ifr->get_primitive( CORBA::pk_long ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, ". Get primitive (short)\n"));
CORBA::PrimitiveDef_var shortPrimitive =
ifr->get_primitive( CORBA::pk_short ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, ". create 3 parameters\n"));
// The operation has three parameters...
@@ -124,7 +116,6 @@ int main (int argc, char* argv[])
parameters,
exceptions,
contextIds ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
@@ -136,11 +127,9 @@ int main (int argc, char* argv[])
orb->create_operation_list(operation.in (),
opList.out()
ACE_ENV_ARG_PARAMETER) ;
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Call to create_operation_list succeeded\n"));
CORBA::ULong count = opList->count() ;
- ACE_TRY_CHECK;
if( count != numParams )
{
@@ -158,7 +147,6 @@ int main (int argc, char* argv[])
CORBA::Boolean const eq_char =
nv->value()->type()->equal (CORBA::_tc_char
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if( !eq_char )
{
@@ -181,7 +169,6 @@ int main (int argc, char* argv[])
CORBA::Boolean const eq_long =
nv->value()->type()->equal (CORBA::_tc_long
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if( !eq_long )
{
@@ -204,7 +191,6 @@ int main (int argc, char* argv[])
CORBA::Boolean const eq_short =
nv->value()->type()->equal (CORBA::_tc_short
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if( !eq_short )
{
@@ -222,7 +208,7 @@ int main (int argc, char* argv[])
// Finally destroy the interface.
//
- interface->destroy(ACE_ENV_SINGLE_ARG_PARAMETER) ;
+ interface->destroy() ;
//orb->destroy();
@@ -244,7 +230,6 @@ int main (int argc, char* argv[])
}
ACE_ENDTRY;
- ACE_CHECK_RETURN(1);
return 0 ;
}
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index 46148e21dee..a4eee121d2f 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -39,11 +39,9 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte
{
CORBA::Object_var object1 =
orb->string_to_object(ior1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object2 =
orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
const char* expected_result_string = (expected_result ? "true" : "false");
@@ -80,7 +78,6 @@ main (int argc, char *argv[])
{
orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -297,8 +294,7 @@ main (int argc, char *argv[])
result = 1;
}
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index 50efe0c1099..bb65e65d76b 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
@@ -17,7 +17,7 @@ public:
Client_i (CORBA::ORB_ptr orb);
// Our constructor
- int init (ACE_ENV_SINGLE_ARG_DECL);
+ int init (void);
// Initialize the ORB etc.
private:
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 74d54ebda92..fa225ac047b 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -88,22 +88,19 @@ main (int argc,
manager.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// the command line arguments
if (parse_args (argc, argv) == -1)
return -1;
// Merge the different IORS
- manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager.make_merged_iors ();
if (merged_test)
{
// Set properties. This is the most important portion of the
// test
- manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager.set_properties ();
}
// Write IOR to file
@@ -112,8 +109,7 @@ main (int argc,
// Client, who is going to use the merged IOR
// Construct that with the managers ORB
Client_i client_imp (manager.orb ());
- return client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ return client_imp.init ();
}
ACE_CATCHANY
{
@@ -142,36 +138,30 @@ Manager::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Obtain the RootPOA.
CORBA::Object_var obj_var =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get the POA_var object from Object_var.
PortableServer::POA_var root_poa_var =
PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get the POAManager of the RootPOA.
PortableServer::POAManager_var poa_manager_var =
- root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_var->the_POAManager ();
- poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager_var->activate ();
}
int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (void)
{
// First server
object_primary =
this->orb_->string_to_object (first_ior
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (merged_test)
{
@@ -179,18 +169,15 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
object_secondary =
this->orb_->string_to_object (second_ior
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Get an object reference for the ORBs IORManipultion object!
CORBA::Object_var IORM =
this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create the list
@@ -202,7 +189,6 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
// Create a merged set 1;
merged_set_ =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
@@ -213,7 +199,7 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
}
int
-Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
+Manager::set_properties (void)
{
FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -243,7 +229,6 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
object_secondary.in (),
this->merged_set_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Set the primary
// See we are setting the second ior as the primary
@@ -252,19 +237,17 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
retval = iorm->set_property (&iogr_prop,
this->merged_set_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
{
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -331,8 +314,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
{
// Make a remote call
CORBA::String_var s =
- server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->remote_call ();
if (!s.in())
{
@@ -392,7 +374,6 @@ int run_abort_test (Simple_Server_ptr server,
ACE_TRY_NEW_ENV
{
CORBA::String_var s = server->abort (request_key);
- ACE_TRY_CHECK;
if (!s.in())
{
@@ -447,7 +428,6 @@ int run_shutdown_test (Simple_Server_ptr server,
ACE_TRY_NEW_ENV
{
CORBA::String_var s = server->shutdown (request_key);
- ACE_TRY_CHECK;
if (!s.in())
{
@@ -551,7 +531,7 @@ int run_full_shutdown_test (Simple_Server_ptr server)
}
int
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
+Client_i::init (void)
{
// Open the file for reading.
ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
@@ -577,18 +557,15 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var object =
this->orb_->string_to_object (data
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Combined IOR stuff
Simple_Server_var server =
Simple_Server::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (server.in ()))
{
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 81760e158f4..7ef5b5a12b3 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -25,13 +25,13 @@ public:
// Initialize the ORB, POA etc.
- int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int make_merged_iors (void);
// Merges the different IORS
- int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int set_properties (void);
// Sets the properties for the profiles
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the ORB event loop..
int write_to_file (void);
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index d597ec0d27d..6d57e37de64 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -44,14 +44,12 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// We do the command line parsing first
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,32 +58,25 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
CORBA::PolicyList policies;
policies.length (3);
policies[0] = root_poa->create_id_assignment_policy (
PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] = root_poa->create_implicit_activation_policy (
PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[2] = root_poa->create_lifespan_policy (
PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa = root_poa->create_POA (
"PERS_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
// Instantiate the LCD_Display implementation class
@@ -94,15 +85,12 @@ main (int argc, char *argv[])
PortableServer::string_to_ObjectId ("IOGR_OID");
poa->activate_object_with_id (id.in(), &display_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var server =
poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -119,8 +107,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
orb->run ();
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index f00ae655410..bf9c96de492 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -21,7 +21,7 @@ public:
// ctor
// = The Simple_Server methods.
- char* remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ char* remote_call (void)
ACE_THROW_SPEC ((CORBA::SystemException));
char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index b4eb64b13e5..e85d58ef471 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -27,7 +27,7 @@ public:
Client_i (CORBA::ORB_ptr orb);
// Our constructor
- int init (ACE_ENV_SINGLE_ARG_DECL);
+ int init (void);
// Initialize the ORB etc.
private:
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index 8a557179c7c..f7f17dc240d 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -36,13 +36,11 @@ Server_ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
this->server_interceptor_ = interceptor;
info->add_server_request_interceptor (interceptor
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index 69617231383..e826810af1d 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -27,14 +27,14 @@ Server_Request_Interceptor::forward_reference (
}
char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("Server_Request_Interceptor");
}
void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -59,7 +59,6 @@ Server_Request_Interceptor::receive_request (
IOP::ServiceContext_var svc =
ri->get_request_service_context (IOP::FT_GROUP_VERSION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// extract the group component
TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -85,10 +84,8 @@ Server_Request_Interceptor::receive_request (
int argc = 0;
char** argv = 0;
CORBA::ORB_var orb = CORBA::ORB_init(argc,argv,ri->orb_id() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj = orb->string_to_object (iorstr_.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG,
"SERVER (%P|%t) Request will be forwarded "
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index c9a8151677a..bfb2aa3c567 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -59,10 +59,10 @@ public:
*/
//@{
/// Return the name of this ServerRequestinterceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 0d6a828940b..6ef4eaf601a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -82,15 +82,13 @@ main (int argc,
manager.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// the command line arguments
if (parse_args (argc, argv) == -1)
return -1;
// Merge the different IORS
- manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager.make_merged_iors ();
// Write IOR to file
if (manager.write_to_files ())
@@ -99,8 +97,7 @@ main (int argc,
// Client, who is going to use the merged IOR
// Construct that with the managers ORB
Client_i client_imp (manager.orb ());
- return client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ return client_imp.init ();
}
ACE_CATCHANY
{
@@ -127,49 +124,41 @@ Manager::init (int& argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Obtain the RootPOA.
CORBA::Object_var obj_var =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get the POA_var object from Object_var.
PortableServer::POA_var root_poa_var =
PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get the POAManager of the RootPOA.
PortableServer::POAManager_var poa_manager_var =
- root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_var->the_POAManager ();
- poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager_var->activate ();
}
int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (void)
{
// Get an object reference for the ORBs IORManipultion object!
CORBA::Object_var IORM =
this->orb_->resolve_initial_references (
TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
+
if (CORBA::is_nil (IORM.in()))
return -1;
TAO_IOP::TAO_IOR_Manipulation_var iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (iorm.in()))
return -1;
CORBA::Object_var first = orb_->string_to_object (first_ior ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (first.in()))
return -1;
@@ -180,7 +169,6 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
iors [0] = first;
merged_set_10_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (merged_set_10_.in()))
{
@@ -189,13 +177,12 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
int result = set_properties (iorm.in(), merged_set_10_.in(),
first.in(), 10 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (-1 == result)
{
return -1;
}
-
+
first = orb_->string_to_object (first_ior);
if (CORBA::is_nil (first.in()))
{
@@ -203,20 +190,19 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Object_var second = orb_->string_to_object (second_ior);
-
+
if (CORBA::is_nil (second.in()))
{
return -1;
}
// Create the list
-
+
iors.length(2);
iors [0] = first;
iors [1] = second;
merged_set_11_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (merged_set_11_.in()))
{
@@ -225,7 +211,6 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
result = set_properties (iorm.in(), merged_set_11_.in(),
first.in(), 11 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (-1 == result)
{
@@ -268,7 +253,6 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
primary,
merged_set
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Set the primary
// See we are setting the second ior as the primary
@@ -277,19 +261,17 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
retval = iorm->set_property (&iogr_prop,
merged_set
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
{
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -361,8 +343,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
{
// Make a remote call
CORBA::String_var s =
- server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->remote_call ();
if (!s.in())
{
@@ -417,7 +398,6 @@ int run_abort_test (Simple_Server_ptr server,
ACE_TRY
{
CORBA::String_var s = server->abort (request_key);
- ACE_TRY_CHECK;
if (!s.in())
{
@@ -458,29 +438,26 @@ int run_abort_test (Simple_Server_ptr server,
int run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL)
{
int rv = run_abort_test (server, first_key, second_key ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
+
if (rv)
{
return rv;
}
-
+
rv = run_remote_test (server, second_key ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (rv)
{
return rv;
}
-
+
rv = run_abort_test (server, second_key, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return rv;
}
int
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
+Client_i::init (void)
{
char iogrstr[1024];
ACE_OS::sprintf (iogrstr, "file://%s", first_iogr_file);
@@ -491,19 +468,16 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var object =
this->orb_->string_to_object (iogrstr
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Combined IOR stuff
Simple_Server_var server =
Simple_Server::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (server.in ()))
{
@@ -514,7 +488,6 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
// run tests
int result = run_test (server.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return result;
}
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index 1bf9b049712..0c915fed9e0 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -24,11 +24,11 @@ public:
// Initialize the ORB, POA etc.
- int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int make_merged_iors (void);
// Merges the different IORS
/// Run the ORB event loop..
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
/// Write the merged IOGRs to a file
int write_to_files (void);
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 60f306ac782..5ea9749a7f2 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -63,18 +63,15 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// We do the command line parsing first
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -83,32 +80,25 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
CORBA::PolicyList policies;
policies.length (3);
policies[0] = root_poa->create_id_assignment_policy (
PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] = root_poa->create_implicit_activation_policy (
PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[2] = root_poa->create_lifespan_policy (
PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa = root_poa->create_POA (
"PERS_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
// Instantiate the LCD_Display implementation class
@@ -117,15 +107,12 @@ main (int argc, char *argv[])
PortableServer::string_to_ObjectId ("IOGR_OID");
poa->activate_object_with_id (id.in(), &display_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var server =
poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -149,7 +136,6 @@ main (int argc, char *argv[])
Simple_ServerRequestInterceptor_var interceptor =
Simple_ServerRequestInterceptor::_narrow (
server_interceptor.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (interceptor.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -159,13 +145,10 @@ main (int argc, char *argv[])
interceptor->forward_reference (merged_iorstr
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index c3cc5424921..71e6b8c5801 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::Simple_Server_i (void)
}
char*
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 09da165bd14..0affad3c77b 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -21,7 +21,7 @@ public:
// ctor
// = The Simple_Server methods.
- char* remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ char* remote_call (void)
ACE_THROW_SPEC ((CORBA::SystemException));
char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 6463bd8e9ec..87d1eaf4c28 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -16,21 +16,21 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id
}
char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("Hello there!");
}
void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
void
-Hello::throw_exception (ACE_ENV_SINGLE_ARG_DECL)
+Hello::throw_exception (void)
ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException))
{
ACE_THROW (Test::MyException ());
@@ -42,23 +42,21 @@ Hello::call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Boolean result = me->call_back (ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return result;
}
// Nested sequence step 2 - This op called by the server on the client
-CORBA::Boolean
-Hello::call_back (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Boolean
+Hello::call_back (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- CORBA::Boolean result = server_->check_request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Boolean result = server_->check_request_id ();
return result;
-}
+}
// Nested sequence step 3 - This op called by the client on the server
-CORBA::Boolean
-Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean
+Hello::check_request_id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// The server request interceptor will have set this public static member
@@ -67,7 +65,7 @@ Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
CORBA::ULong
-Hello::drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
+Hello::drop_down_dead (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return server_id_;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index 4967689c88a..b5baaba20d3 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -22,27 +22,27 @@ public:
Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
// = The skeleton methods
- virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void throw_exception (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void throw_exception (void)
ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException));
-
+
virtual CORBA::Boolean call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
-
- virtual CORBA::Boolean call_back (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual CORBA::Boolean call_back (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-
- virtual CORBA::Boolean check_request_id (ACE_ENV_SINGLE_ARG_DECL)
+
+ virtual CORBA::Boolean check_request_id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::ULong drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::ULong drop_down_dead (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-
+
static CORBA::Boolean ids_differ_;
private:
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index e371cd8c9be..0488fe02fd0 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -25,7 +25,6 @@ Server_ORBInitializer::post_init (
{
this->register_server_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -46,7 +45,6 @@ Server_ORBInitializer::register_server_request_interceptors (
info->add_server_request_interceptor (server_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index f7a7b408be7..33e57738b74 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -25,7 +25,6 @@ Server_ORBInitializer2::post_init (
{
this->register_server_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -46,7 +45,6 @@ Server_ORBInitializer2::register_server_request_interceptors (
info->add_server_request_interceptor (server_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index 3ace3eaea71..d956bb9a2cf 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -27,14 +27,14 @@ TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
char *
-TAO249_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor");
}
void
-TAO249_ServerRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -55,14 +55,12 @@ TAO249_ServerRequest_Interceptor::receive_request (
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var op = ri->operation ();
ACE_TRY
{
IOP::ServiceContext_var sc =
ri->get_request_service_context (IOP::FT_REQUEST
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_InputCDR cdr (reinterpret_cast <const char*>
(sc->context_data.get_buffer ()),
@@ -75,7 +73,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
CORBA::COMPLETED_NO));
}
- ACE_TRY_CHECK;
cdr.reset_byte_order (static_cast <int> (byte_order));
@@ -84,10 +81,9 @@ ACE_THROW_SPEC ((CORBA::SystemException,
if ((cdr >> ftrsc) == 0)
ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
-
- ACE_DEBUG ((LM_DEBUG, "TAO249_ServerRequest_Interceptor::receive_request (%P|%t) called for method: %s ... client retention id is: %d\n", op.in (), ftrsc.retention_id ));
-
+
+ ACE_DEBUG ((LM_DEBUG, "TAO249_ServerRequest_Interceptor::receive_request (%P|%t) called for method: %s ... client retention id is: %d\n", op.in (), ftrsc.retention_id ));
+
if (client_id_ == 0)
{
client_id_ = ftrsc.retention_id;
@@ -103,17 +99,16 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Same client retention id has been used for TWO consecutive independent invocations!!\n"));
Hello::ids_differ_ = 0;
}
- }
+ }
}
ACE_CATCHANY
{
ACE_DEBUG ((LM_ERROR, "Unexpected (non regression) error - test failed\n"));
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
+ "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
ACE_RE_THROW;
}
ACE_ENDTRY;
-ACE_CHECK;
}
@@ -142,4 +137,4 @@ ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
-
+
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index fdccf530614..1800e5431f3 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -45,10 +45,10 @@ TAO249_ServerRequest_Interceptor (void);
*/
//@{
/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
@@ -83,7 +83,7 @@ virtual void send_other (
private:
CORBA::ORB_var orb_;
-
+
CORBA:: Long client_id_;
};
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index cc63dbf287e..fd55b0fc0cb 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -30,14 +30,14 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
char *
-TAO249_ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
}
void
-TAO249_ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -58,22 +58,20 @@ TAO249_ServerRequest_Interceptor2::receive_request (
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::String_var op = ri->operation ();
if (ACE_OS::strcmp (op.in (), "drop_down_dead"))
{
- // bail if not the op we are interested in -
+ // bail if not the op we are interested in -
// avoid excess spurious error clutter when client calls ::shutdown
return;
}
- ACE_CHECK;
ACE_TRY
{
IOP::ServiceContext_var sc =
ri->get_request_service_context (IOP::FT_REQUEST
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_InputCDR cdr (reinterpret_cast <const char*>
(sc->context_data.get_buffer ()
@@ -87,7 +85,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
CORBA::COMPLETED_NO));
}
- ACE_TRY_CHECK;
cdr.reset_byte_order (static_cast <int>(byte_order));
@@ -96,11 +93,10 @@ ACE_THROW_SPEC ((CORBA::SystemException,
if ((cdr >> ftrsc) == 0)
ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
CORBA::COMPLETED_NO));
- ACE_TRY_CHECK;
FILE* last_exp_time_file = ACE_OS::fopen ("last_expiration_time", "r+");
TimeBase::TimeT last_exp_time = 0;
-
+
if (!last_exp_time_file)
{
// file does not exist ... we're the first server
@@ -126,14 +122,14 @@ ACE_THROW_SPEC ((CORBA::SystemException,
return;
}
-
+
// This is the offset from UTC to posix - a value less than than this will
// indicate posix is (mistakenly) being used
TimeBase::TimeT the_seventies = ACE_UINT64_LITERAL (0x1B21DD213814000);
-
+
// @warning - this test is fragile. It will break in 2358 A.D. :-)
if (last_exp_time <= the_seventies)
- {
+ {
ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Expiration time is in wrong format - it is before 1970 A.D. !!\n"));
ACE_DEBUG ((LM_DEBUG, "Expiration time: %Q\n", last_exp_time));
ACE_DEBUG ((LM_DEBUG, "1970 A.D. : %Q\n", the_seventies));
@@ -148,7 +144,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
}
TimeBase::TimeT now = get_now ();
-
+
if (now > last_exp_time)
{
// We have passed the exp time... there should be no more retries received after this point...
@@ -158,7 +154,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
TimeBase::TimeT last_expired_attempt = 0;
ACE_OS::fread (&last_expired_attempt, 1, sizeof (TimeBase::TimeT), no_more_retries);
ACE_OS::fclose (no_more_retries);
-
+
// There has already been an attempt after the last server passed the expiration time
ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Client ORB is still retrying after the expiration time!!\n"));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Expiration time : %Q\n"), last_exp_time));
@@ -175,7 +171,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ACE_OS::fclose (no_more_retries);
}
}
-
+
// Everthing is fine so far. Write out the expiration time for the next server to check
ACE_OS::fwrite (&ftrsc.expiration_time, 1, sizeof (TimeBase::TimeT), last_exp_time_file);
ACE_OS::fflush (last_exp_time_file);
@@ -192,7 +188,6 @@ ACE_CATCHANY
ACE_RE_THROW;
}
ACE_ENDTRY;
-ACE_CHECK;
}
@@ -204,7 +199,7 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
// Now in posix
ACE_Time_Value time_value = ACE_OS::gettimeofday ();
-
+
TimeBase::TimeT sec_part = time_value.sec ();
sec_part = sec_part * 10000000;
TimeBase::TimeT usec_part = time_value.usec ();
@@ -237,4 +232,4 @@ ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
}
-
+
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 74a92c7e0ed..96e13482d73 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -46,10 +46,10 @@ TAO249_ServerRequest_Interceptor2 (void);
*/
//@{
/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
@@ -88,7 +88,7 @@ protected:
private:
CORBA::ORB_var orb_;
-
+
CORBA::Long client_id_;
};
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 60c37b8dff5..c5996a69fb1 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -43,18 +43,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Hello_var hello =
Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (hello.in ()))
{
@@ -63,14 +60,12 @@ main (int argc, char *argv[])
ior),
1);
}
-
+
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,8 +73,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -91,15 +85,13 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(hello_impl);
Test::Hello_var me =
- hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello_impl->_this ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
ACE_TRY
{
- hello->throw_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+ hello->throw_exception ();
}
ACE_CATCH (Test::MyException, my_ex)
{
@@ -107,15 +99,12 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "Client catches a MyException, as expected. No problem !\n"));
}
ACE_ENDTRY;
-
+
result = ! hello->call_me_back (me.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->shutdown ();
+
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 682b0d8f86f..25417c2c041 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -53,7 +53,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
CORBA::Object_var new_ref =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Property values
@@ -78,7 +77,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Set the primary
// See we are setting the second ior as the primary
@@ -88,7 +86,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
refs[0],
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return new_ref._retn ();
@@ -102,7 +99,6 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -112,12 +108,10 @@ main (int argc, char *argv[])
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow
iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Hello_ptr *servers = new Test::Hello_ptr [number_of_servers];
@@ -130,11 +124,9 @@ main (int argc, char *argv[])
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
servers[i] =
Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (servers[i]))
{
@@ -146,7 +138,6 @@ main (int argc, char *argv[])
}
CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, servers ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Hello_var hello_iogr = Test::Hello::_narrow(iogr.in () ACE_ENV_ARG_PARAMETER);
@@ -154,7 +145,7 @@ main (int argc, char *argv[])
ACE_TRY
{
- last_server = hello_iogr->drop_down_dead (ACE_ENV_SINGLE_ARG_PARAMETER);
+ last_server = hello_iogr->drop_down_dead ();
// If the call 'succeeds' the server has identified a regression.
result = 1;
ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified by server %u. Test Failed !!\n", last_server));
@@ -173,8 +164,7 @@ main (int argc, char *argv[])
{
ACE_TRY
{
- servers[j]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servers[j]->shutdown ();
}
ACE_CATCHALL
{
@@ -192,8 +182,7 @@ main (int argc, char *argv[])
delete [] servers;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 8c27291400e..7cf8f501442 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Hello,
const char *ior_output_file = "test.ior";
TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-
+
int
parse_args (int argc, char *argv[])
{
@@ -52,10 +52,9 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
iors.length(1);
iors [0] = CORBA::Object::_duplicate (ref);
-
+
CORBA::Object_var new_ref =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Property values
@@ -80,7 +79,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Set the primary
// See we are setting the second ior as the primary
@@ -90,7 +88,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
new_ref.in (),
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return new_ref._retn ();
@@ -110,19 +107,15 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,9 +123,8 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+ root_poa->the_POAManager ();
+
CORBA::PolicyList policies (2);
policies.length (2);
@@ -144,21 +136,18 @@ main (int argc, char *argv[])
policies[1] =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var my_poa =
root_poa->create_POA ("my_poa",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
@@ -169,42 +158,35 @@ main (int argc, char *argv[])
ACE_NEW_RETURN (hello_impl,
Hello (orb.in (), Test::Hello::_nil ()),
1);
-
+
PortableServer::ObjectId_var server_id =
PortableServer::string_to_ObjectId ("server_id");
my_poa->activate_object_with_id (server_id.in (),
hello_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var hello =
my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::String_var ior =
orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
// Get a ref to the IORManipulation object
CORBA::Object_var IORM =
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow
iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()) ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::String_var iorgr_string =
orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
// Output the IOR to the <ior_output_file>
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
if (output_file == 0)
@@ -214,20 +196,16 @@ main (int argc, char *argv[])
1);
ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
ACE_OS::fclose (output_file);
-
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
+
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 43a23d567ec..026d111275d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (Hello,
const char *ior_output_file = "";
CORBA::ULong my_id_number = 0;
-
+
int
parse_args (int argc, char *argv[])
{
@@ -32,7 +32,7 @@ parse_args (int argc, char *argv[])
case 'n':
my_id_number = (CORBA::ULong) ACE_OS::atoi (get_opts.opt_arg ());
ior_file += get_opts.opt_arg ();
- ior_file += ".ior";
+ ior_file += ".ior";
ior_output_file = CORBA::string_dup (ior_file.c_str ());
break;
case '?':
@@ -65,19 +65,15 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -85,9 +81,8 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+ root_poa->the_POAManager ();
+
CORBA::PolicyList policies (2);
policies.length (2);
@@ -99,21 +94,18 @@ main (int argc, char *argv[])
policies[1] =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var my_poa =
root_poa->create_POA ("my_poa",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
@@ -124,23 +116,20 @@ main (int argc, char *argv[])
ACE_NEW_RETURN (hello_impl,
Hello (orb.in (), Test::Hello::_nil (), my_id_number),
1);
-
+
PortableServer::ObjectId_var server_id =
PortableServer::string_to_ObjectId ("server_id");
my_poa->activate_object_with_id (server_id.in (),
hello_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var hello =
my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::String_var ior =
orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
// Output the IOR to the <ior_output_file>
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
if (output_file == 0)
@@ -150,18 +139,14 @@ main (int argc, char *argv[])
1);
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
-
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
+
+ orb->run ();
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index 995e0eeed0d..fc0e31497b0 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -11,21 +11,21 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
}
void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
void
-Hello::ping (ACE_ENV_SINGLE_ARG_DECL)
+Hello::ping (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return;
}
void
-Hello::throw_location_forward (ACE_ENV_SINGLE_ARG_DECL)
+Hello::throw_location_forward (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index c1d688daa82..7f8559b39ee 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -22,15 +22,15 @@ public:
Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
// = The skeleton methods
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void ping (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void throw_location_forward (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void throw_location_forward (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-
+
private:
/// Use an ORB reference to conver strings to objects and shutdown
/// the application.
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index f7a7b408be7..33e57738b74 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -25,7 +25,6 @@ Server_ORBInitializer2::post_init (
{
this->register_server_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -46,7 +45,6 @@ Server_ORBInitializer2::register_server_request_interceptors (
info->add_server_request_interceptor (server_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index 226898bcf40..b30e66e2e90 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -33,14 +33,14 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
}
char *
-TAO249_ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
}
void
-TAO249_ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -61,7 +61,7 @@ TAO249_ServerRequest_Interceptor2::receive_request (
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::String_var op = ri->operation ();
if (ACE_OS::strcmp (op.in (), "throw_location_forward"))
{
@@ -74,7 +74,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
IOP::ServiceContext_var sc =
ri->get_request_service_context (IOP::FT_REQUEST
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_InputCDR cdr (reinterpret_cast <const char*>
(sc->context_data.get_buffer ()
@@ -88,7 +87,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
CORBA::COMPLETED_NO));
}
- ACE_CHECK;
cdr.reset_byte_order (static_cast <int>(byte_order));
@@ -97,7 +95,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
if ((cdr >> ftrsc) == 0)
ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
CORBA::COMPLETED_NO));
- ACE_CHECK;
TimeBase::TimeT now = get_now ();
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index b7767f6d798..9a14b9819e9 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -46,10 +46,10 @@ TAO249_ServerRequest_Interceptor2 (void);
*/
//@{
/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
@@ -90,7 +90,7 @@ protected:
private:
CORBA::ORB_var orb_;
-
+
CORBA::Boolean expired_;
};
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index efc5c8c1da7..2b6af000518 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -43,18 +43,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Hello_var hello =
Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (hello.in ()))
{
@@ -65,14 +62,12 @@ main (int argc, char *argv[])
}
// Check this isn't generating transients for any other reason
- hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->ping ();
ACE_TRY
{
- hello->throw_location_forward (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->throw_location_forward ();
ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
result = 1;
@@ -84,11 +79,9 @@ main (int argc, char *argv[])
}
ACE_ENDTRY;
- hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index eca1cfc94de..33418851873 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Hello,
const char *ior_output_file = "test.ior";
TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-
+
int
parse_args (int argc, char *argv[])
{
@@ -52,10 +52,9 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
iors.length(1);
iors [0] = CORBA::Object::_duplicate (ref);
-
+
CORBA::Object_var new_ref =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Property values
@@ -80,7 +79,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Set the primary
// See we are setting the second ior as the primary
@@ -90,7 +88,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
new_ref.in (),
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return new_ref._retn ();
@@ -110,19 +107,15 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,9 +123,8 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+ root_poa->the_POAManager ();
+
CORBA::PolicyList policies (2);
policies.length (2);
@@ -144,21 +136,18 @@ main (int argc, char *argv[])
policies[1] =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var my_poa =
root_poa->create_POA ("my_poa",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
@@ -169,42 +158,35 @@ main (int argc, char *argv[])
ACE_NEW_RETURN (hello_impl,
Hello (orb.in (), Test::Hello::_nil ()),
1);
-
+
PortableServer::ObjectId_var server_id =
PortableServer::string_to_ObjectId ("server_id");
my_poa->activate_object_with_id (server_id.in (),
hello_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var hello =
my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::String_var ior =
orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
// Get a ref to the IORManipulation object
CORBA::Object_var IORM =
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow
iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()) ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
CORBA::String_var iorgr_string =
orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
// Output the IOR to the <ior_output_file>
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
if (output_file == 0)
@@ -214,22 +196,18 @@ main (int argc, char *argv[])
1);
ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
ACE_OS::fclose (output_file);
-
+
TAO249_ServerRequest_Interceptor2::server_iogr_ = CORBA::Object::_duplicate (iogr.in ());
-
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
+
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index aecebcc023c..ee558cc3923 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -13,21 +13,21 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
}
void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
void
-Hello::ping (ACE_ENV_SINGLE_ARG_DECL)
+Hello::ping (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return;
}
CORBA::Boolean
-Hello::has_ft_request_service_context (ACE_ENV_SINGLE_ARG_DECL)
+Hello::has_ft_request_service_context (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return ServerRequest_Interceptor2::has_ft_request_sc_;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index 86970a50d5d..bfe3791b6c8 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -22,13 +22,13 @@ public:
Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
// = The skeleton methods
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void ping (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean has_ft_request_service_context (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean has_ft_request_service_context (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index c8a55def2a9..177b1e0a697 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -25,7 +25,6 @@ Server_ORBInitializer2::post_init (
{
this->register_server_request_interceptors (info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -46,7 +45,6 @@ Server_ORBInitializer2::register_server_request_interceptors (
info->add_server_request_interceptor (server_interceptor.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 3b118e75591..14e723c7bda 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -32,14 +32,14 @@ ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void)
}
char *
-ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequest_Interceptor2::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("ServerRequest_Interceptor2");
}
void
-ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequest_Interceptor2::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -60,7 +60,7 @@ ServerRequest_Interceptor2::receive_request (
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::ForwardRequest))
{
- CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::String_var op = ri->operation ();
if (ACE_OS::strcmp (op.in (), "has_ft_request_service_context"))
{
@@ -74,7 +74,6 @@ ACE_THROW_SPEC ((CORBA::SystemException,
IOP::ServiceContext_var sc =
ri->get_request_service_context (IOP::FT_REQUEST
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// No exception therefore there was a context
has_ft_request_sc_ = true;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 549c8df7fdf..2d766c66d99 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -45,10 +45,10 @@ ServerRequest_Interceptor2 (void);
*/
//@{
/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 1f9be0a55a1..287e479a1c1 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -46,7 +46,6 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -54,11 +53,9 @@ main (int argc, char *argv[])
// First perform the test with an IOR
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Hello_var hello =
Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (hello.in ()))
{
@@ -69,10 +66,9 @@ main (int argc, char *argv[])
}
// Check this isn't generating exceptions for any other reason
- hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->ping ();
- if (hello->has_ft_request_service_context (ACE_ENV_SINGLE_ARG_PARAMETER))
+ if (hello->has_ft_request_service_context ())
{
ACE_DEBUG ((LM_ERROR, "ERROR - REGRESSION - Request made on a plain IOR has a FT_REQUEST service context.\n" ));
result = 1;
@@ -85,11 +81,9 @@ main (int argc, char *argv[])
// Now repeat the test (for the converse result) with an IOGR
tmp =
orb->string_to_object(iogr ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
hello =
Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (hello.in ()))
{
@@ -100,10 +94,9 @@ main (int argc, char *argv[])
}
// Check this isn't generating transients for any other reason
- hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->ping ();
- if (! hello->has_ft_request_service_context (ACE_ENV_SINGLE_ARG_PARAMETER))
+ if (! hello->has_ft_request_service_context ())
{
ACE_DEBUG ((LM_ERROR, "ERROR - REGRESSION - Request made on an IOGR has no FT_REQUEST service context.\n" ));
result = 1;
@@ -113,11 +106,9 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "Request made on an IOGR has a FT_REQUEST service context. This is OK.\n" ));
}
- hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index fb31b3d6683..88a5a9dbab5 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -58,7 +58,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
CORBA::Object_var new_ref =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Property values
@@ -83,7 +82,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Set the primary
// See we are setting the second ior as the primary
@@ -93,7 +91,6 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
new_ref.in (),
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return new_ref._retn ();
@@ -113,19 +110,15 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -133,8 +126,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
CORBA::PolicyList policies (2);
policies.length (2);
@@ -147,21 +139,18 @@ main (int argc, char *argv[])
policies[1] =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var my_poa =
root_poa->create_POA ("my_poa",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
@@ -179,15 +168,12 @@ main (int argc, char *argv[])
my_poa->activate_object_with_id (server_id.in (),
hello_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var hello =
my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
if (output_file == 0)
@@ -204,19 +190,15 @@ main (int argc, char *argv[])
orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow
iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()) ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var iorgr_string =
orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the IOR to the <iogr_output_file>
output_file = ACE_OS::fopen (iogr_output_file, "w");
@@ -228,19 +210,15 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index a735418a945..53e94cc0db5 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -51,7 +51,6 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
CORBA::Object_var new_ref =
this->iorm_->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Property values
@@ -75,7 +74,6 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
CORBA::Boolean retval = this->iorm_->set_property (&iogr_prop,
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Set the primary
// See we are setting the second ior as the primary
@@ -83,7 +81,6 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
remote_server.in (),
new_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return new_ref._retn ();
}
@@ -98,27 +95,21 @@ int Client_Task::svc (void)
corb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow
this->iorm_ =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var iorgr_string =
corb_->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
corb_->string_to_object (iorgr_string.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_var server =
Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -131,14 +122,12 @@ int Client_Task::svc (void)
Test_var remote_server_as_test =
Test::_narrow (remote_server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var collocated_server(
corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
Test_var collocated_server_as_test =
Test::_narrow (collocated_server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!collocated_server->_is_collocated())
{ // Collocation is disabled, just skip the test - it has no sense.
@@ -153,8 +142,7 @@ int Client_Task::svc (void)
// Because we are using TRANSIENT objects with the SYSTEM_ID policy
// the object keys won't match so the POA won't be able to dispatch locally.
// This wouldn't work with 'direct' collocation strategy but the default is 'through poa'.
- server->myMethod (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->myMethod ();
}
ACE_CATCHANY
{
@@ -164,11 +152,9 @@ int Client_Task::svc (void)
ACE_ENDTRY;
}
- remote_server_as_test->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ remote_server_as_test->shutdown();
- collocated_server_as_test->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ collocated_server_as_test->shutdown();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index 1b5dad7d41f..07b0cf172c3 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -24,38 +24,31 @@ Server_Task::svc (void)
{
CORBA::Object_var poa_object =
sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
TestImpl * server_impl = 0;
ACE_NEW_RETURN (server_impl, TestImpl (sorb_.in ()), 1);
PortableServer::ObjectId_var id =
root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var test_obj =
root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_var server = Test::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER);
CORBA::String_var ior =
sorb_->object_to_string (test_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the IOR to the <ior_output_file>
FILE *output_file= ACE_OS::fopen (output_, "w");
@@ -70,13 +63,11 @@ Server_Task::svc (void)
// Signal the main thread before we call orb->run ();
this->me_.signal ();
- this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->sorb_->run ();
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index e81edb9b66e..2f7fb7e268b 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -8,16 +8,16 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
{
}
-// virtual
-void TestImpl::myMethod (ACE_ENV_SINGLE_ARG_DECL)
+// virtual
+void TestImpl::myMethod (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
}
-// virtual
-void TestImpl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+// virtual
+void TestImpl::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Give the client thread time to return from the collocated
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index fae8f7d2b8d..caf61465a18 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -10,10 +10,10 @@ public:
TestImpl (CORBA::ORB_ptr orb);
// = The skeleton methods
- virtual void myMethod (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void myMethod (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index 644645faa3c..5f93bbbe971 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -68,7 +68,6 @@ main (int argc, char * argv [])
satc.get_TCHAR_argv (),
server_orb.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Argv_Type_Converter catc (argc, argv);
CORBA::ORB_var corb =
@@ -76,7 +75,6 @@ main (int argc, char * argv [])
catc.get_TCHAR_argv (),
client_orb.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
{
ACE_Manual_Event me;
@@ -110,8 +108,7 @@ main (int argc, char * argv [])
ACE_Thread_Manager::instance ()->wait ();
}
- sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sorb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
index a7cf486602f..7b35bc002ee 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -52,9 +52,8 @@ main (int argc, char *argv[])
ACE_Argv_Type_Converter satc (argc, argv);
CORBA::ORB_var sorb =
CORBA::ORB_init (satc.get_argc (),
- satc.get_TCHAR_argv ()
+ satc.get_TCHAR_argv ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
{
ACE_Manual_Event me;
@@ -77,8 +76,7 @@ main (int argc, char *argv[])
ACE_Thread_Manager::instance ()->wait ();
}
- sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sorb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 93760c93800..3cd10a0b62b 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -370,7 +370,6 @@ CC_Client::init_naming_service (void)
-1);
this->naming_service_->Init (this->orb_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -395,7 +394,6 @@ CC_Client::init (int argc, char **argv)
this->argv_,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -419,14 +417,12 @@ CC_Client::init (int argc, char **argv)
CORBA::Object_var factory_object =
this->orb_->string_to_object (this->cc_factory_key_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#if 0
// The test cannot currently run without the naming service.
this->factory_ =
CosConcurrencyControl::LockSetFactory::_narrow
(factory_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->factory_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index fda16fbaa42..0975b4b985a 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -59,12 +59,10 @@ CC_Command::GetLockSet (const char *lock_set_name
CC_naming_service::Instance()->get_obj_from_name ("",
lock_set_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ccls_ret =
CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -175,7 +173,6 @@ int CC_CreateLockSet_Cmd::execute(void)
{
CC_naming_service::Instance()->bind_name(name_,
lock_set ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -225,10 +222,8 @@ int CC_Lock_Cmd::execute(void)
{
CosConcurrencyControl::LockSet_var ccls =
GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ccls->lock (mode_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -271,11 +266,9 @@ int CC_UnLock_Cmd::execute(void)
ACE_TRY
{
CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ccls->unlock (mode_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -321,11 +314,9 @@ int CC_TryLock_Cmd::execute(void)
ACE_TRY
{
CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
lock_not_held = ccls->try_lock (mode_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (lock_not_held)
{
@@ -386,11 +377,9 @@ int CC_ChangeMode_Cmd::execute(void)
ACE_TRY
{
CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ccls->change_mode (held_mode_, new_mode_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -583,15 +572,12 @@ CC_Lookup_Cmd::execute(void)
CC_naming_service::Instance()->get_obj_from_name ("",
name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosConcurrencyControl::LockSet_var ccls =
CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
cc_lockset_ = ccls;
- ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index d12cb0d1e94..79825ac4384 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -30,7 +30,6 @@ CC_naming_service::CC_naming_service (CORBA::ORB_var orb
factory_ (0)
{
this->Init(orb ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
instance_ = this;
}
@@ -86,7 +85,6 @@ CC_naming_service::get_obj_from_name (const char *c_name,
ns_name.length (1);
ns_name[0].id = CORBA::string_dup (name);
obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
@@ -95,7 +93,6 @@ CC_naming_service::get_obj_from_name (const char *c_name,
ns_name[0].id = CORBA::string_dup (c_name);
ns_name[1].id = CORBA::string_dup (name);
obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if (CORBA::is_nil (obj.in ()) )
ACE_DEBUG((LM_DEBUG,
@@ -127,7 +124,6 @@ CC_naming_service::bind_name (const char *n,
my_name_client_->bind (ns_name,
obj
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -159,12 +155,10 @@ CC_naming_service::init_naming_service (void)
CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
"LockSetFactory"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->factory_ =
CosConcurrencyControl::LockSetFactory::_narrow
(factory_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->factory_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index f88b2b65f7e..23fdb762071 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -54,8 +54,7 @@ CC_TestUtils::create_lock_set (void)
ACE_TRY
{
lock_set =
- CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CC_naming_service::Instance()->get_lock_set_factory ()->create ();
if (CORBA::is_nil (lock_set))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 5dfccef2eb5..6b7fb36dc56 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -43,8 +43,7 @@ CC_Test::create_lock_set (void)
ACE_TRY
{
lock_set =
- this->naming_service_->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->naming_service_->get_lock_set_factory ()->create ();
if (CORBA::is_nil (lock_set))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -108,14 +107,12 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
{
cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"%s lock set\n",
get_lock_mode_name (mode_)));
lock_not_held = cc_lock_set_->try_lock (mode_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (lock_not_held)
{
@@ -137,7 +134,6 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
lock_not_held = cc_lock_set_->try_lock (mode_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (lock_not_held)
ACE_DEBUG ((LM_DEBUG,
@@ -188,14 +184,12 @@ Test_Setup_LockSet::run (int /* times_to_run */)
create_lock_set ();
this->naming_service_->bind_name (my_name_, cc_lock_set_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Name bound\n"));
cc_lock_set_->lock (CosConcurrencyControl::read
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Read lock set\n"));
@@ -235,16 +229,13 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
this->naming_service_->get_obj_from_name (const_cast<char *> (""),
my_name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosConcurrencyControl::LockSet_var ccls =
CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ccls->lock (CosConcurrencyControl::read
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -281,12 +272,10 @@ Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
CORBA::Object_var ccls_obj =
this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosConcurrencyControl::LockSet_var ccls =
CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ccls->unlock (CosConcurrencyControl::read
ACE_ENV_ARG_PARAMETER);
@@ -327,7 +316,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
{
// lock the lock
cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"%s lock set\n",
@@ -364,7 +352,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
"attemptet to release %s lock\n",
get_lock_mode_name (mode_)));
- ACE_TRY_CHECK;
}
ACE_CATCH(CosConcurrencyControl::LockNotHeld, userex)
{
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 5e8ce733528..25506efbbc1 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -26,35 +26,26 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
@@ -73,13 +64,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -91,24 +79,20 @@ run_test (PortableServer::POA_ptr poa,
attributes.disconnect_callbacks = use_callbacks;
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_consumers ();
// and the supplier admin..
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -123,50 +107,36 @@ run_test (PortableServer::POA_ptr poa,
{
supplier_0.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_0.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i % 2 == 1)
{
supplier_1.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
- supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_0.disconnect ();
+ consumer_0.disconnect ();
if (i % 2 == 1)
{
- consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_1.disconnect ();
+ supplier_1.disconnect ();
}
}
supplier_0.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_0.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->destroy ();
deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong count_0 = 1;
CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 0c94a7bdb15..7e024dc3b18 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -26,35 +26,26 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
@@ -73,13 +64,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -91,12 +79,10 @@ run_test (PortableServer::POA_ptr poa,
attributes.disconnect_callbacks = use_callbacks;
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl._this ();
MTD_Task task (event_channel.in (), use_callbacks);
@@ -108,11 +94,9 @@ run_test (PortableServer::POA_ptr poa,
// Wait for all the threads to complete and the return
ACE_Thread_Manager::instance ()->wait ();
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->destroy ();
deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
MTD_Task::MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
@@ -130,8 +114,7 @@ MTD_Task::svc ()
{
ACE_TRY_NEW_ENV
{
- this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run_iteration ();
}
ACE_CATCHANY
{
@@ -143,17 +126,15 @@ MTD_Task::svc ()
}
void
-MTD_Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+MTD_Task::run_iteration (void)
{
// Obtain the consumer admin..
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel->for_consumers ();
// and the supplier admin..
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel->for_suppliers ();
// ****************************************************************
@@ -168,37 +149,27 @@ MTD_Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
{
supplier_0.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_0.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i % 2 == 1)
{
supplier_1.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
- supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_0.disconnect ();
+ consumer_0.disconnect ();
if (i % 2 == 1)
{
- consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_1.disconnect ();
+ supplier_1.disconnect ();
}
}
deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong count_0 = 0;
CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 1248ee1b8ff..e0799f95255 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -34,7 +34,7 @@ public:
// = Check the ACE_Task_Base documentation.
int svc (void);
- void run_iteration (ACE_ENV_SINGLE_ARG_DECL);
+ void run_iteration (void);
// Run a single iteration of the test
private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index abaa9184f9b..c3c42b529e7 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -21,19 +21,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -41,24 +36,20 @@ main (int argc, char* argv[])
poa.in ());
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -68,7 +59,6 @@ main (int argc, char* argv[])
supplier_00.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -76,7 +66,6 @@ main (int argc, char* argv[])
supplier_01.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -84,7 +73,6 @@ main (int argc, char* argv[])
supplier_10.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -92,7 +80,6 @@ main (int argc, char* argv[])
supplier_11.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -101,21 +88,18 @@ main (int argc, char* argv[])
CEC_Counting_Consumer consumer_00 ("Consumer/00");
consumer_00.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01");
consumer_01.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10");
consumer_10.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -174,36 +158,26 @@ main (int argc, char* argv[])
// ****************************************************************
- consumer_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_10.disconnect ();
- consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_01.disconnect ();
- consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_00.disconnect ();
- supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_11.disconnect ();
+ supplier_10.disconnect ();
+ supplier_01.disconnect ();
+ supplier_00.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 3ff9f720233..9535308ef8f 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -21,19 +21,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -41,24 +36,20 @@ main (int argc, char* argv[])
poa.in ());
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -68,7 +59,6 @@ main (int argc, char* argv[])
supplier_00.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -76,7 +66,6 @@ main (int argc, char* argv[])
supplier_01.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -84,7 +73,6 @@ main (int argc, char* argv[])
supplier_10.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -92,7 +80,6 @@ main (int argc, char* argv[])
supplier_11.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -101,14 +88,12 @@ main (int argc, char* argv[])
CEC_Counting_Consumer consumer_00 ("Consumer/00");
consumer_00.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
CEC_Counting_Consumer consumer_01 ("Consumer/01");
consumer_01.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -147,33 +132,24 @@ main (int argc, char* argv[])
// ****************************************************************
- consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_01.disconnect ();
- consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_00.disconnect ();
- supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_11.disconnect ();
+ supplier_10.disconnect ();
+ supplier_01.disconnect ();
+ supplier_00.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 0c5aea70a2f..b0f24061faa 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -25,13 +25,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var oid =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -51,7 +48,6 @@ RND_Driver::run (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -108,15 +104,11 @@ RND_Driver::run (int argc, char *argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -126,30 +118,25 @@ RND_Driver::run (int argc, char *argv[])
attributes.supplier_reconnect = 1;
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
this->consumer_admin_ =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
this->supplier_admin_ =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
this->supplier_.connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -163,8 +150,7 @@ RND_Driver::run (int argc, char *argv[])
1);
CORBA::Object_var obj =
- this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumers_[i]->_this ();
}
// ****************************************************************
@@ -180,8 +166,7 @@ RND_Driver::run (int argc, char *argv[])
this->suppliers_[j]->activate ();
CORBA::Object_var obj =
- this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->suppliers_[j]->_this ();
}
// ****************************************************************
@@ -190,8 +175,7 @@ RND_Driver::run (int argc, char *argv[])
{
ACE_Time_Value tv (0, 50000);
orb->run (tv);
- this->supplier_.push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->supplier_.push_new_event ();
}
ACE_Thread_Manager::instance ()->wait ();
@@ -203,9 +187,7 @@ RND_Driver::run (int argc, char *argv[])
{
deactivate_servant (this->suppliers_[k]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->suppliers_[k]->_remove_ref ();
}
delete[] this->suppliers_;
this->suppliers_ = 0;
@@ -215,8 +197,7 @@ RND_Driver::run (int argc, char *argv[])
// We destroy now to verify that the callbacks work and do not
// produce any problems.
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
@@ -225,9 +206,7 @@ RND_Driver::run (int argc, char *argv[])
{
deactivate_servant (this->consumers_[k]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumers_[k]->_remove_ref ();
}
delete[] this->consumers_;
this->consumers_ = 0;
@@ -237,17 +216,14 @@ RND_Driver::run (int argc, char *argv[])
deactivate_servant (&ec_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -282,7 +258,6 @@ RND_Driver::timer (const CORBA::Any &e
recursion++;
new_event <<= recursion;
this->supplier_.push (new_event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
break;
@@ -303,7 +278,6 @@ RND_Driver::timer (const CORBA::Any &e
this->suppliers_[n]->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
break;
@@ -315,7 +289,6 @@ RND_Driver::timer (const CORBA::Any &e
this->consumers_[n]->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
break;
@@ -325,8 +298,7 @@ RND_Driver::timer (const CORBA::Any &e
// ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
- this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[n]->disconnect ();
}
break;
@@ -336,8 +308,7 @@ RND_Driver::timer (const CORBA::Any &e
// ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
- this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[n]->disconnect ();
}
break;
}
@@ -362,29 +333,25 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
if (CORBA::is_nil (this->proxy_.in ()))
{
- this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_ = admin->obtain_push_supplier ();
}
proxy =
CosEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
}
CosEventComm::PushConsumer_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
proxy->connect_push_consumer (me.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Consumer::disconnect (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
if (CORBA::is_nil (this->proxy_.in ()))
return;
- this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_->disconnect_push_supplier ();
this->proxy_ =
CosEventChannelAdmin::ProxyPushSupplier::_nil ();
}
@@ -398,7 +365,7 @@ RND_Consumer::push (const CORBA::Any &event
}
void
-RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -415,8 +382,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
if (CORBA::is_nil (this->proxy_.in ()))
{
- this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_ = admin->obtain_push_consumer ();
}
proxy =
@@ -427,29 +393,26 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
int r = ACE_OS::rand () % 2;
if (r == 0)
{
- me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ me = this->_this ();
}
proxy->connect_push_supplier (me.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::disconnect (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
if (CORBA::is_nil (this->proxy_.in ()))
return;
- this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_->disconnect_push_consumer ();
this->proxy_ =
CosEventChannelAdmin::ProxyPushConsumer::_nil ();
}
void
-RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::push_new_event (void)
{
CORBA::Any event;
CORBA::Long recursion = 0;
@@ -477,7 +440,7 @@ RND_Supplier::push (CORBA::Any &event
}
void
-RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -496,8 +459,7 @@ RND_Supplier::svc (void)
ACE_Time_Value tv (0, 10000);
ACE_OS::sleep (tv);
- this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->push_new_event ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 0b26ea73695..38050b078d3 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -47,12 +47,12 @@ public:
void push (const CORBA::Any &event
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
protected:
RND_Driver *driver_;
@@ -106,14 +106,14 @@ public:
void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
- void push_new_event (ACE_ENV_SINGLE_ARG_DECL);
+ void push_new_event (void);
void push (CORBA::Any &event
ACE_ENV_ARG_DECL);
// Push a single event...
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual int svc (void);
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index 85ec4180e9f..eebd951a1cb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -24,35 +24,26 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -68,13 +59,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
static void
@@ -87,24 +75,20 @@ run_test (PortableServer::POA_ptr poa,
attributes.disconnect_callbacks = with_callbacks;
TAO_CEC_EventChannel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl.activate ();
CosEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -129,18 +113,15 @@ run_test (PortableServer::POA_ptr poa,
for (i = 0; i != n; ++i)
{
consumer[i]->connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier[i]->connect (supplier_admin.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// ****************************************************************
// Destroy the event channel, *before* disconnecting the
// clients.
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->destroy ();
// ****************************************************************
@@ -166,16 +147,13 @@ run_test (PortableServer::POA_ptr poa,
for (i = 0; i != n; ++i)
{
deactivate_servant (supplier[i] ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
delete supplier[i];
deactivate_servant (consumer[i] ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
delete consumer[i];
}
delete[] supplier;
delete[] consumer;
deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index a00607b040b..86e762bea0a 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -19,38 +19,31 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
// The canonical protocol to connect to the EC
CosEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
if (CORBA::is_nil (this->supplier_proxy_.in ()))
{
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
}
this->supplier_proxy_->connect_push_consumer (consumer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-CEC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer::disconnect (void)
{
if (!CORBA::is_nil (this->supplier_proxy_.in ()))
{
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
}
PortableServer::POA_var consumer_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var consumer_id =
consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_proxy_ =
CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -94,7 +87,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&
}
void
-CEC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
@@ -118,52 +111,45 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con
// The canonical protocol to connect to the EC
CosEventComm::PullConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
if (CORBA::is_nil (this->supplier_proxy_.in ()))
{
this->supplier_proxy_ =
- consumer_admin->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_pull_supplier ();
}
this->supplier_proxy_->connect_pull_consumer (consumer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-CEC_Pull_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::disconnect (void)
{
if (!CORBA::is_nil (this->supplier_proxy_.in ()))
{
- this->supplier_proxy_->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_pull_supplier ();
}
PortableServer::POA_var consumer_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var consumer_id =
consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_proxy_ =
CosEventChannelAdmin::ProxyPullSupplier::_nil ();
}
CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::pull (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ()))
{
return 0;
}
this->event_count++;
- return this->supplier_proxy_->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->supplier_proxy_->pull ();
}
CORBA::Any*
@@ -178,7 +164,6 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
CORBA::Any_var event =
this->supplier_proxy_->try_pull (has_event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (has_event)
this->event_count++;
@@ -207,7 +192,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
}
void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
@@ -232,8 +217,7 @@ CEC_Counting_Consumer_Task::svc ()
{
ACE_TRY_NEW_ENV
{
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -257,7 +241,7 @@ CEC_Counting_Consumer_Task::pull_count (void)
}
void
-CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer_Task::run (void)
{
CORBA::Any event;
event <<= CORBA::Long(0);
@@ -268,7 +252,6 @@ CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Any_var event =
this->consumer_->try_pull (has_event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->milliseconds_ != 0)
{
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index d3ec2cbbb33..fc5473649c5 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -41,7 +41,7 @@ public:
void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Simple connect/disconnect methods..
void dump_results (int expected_count, int tolerance);
@@ -53,7 +53,7 @@ public:
virtual void push (const CORBA::Any& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
@@ -87,19 +87,19 @@ public:
void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Simple connect/disconnect methods..
void dump_results (int expected_count, int tolerance);
// Print out an error message if the event count is too far from the
// expected count.
- CORBA::Any *pull (ACE_ENV_SINGLE_ARG_DECL);
+ CORBA::Any *pull (void);
CORBA::Any *try_pull (CORBA::Boolean_out has_event
ACE_ENV_ARG_DECL);
// = The CosEventComm::PullConsumer methods
- virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_pull_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
@@ -132,7 +132,7 @@ public:
void stop (void);
CORBA::ULong pull_count (void);
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
// Run a single iteration of the test
private:
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index b1f8e946266..5c26a242646 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -17,38 +17,31 @@ CEC_Counting_Supplier::connect (
ACE_ENV_ARG_DECL)
{
CosEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
if (CORBA::is_nil (this->consumer_proxy_.in ()))
{
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
}
this->consumer_proxy_->connect_push_supplier (supplier.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-CEC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Supplier::disconnect (void)
{
if (!CORBA::is_nil (this->consumer_proxy_.in ()))
{
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
}
PortableServer::POA_var supplier_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var supplier_id =
supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_proxy_ =
CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -66,12 +59,11 @@ CEC_Counting_Supplier::push (const CORBA::Any&
event <<= CORBA::Long(0);
this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_count++;
}
void
-CEC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
@@ -96,8 +88,7 @@ CEC_Counting_Supplier_Task::svc ()
{
ACE_TRY_NEW_ENV
{
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -121,7 +112,7 @@ CEC_Counting_Supplier_Task::push_count (void)
}
void
-CEC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Supplier_Task::run (void)
{
CORBA::Any event;
event <<= CORBA::Long(0);
@@ -129,7 +120,6 @@ CEC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
int stop = 0;
do {
this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->milliseconds_ != 0)
{
@@ -164,45 +154,38 @@ CEC_Pull_Counting_Supplier::connect (
ACE_ENV_ARG_DECL)
{
CosEventComm::PullSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
if (CORBA::is_nil (this->consumer_proxy_.in ()))
{
this->consumer_proxy_ =
- supplier_admin->obtain_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_pull_consumer ();
}
this->consumer_proxy_->connect_pull_supplier (supplier.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-CEC_Pull_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Supplier::disconnect (void)
{
if (!CORBA::is_nil (this->consumer_proxy_.in ()))
{
- this->consumer_proxy_->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_pull_consumer ();
}
PortableServer::POA_var supplier_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var supplier_id =
supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_proxy_ =
CosEventChannelAdmin::ProxyPullConsumer::_nil ();
}
CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Supplier::pull (void)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -248,7 +231,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
}
void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 5f557db27ee..0fa909e7315 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -43,7 +43,7 @@ public:
void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Simple connect/disconnect methods..
void push (const CORBA::Any& events
@@ -51,7 +51,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Push an event.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
@@ -79,7 +79,7 @@ public:
void stop (void);
CORBA::ULong push_count (void);
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
// Run a single iteration of the test
private:
@@ -117,16 +117,16 @@ public:
void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Simple connect/disconnect methods..
// The PullSupplier methods.
- CORBA::Any* pull (ACE_ENV_SINGLE_ARG_DECL)
+ CORBA::Any* pull (void)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
CORBA::Any* try_pull (CORBA::Boolean_out has_event
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
- virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_pull_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 7203f01d09c..9231a2a2b4c 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -51,11 +51,9 @@ Driver::run (int argc, char* argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -64,11 +62,9 @@ Driver::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (this->parse_args (argc, argv))
return 1;
@@ -125,7 +121,6 @@ Driver::run (int argc, char* argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -134,7 +129,6 @@ Driver::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -142,7 +136,6 @@ Driver::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var channel;
if (CORBA::is_nil (ec_obj.in ()))
@@ -150,27 +143,21 @@ Driver::run (int argc, char* argv[])
else
channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
this->connect_consumers (channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
ACE_DEBUG ((LM_DEBUG, "running the test\n"));
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_consumers ();
- channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ channel->destroy ();
}
ACE_CATCH (CORBA::SystemException, sys_ex)
{
@@ -295,17 +282,15 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
this->event_b_,
channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Driver::disconnect_consumers (void)
{
for (int i = 0; i < this->n_consumers_; ++i)
{
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
}
}
@@ -399,25 +384,21 @@ Test_Consumer::connect (int event_a,
// = Connect as a consumer.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
- RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushConsumer_var objref = this->_this ();
this->supplier_proxy_->connect_push_consumer (objref.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Consumer::disconnect (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ()))
return;
@@ -425,7 +406,7 @@ Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
this->supplier_proxy_._retn ();
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ proxy->disconnect_push_supplier ();
}
void
@@ -438,7 +419,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
}
void
-Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 1d0adde39fd..2be5bfea4a5 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -39,13 +39,13 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the consumer to the EC.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the EC.
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
@@ -92,7 +92,7 @@ private:
void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_consumers (void);
// Connect and disconnect the consumers.
private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index f8dd801aa63..27c53aa2123 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -39,11 +39,9 @@ ECMS_Driver::run (int argc, char* argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
@@ -51,11 +49,9 @@ ECMS_Driver::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (this->parse_args (argc, argv))
return 1;
@@ -115,7 +111,6 @@ ECMS_Driver::run (int argc, char* argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to get the Naming Service.\n"),
@@ -123,7 +118,6 @@ ECMS_Driver::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -131,7 +125,6 @@ ECMS_Driver::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var channel;
if (CORBA::is_nil (ec_obj.in ()))
@@ -139,18 +132,14 @@ ECMS_Driver::run (int argc, char* argv[])
else
channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
this->connect_suppliers (channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
- this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->activate_suppliers ();
ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -163,8 +152,7 @@ ECMS_Driver::run (int argc, char* argv[])
ACE_DEBUG ((LM_DEBUG, "suppliers finished\n"));
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_suppliers ();
// @@ Deactivate the suppliers (as CORBA Objects?)
}
@@ -270,7 +258,6 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
supplier->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
@@ -305,12 +292,11 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
this->event_b_,
channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECMS_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECMS_Driver::activate_suppliers (void)
{
for (int i = 0; i < this->n_suppliers_; ++i)
{
@@ -319,12 +305,11 @@ ECMS_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ECMS_Driver::disconnect_suppliers (void)
{
for (int i = 0; i < this->n_suppliers_; ++i)
{
- this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->disconnect ();
}
}
@@ -448,25 +433,21 @@ Test_Supplier::connect (const char* name,
0, 1);
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_suppliers ();
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var objref =
- this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_._this ();
this->consumer_proxy_->connect_push_supplier (objref.in (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
return;
@@ -476,8 +457,7 @@ Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy->disconnect_push_consumer ();
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
@@ -503,7 +483,7 @@ Test_Supplier::svc ()
}
void
-Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 10b3adb9270..ae25dbf779f 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -43,10 +43,10 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the EC.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The methods in the skeleton.
@@ -112,10 +112,10 @@ private:
void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_suppliers (void);
// Connect the suppliers.
- void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void activate_suppliers (void);
// Activate the suppliers, i.e. they start generating events.
private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 2ec6c650a2c..4513a0573ce 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -19,12 +19,10 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
ACE_ENV_ARG_DECL)
{
this->proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Simple subscription, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -44,17 +42,15 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
this->proxy_->connect_push_consumer (me.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
{
ACE_TRY
{
// Disconnect from the proxy
- this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -65,15 +61,12 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Deactivate the object
poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -98,7 +91,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index 1e1d9fdaa17..d02b498acc3 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -28,7 +28,7 @@ public:
ACE_ENV_ARG_DECL);
// Connect to the Event Channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the event channel
// = The RtecEventComm::PushConsumer methods
@@ -36,7 +36,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 5441a632e0e..34b30ae6448 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -38,8 +38,7 @@ run_orb_within_thread (void *)
ACE_TRY
{
CORBA::Boolean there_is_work =
- orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending ();
if (there_is_work)
{
// We use a TAO extension. The CORBA mechanism does not
@@ -48,7 +47,6 @@ run_orb_within_thread (void *)
// them results in a spin loop.
ACE_Time_Value tv (0, 50000);
orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -59,7 +57,6 @@ run_orb_within_thread (void *)
return 0;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (0);
}
return 0;
@@ -84,7 +81,6 @@ main (int argc, char* argv[])
// Create the ORB, pass the argv list for parsing.
orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse the arguments, you usually want to do this after
// invoking ORB_init() because ORB_init() will remove all the
@@ -102,15 +98,11 @@ main (int argc, char* argv[])
// it will not process any requests.
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// **************** THAT COMPLETES THE ORB SETUP
@@ -132,15 +124,13 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -176,8 +166,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ as_impl._this ();
// We need a local socket to send the data, open it and check
// that everything is OK:
@@ -200,7 +189,6 @@ main (int argc, char* argv[])
address_server.in (),
endpoint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now we connect the sender as a consumer of events, it will
// receive any event from any source and send it to the "right"
@@ -215,7 +203,6 @@ main (int argc, char* argv[])
ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
sender->connect (sub ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// To receive events we need to setup an event handler:
TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver;
@@ -235,7 +222,6 @@ main (int argc, char* argv[])
// events:
mcast_eh.open (event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Again the receiver connects to the event channel as a
// supplier of events, using the Observer features to detect
@@ -244,7 +230,6 @@ main (int argc, char* argv[])
endpoint,
address_server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The Receiver is also a supplier of events. The exact type of
// events is only known to the application, because it depends
@@ -264,7 +249,6 @@ main (int argc, char* argv[])
pub.is_gateway = 1;
receiver->connect (pub ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE FEDERATION SETUP
@@ -275,21 +259,16 @@ main (int argc, char* argv[])
Consumer consumer1;
Consumer consumer2;
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
consumer1.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer2.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// And now create a supplier
Supplier supplier;
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
supplier.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE CLIENT SETUP
@@ -307,8 +286,7 @@ main (int argc, char* argv[])
for (int i = 0; i < data_items; i++)
{
- supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.perform_push ();
}
ACE_OS::sleep (2); // simple solution ensures ready receivers
@@ -323,16 +301,12 @@ main (int argc, char* argv[])
// **************** HERE IS THE CLEANUP CODE
// First the easy ones
- supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer2.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.disconnect ();
+ consumer1.disconnect ();
+ consumer2.disconnect ();
// Now let us disconnect the Receiver
- receiver->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ receiver->shutdown ();
int r = mcast_eh.shutdown ();
@@ -343,14 +317,12 @@ main (int argc, char* argv[])
}
// And also disconnect the sender of events
- sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sender->shutdown ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivating the event channel implementation is not strictly
// required, the POA will do it for us, but it is good manners:
@@ -361,25 +333,20 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Deactivate the object
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Finally destroy the ORB
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index 0060bd58ed5..253b0e4182d 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -18,12 +18,10 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
ACE_ENV_ARG_DECL)
{
this->proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Simple publication, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -38,17 +36,15 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
this->proxy_->connect_push_supplier (me.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
{
// Disconnect from the EC
ACE_TRY
{
- this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -56,17 +52,14 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
ACE_ENDTRY;
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (void)
{
ACE_TRY
{
@@ -79,7 +72,6 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
event[0].header.ttl = 1;
this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -88,7 +80,7 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 8f9f50f2a87..048b23daf20 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -29,15 +29,15 @@ public:
ACE_ENV_ARG_DECL);
// Connect to the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the event channel
- void perform_push (ACE_ENV_SINGLE_ARG_DECL);
+ void perform_push (void);
// Push a single event
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index ceb4108095b..670e4d89039 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -45,12 +45,10 @@ ECM_Driver::run (int argc, char* argv[])
{
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,11 +57,9 @@ ECM_Driver::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (this->parse_args (argc, argv))
return 1;
@@ -136,44 +132,36 @@ ECM_Driver::run (int argc, char* argv[])
// Register Event_Service with the Naming Service.
RtecEventChannelAdmin::EventChannel_var ec =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
CORBA::String_var str =
this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
this->open_federations (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
this->open_senders (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
this->open_receivers (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
this->activate_federations (ec.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
@@ -183,18 +171,14 @@ ECM_Driver::run (int argc, char* argv[])
this->dump_results ();
- this->close_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->close_senders (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->close_receivers ();
+ this->close_senders ();
- this->close_federations (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->close_federations ();
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
- ec_impl.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.shutdown ();
}
ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -227,7 +211,6 @@ ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
{
this->local_federations_[i]->open (this->event_count_,
ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -243,17 +226,15 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
this->local_federations_[i]->activate (ec,
interval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECM_Driver::close_federations (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_federations (void)
{
for (int i = 0; i < this->local_federations_count_; ++i)
{
- this->local_federations_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->local_federations_[i]->close ();
}
}
@@ -283,17 +264,15 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
this->all_federations_[i]->open (clone,
ec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECM_Driver::close_senders (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_senders (void)
{
for (int i = 0; i < this->all_federations_count_; ++i)
{
- this->all_federations_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->all_federations_[i]->close ();
}
this->endpoint_.dgram ().close ();
}
@@ -313,17 +292,15 @@ ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
this->local_federations_[i]->open_receiver (ec,
endpoint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECM_Driver::close_receivers (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_receivers (void)
{
for (int i = 0; i < this->local_federations_count_; ++i)
{
- this->local_federations_[i]->close_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->local_federations_[i]->close_receiver ();
}
}
@@ -609,8 +586,7 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
ACE_ENV_ARG_DECL)
{
RtecUDPAdmin::AddrServer_var addr_server =
- this->addr_server (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->addr_server ();
TAO_ECG_Refcounted_Endpoint ref_endpoint (endpoint);
@@ -618,7 +594,6 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
addr_server.in (),
ref_endpoint
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// @@ TODO Make this a parameter....
this->sender_->mtu (64);
@@ -637,20 +612,18 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
}
RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
this->sender_->connect (qos_copy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-ECM_Federation::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Federation::close (void)
{
- this->sender_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->sender_->shutdown ();
}
RtecUDPAdmin::AddrServer_ptr
-ECM_Federation::addr_server (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Federation::addr_server (void)
{
- return this->addr_server_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->addr_server_._this ();
}
// ****************************************************************
@@ -682,30 +655,25 @@ ECM_Supplier::open (const char* name,
0, 1);
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_suppliers ();
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
- RtecEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushSupplier_var objref = this->_this ();
this->consumer_proxy_->connect_push_supplier (objref.in (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-ECM_Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Supplier::close (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
return;
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
this->consumer_proxy_ = 0;
}
@@ -723,21 +691,17 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
// = Connect as a consumer.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var cref =
- this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_._this ();
this->supplier_proxy_->connect_push_consumer (cref.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -758,19 +722,18 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events
this->federation_->supplier_timeout (this->consumer_proxy_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECM_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- // this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ // this->supplier_proxy_->disconnect_push_supplier ();
}
void
-ECM_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Supplier::disconnect_push_consumer (void)
{
}
@@ -796,8 +759,7 @@ ECM_Consumer::open (const char*,
ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
// = Connect as a consumer.
- this->consumer_admin_ = ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_ = ec->for_consumers ();
this->connect (seed ACE_ENV_ARG_PARAMETER);
}
@@ -810,8 +772,7 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed
return;
this->supplier_proxy_ =
- this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->obtain_push_supplier ();
ACE_ConsumerQOS_Factory qos;
qos.start_disjunction_group ();
@@ -837,17 +798,15 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed
qos.insert_type (federation->consumer_ipaddr (i), 0);
}
- RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushConsumer_var objref = this->_this ();
this->supplier_proxy_->connect_push_consumer (objref.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-ECM_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Consumer::disconnect (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ())
|| CORBA::is_nil (this->consumer_admin_.in ()))
@@ -856,17 +815,15 @@ ECM_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
RtecEventChannelAdmin::ProxyPushSupplier_var tmp =
this->supplier_proxy_._retn ();
- tmp->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tmp->disconnect_push_supplier ();
}
void
-ECM_Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Consumer::close (void)
{
ACE_TRY
{
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect ();
this->consumer_admin_ =
RtecEventChannelAdmin::ConsumerAdmin::_nil ();
}
@@ -889,7 +846,7 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events
}
void
-ECM_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -941,24 +898,20 @@ ECM_Local_Federation::open (int event_count,
ACE_OS::strcat (buf, "/supplier");
this->supplier_.open (buf, ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_OS::strcpy (buf, this->federation_->name ());
ACE_OS::strcat (buf, "/consumer");
this->consumer_.open (buf, ec, this->seed_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->last_subscription_change_ = ACE_OS::gettimeofday ();
}
void
-ECM_Local_Federation::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Local_Federation::close (void)
{
- this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_.close ();
- this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_.close ();
}
void
@@ -991,14 +944,12 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
if (this->event_count_ < 0)
{
this->driver_->federation_has_shutdown (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
return;
}
int i = this->event_count_ % this->federation_->supplier_types ();
s.header.type = this->federation_->supplier_ipaddr (i);
consumer->push (sent ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->send_count_++;
@@ -1014,10 +965,8 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
ACE_DEBUG ((LM_DEBUG,
"Reconfiguring federation %s: %f %f [%d]\n",
this->name (), p, maxp, x));
- this->consumer_.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_.disconnect ();
this->consumer_.connect (this->seed_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->last_subscription_change_ = ACE_OS::gettimeofday ();
}
}
@@ -1060,8 +1009,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
ACE_ENV_ARG_DECL)
{
RtecUDPAdmin::AddrServer_var addr_server =
- this->federation_->addr_server (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->federation_->addr_server ();
ACE_Reactor* reactor = TAO_ORB_Core_instance ()->reactor ();
@@ -1069,7 +1017,6 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
ignore_from,
addr_server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const int bufsize = 512;
char buf[bufsize];
@@ -1081,7 +1028,6 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
this->mcast_eh_->reactor (reactor);
this->mcast_eh_->open (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_SupplierQOS_Factory qos;
for (int i = 0; i < this->consumer_types (); ++i)
@@ -1094,16 +1040,14 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
RtecEventChannelAdmin::SupplierQOS qos_copy =
qos.get_SupplierQOS ();
this->receiver_->connect (qos_copy ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-ECM_Local_Federation::close_receiver (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Local_Federation::close_receiver (void)
{
- this->receiver_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->receiver_->shutdown ();
this->mcast_eh_->shutdown ();
}
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 19d97e48b72..86f84d1f5ef 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -120,13 +120,13 @@ public:
ACE_ENV_ARG_DECL);
// Connect the UDP sender to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Close the UDP sender, disconnect from the EC
int sender_local_addr (ACE_INET_Addr& addr);
// Return the sender local address
- RtecUDPAdmin::AddrServer_ptr addr_server (ACE_ENV_SINGLE_ARG_DECL);
+ RtecUDPAdmin::AddrServer_ptr addr_server (void);
// This address server can be used to convert event headers
// (type,source) to UDP addresses (ipaddr,port)
@@ -173,7 +173,7 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
@@ -186,11 +186,11 @@ public:
void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL);
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void disconnect_push_consumer (void);
// Implement the callbacks for our consumer personality.
// = The POA_RtecEventComm::PushSupplier methods.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -230,12 +230,12 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the consumer to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
void connect (ACE_RANDR_TYPE& seed
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier, but do not forget about it or close
// it.
@@ -243,7 +243,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -275,7 +275,7 @@ public:
ACE_ENV_ARG_DECL);
// Connect both the supplier and the consumer.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect everybody from the EC
void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
@@ -300,7 +300,7 @@ public:
ACE_ENV_ARG_DECL);
// Connect the UDP receiver to the EC.
- void close_receiver (ACE_ENV_SINGLE_ARG_DECL);
+ void close_receiver (void);
// Close the UDP receiver, disconnect from the EC
void dump_results (void) const;
@@ -434,7 +434,7 @@ private:
ACE_ENV_ARG_DECL);
// Activate all the federations
- void close_federations (ACE_ENV_SINGLE_ARG_DECL);
+ void close_federations (void);
// Close the federations, i.e. disconnect from the EC, deactivate
// the objects, etc.
@@ -447,13 +447,13 @@ private:
// Connect all the receivers, thus we accept events arriving through
// multicast.
- void close_senders (ACE_ENV_SINGLE_ARG_DECL);
+ void close_senders (void);
// Close all the senders to cleanup resources.
- void close_receivers (ACE_ENV_SINGLE_ARG_DECL);
+ void close_receivers (void);
// Close all the receivers to cleanup resources.
- int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int shutdown (void);
// Called when the main thread.
int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 2d064471253..f0535a8558e 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -132,12 +132,10 @@ Test_ECG::run (int argc, char* argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -146,14 +144,11 @@ Test_ECG::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (this->parse_args (argc, argv))
return 1;
@@ -255,7 +250,6 @@ Test_ECG::run (int argc, char* argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -264,7 +258,6 @@ Test_ECG::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
RtecScheduler::Scheduler_var scheduler;
@@ -285,8 +278,7 @@ Test_ECG::run (int argc, char* argv[])
}
if (scheduler_impl.get () == 0)
return -1;
- scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler = scheduler_impl->_this ();
break;
case Test_ECG::ss_runtime:
@@ -308,8 +300,7 @@ Test_ECG::run (int argc, char* argv[])
if (scheduler_impl.get () == 0)
return -1;
- scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler = scheduler_impl->_this ();
}
else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0)
{
@@ -329,8 +320,7 @@ Test_ECG::run (int argc, char* argv[])
if (scheduler_impl.get () == 0)
return -1;
- scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler = scheduler_impl->_this ();
}
else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0)
{
@@ -350,8 +340,7 @@ Test_ECG::run (int argc, char* argv[])
if (scheduler_impl.get () == 0)
return -1;
- scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler = scheduler_impl->_this ();
}
else
{
@@ -364,8 +353,7 @@ Test_ECG::run (int argc, char* argv[])
if (scheduler_impl.get () == 0)
return -1;
- scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler = scheduler_impl->_this ();
}
break;
@@ -388,7 +376,6 @@ Test_ECG::run (int argc, char* argv[])
{
CORBA::String_var str =
orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
str.in ()));
@@ -400,7 +387,6 @@ Test_ECG::run (int argc, char* argv[])
schedule_name.length (1);
schedule_name[0].id = CORBA::string_dup (buf);
naming_context->bind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ACE_Scheduler_Factory::use_config (naming_context.in (),
buf) == -1)
@@ -417,12 +403,10 @@ Test_ECG::run (int argc, char* argv[])
// Register Event_Service with the Naming Service.
RtecEventChannelAdmin::EventChannel_var ec =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
CORBA::String_var str =
orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::sleep (5);
ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
@@ -434,7 +418,6 @@ Test_ECG::run (int argc, char* argv[])
channel_name.length (1);
channel_name[0].id = CORBA::string_dup (buf);
naming_context->bind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
@@ -443,7 +426,6 @@ Test_ECG::run (int argc, char* argv[])
if (this->rmt_name_ != 0)
{
orb->run (&tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG ((LM_DEBUG, "starting....\n"));
@@ -452,22 +434,18 @@ Test_ECG::run (int argc, char* argv[])
this->get_ec (naming_context.in (),
this->lcl_name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
for (int sd = 0; sd < this->supplier_disconnects_; ++sd)
{
this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_suppliers ();
ACE_OS::sleep (5);
ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd));
}
this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
@@ -476,13 +454,11 @@ Test_ECG::run (int argc, char* argv[])
{
tv.set (5, 0);
orb->run (&tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var remote_ec =
this->get_ec (naming_context.in (),
this->rmt_name_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
CosNaming::Name rsch_name (1);
@@ -496,48 +472,38 @@ Test_ECG::run (int argc, char* argv[])
rsch_name[0].id = CORBA::string_dup (buf);
CORBA::Object_var tmpobj =
naming_context->resolve (rsch_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::Scheduler_var remote_sch =
RtecScheduler::Scheduler::_narrow (tmpobj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->connect_ecg (local_ec.in (),
remote_ec.in (),
remote_sch.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
tv.set (5, 0);
orb->run (&tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::Observer_ptr observer =
- this->ecg_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ecg_._this ();
observer_handle = ec_impl.append_observer (observer
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
for (int cd = 0; cd < this->consumer_disconnects_; ++cd)
{
this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_consumers ();
ACE_OS::sleep (5);
ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd));
}
this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
this->activate_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -556,15 +522,13 @@ Test_ECG::run (int argc, char* argv[])
if (this->rmt_name_ != 0)
{
ec_impl.remove_observer (observer_handle ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Create the EC internal threads
ec_impl.activate ();
ACE_DEBUG ((LM_DEBUG, "running the test\n"));
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
this->test_stop_ = ACE_OS::gethrtime ();
@@ -588,7 +552,6 @@ Test_ECG::run (int argc, char* argv[])
infos.out (), deps.out (),
configs.out (), anomalies.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::dump_schedule (infos.in (),
deps.in (),
@@ -598,25 +561,19 @@ Test_ECG::run (int argc, char* argv[])
}
naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->rmt_name_ != 0)
{
- this->ecg_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->ecg_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ecg_.close ();
+ this->ecg_.shutdown ();
}
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_consumers ();
+ this->disconnect_suppliers ();
ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
tv.set (5, 0);
orb->run (&tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sys_ex)
{
@@ -646,7 +603,6 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
CORBA::Object_var ec_ptr =
naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ());
if (CORBA::is_nil (ec_ptr.in ()))
return RtecEventChannelAdmin::EventChannel::_nil ();
@@ -655,12 +611,11 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
}
void
-Test_ECG::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Test_ECG::disconnect_suppliers (void)
{
for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
{
- this->suppliers_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->close ();
}
}
@@ -689,7 +644,6 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
this->hp_interval_ * 10,
local_ec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -713,17 +667,15 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
this->lp_interval_ * 10,
local_ec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-Test_ECG::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Test_ECG::disconnect_consumers (void)
{
for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
{
- this->consumers_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->close ();
}
}
@@ -748,7 +700,6 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
this->hp_interval_ * 10,
local_ec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -766,7 +717,6 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
this->lp_interval_ * 10,
local_ec
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -794,7 +744,6 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
this->hpc_event_b_,
local_ec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->stats_[i].total_time_ = 0;
this->stats_[i].lcl_count_ = 0;
this->stats_[i].rmt_count_ = 0;
@@ -814,7 +763,6 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
this->lpc_event_b_,
local_ec
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->stats_[i].total_time_ = 0;
this->stats_[i].lcl_count_ = 0;
this->stats_[i].rmt_count_ = 0;
@@ -853,7 +801,6 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
rmt, lcl ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -868,7 +815,6 @@ Test_ECG::push_supplier (void * /* cookie */,
if (!this->short_circuit_)
{
consumer->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -876,12 +822,10 @@ Test_ECG::push_supplier (void * /* cookie */,
for (; i < this->hp_consumers_; ++i)
{
this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
{
this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
@@ -1023,14 +967,13 @@ Test_ECG::shutdown_consumer (int id)
}
int
-Test_ECG::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_ECG::shutdown (void)
{
ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
if (this->rmt_name_ != 0)
{
- this->ecg_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ecg_.shutdown ();
}
TAO_ORB_Core_instance ()->orb ()->shutdown ();
@@ -1293,7 +1236,6 @@ Test_Supplier::open (const char* name,
RtecScheduler::handle_t rt_info =
server->create (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The execution times are set to reasonable values, but
// actually they are changed on the real execution, i.e. we
@@ -1312,7 +1254,6 @@ Test_Supplier::open (const char* name,
1,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_id_ = ACE::crc32 (name);
ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -1330,31 +1271,27 @@ Test_Supplier::open (const char* name,
rt_info, 1);
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_suppliers ();
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
- RtecEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushSupplier_var objref = this->_this ();
this->consumer_proxy_->connect_push_supplier (objref.in (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Test_Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::close (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
return;
RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
this->consumer_proxy_._retn ();
- proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ proxy->disconnect_push_consumer ();
}
void
@@ -1372,7 +1309,6 @@ Test_Supplier::activate (const char* name,
ACE_OS::strcat (buf, name);
RtecScheduler::handle_t rt_info =
server->create (buf ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The execution times are set to reasonable values, but
// actually they are changed on the real execution, i.e. we
@@ -1391,7 +1327,6 @@ Test_Supplier::activate (const char* name,
1,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Also connect our consumer for timeout events from the EC.
int interval = rate / 10;
@@ -1408,22 +1343,18 @@ Test_Supplier::activate (const char* name,
// = Connect as a consumer.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var cref =
- this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_._this ();
this->supplier_proxy_->connect_push_consumer (
cref.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -1469,7 +1400,6 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
this->test_->shutdown_supplier (this->cookie_,
this->consumer_proxy_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->message_count_ % 2 == 0)
{
@@ -1488,17 +1418,17 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
}
void
-Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (CORBA::is_nil (this->supplier_proxy_.in ()))
return;
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->supplier_proxy_->disconnect_push_supplier ();
}
void
-Test_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_consumer (void)
{
}
@@ -1525,7 +1455,6 @@ Test_Consumer::open (const char* name,
RtecScheduler::handle_t rt_info =
server->create (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The worst case execution time is far less than 2
// milliseconds, but that is a safe estimate....
@@ -1542,7 +1471,6 @@ Test_Consumer::open (const char* name,
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ConsumerQOS_Factory qos;
qos.start_disjunction_group ();
@@ -1552,31 +1480,27 @@ Test_Consumer::open (const char* name,
// = Connect as a consumer.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
- RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushConsumer_var objref = this->_this ();
this->supplier_proxy_->connect_push_consumer (objref.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Test_Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+Test_Consumer::close (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ()))
return;
RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
this->supplier_proxy_._retn ();
- proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ proxy->disconnect_push_supplier ();
}
void
@@ -1589,7 +1513,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
}
void
-Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 4bf7784e0cd..c5a78d16be9 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -54,7 +54,7 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
void activate (const char* name,
@@ -64,11 +64,11 @@ public:
void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL);
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void disconnect_push_consumer (void);
// Implement the callbacks for our consumer personality.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The methods in the skeleton.
@@ -124,13 +124,13 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the consumer to the EC.
- void close (ACE_ENV_SINGLE_ARG_DECL);
+ void close (void);
// Disconnect from the EC.
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
@@ -213,7 +213,7 @@ private:
void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_suppliers (void);
// Connect the suppliers.
void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
@@ -229,10 +229,10 @@ private:
void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_consumers (void);
// Connect and disconnect the consumers.
- int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int shutdown (void);
// Called when the main thread (i.e. not the scavenger thread) is
// shutting down.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index ade2d62e17a..26561f30381 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -38,7 +38,6 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
{
RtecScheduler::handle_t rt_info =
scheduler->create (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The worst case execution time is far less than 2
// milliseconds, but that is a safe estimate....
@@ -54,7 +53,6 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ConsumerQOS_Factory qos;
qos.start_disjunction_group ();
@@ -66,43 +64,35 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
// = Connect as a consumer.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_consumers ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
- RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ RtecEventComm::PushConsumer_var objref = this->_this ();
this->supplier_proxy_->connect_push_consumer (objref.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Consumer::disconnect (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ()))
return;
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
this->supplier_proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
// Deactivate the servant
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -160,7 +150,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
// We stop the timer as soon as we realize it is time to
// do so.
this->driver_->shutdown_consumer (this->cookie_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else
@@ -177,7 +166,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
}
void
-Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 6a086b38087..fc6db8aa9a0 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -49,7 +49,7 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the consumer to the EC.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the EC.
void dump_results (const char* name,
@@ -62,7 +62,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 609bf639245..82f52e91aa2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -16,8 +16,8 @@
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID (EC_Throughput,
- ECT_Consumer_Driver,
+ACE_RCSID (EC_Throughput,
+ ECT_Consumer_Driver,
"$Id$")
int
@@ -52,12 +52,10 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
{
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -66,11 +64,9 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (this->parse_args (argc, argv))
return 1;
@@ -130,7 +126,6 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
CORBA::Object_var naming_obj =
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,
@@ -139,7 +134,6 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name schedule_name (1);
schedule_name.length (1);
@@ -147,13 +141,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
CORBA::Object_var sched_obj =
naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sched_obj.in ()))
return 1;
RtecScheduler::Scheduler_var scheduler =
RtecScheduler::Scheduler::_narrow (sched_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -161,7 +153,6 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var channel;
if (CORBA::is_nil (ec_obj.in ()))
@@ -169,13 +160,10 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
else
channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
this->connect_consumers (scheduler.in (), channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
@@ -184,7 +172,6 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
{
ACE_Time_Value tv (1, 0);
this->orb_->perform_work (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
if (this->active_count_ <= 0)
break;
@@ -193,20 +180,16 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
this->dump_results ();
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_consumers ();
if (this->shutdown_event_channel_ != 0)
{
- channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ channel->destroy ();
}
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCH (CORBA::SystemException, sys_ex)
{
@@ -260,7 +243,6 @@ ECT_Consumer_Driver::connect_consumers
this->type_count_,
channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -282,12 +264,11 @@ ECT_Consumer_Driver::dump_results (void)
}
void
-ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Consumer_Driver::disconnect_consumers (void)
{
for (int i = 0; i < this->n_consumers_; ++i)
{
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
delete this->consumers_[i];
this->consumers_[i] = 0;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 4af70e0f7a8..35c31f8591e 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -57,7 +57,7 @@ private:
void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_consumers (void);
// Connect and disconnect the consumers.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 0d75c42b29b..b5b04c3e371 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -53,7 +53,6 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
RtecScheduler::handle_t rt_info =
scheduler->create (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Time_Value tv (0, burst_pause);
RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -74,7 +73,6 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
1,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_id_ = ACE::crc32 (name);
ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -92,44 +90,36 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
rt_info, 1);
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->for_suppliers ();
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var objref =
- this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_._this ();
this->consumer_proxy_->connect_push_supplier (objref.in (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
return;
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
this->consumer_proxy_ =
RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
// Deactivate the servant
PortableServer::POA_var poa =
- this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_._default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -186,7 +176,6 @@ Test_Supplier::svc ()
// ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
this->consumer_proxy ()->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_hrtime_t end = ACE_OS::gethrtime ();
this->throughput_.sample (end - test_start,
end - request_start);
@@ -209,7 +198,6 @@ Test_Supplier::svc ()
ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
request_start);
this->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_hrtime_t end = ACE_OS::gethrtime ();
this->throughput_.sample (end - test_start,
end - request_start);
@@ -231,7 +219,7 @@ Test_Supplier::svc ()
}
void
-Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_supplier (void)
{
}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 17fbcb8ce02..ec0f8e02ccd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -49,10 +49,10 @@ public:
ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the EC.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void disconnect_push_supplier (void);
// The methods in the skeleton.
RtecEventComm::EventSourceID supplier_id (void) const;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index d2350ca9a04..4cf395bd7c6 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -16,8 +16,8 @@
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID (EC_Throughput,
- ECT_Supplier_Driver,
+ACE_RCSID (EC_Throughput,
+ ECT_Supplier_Driver,
"$Id$")
int
@@ -59,11 +59,9 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,11 +70,9 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (this->parse_args (argc, argv))
return 1;
@@ -141,7 +137,6 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -150,7 +145,6 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name schedule_name (1);
schedule_name.length (1);
@@ -158,20 +152,17 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
CORBA::Object_var sched_obj =
naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sched_obj.in ()))
return 1;
RtecScheduler::Scheduler_var scheduler =
RtecScheduler::Scheduler::_narrow (sched_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::Name name (1);
name.length (1);
name[0].id = CORBA::string_dup ("EventService");
CORBA::Object_var ec_obj =
naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var channel;
if (CORBA::is_nil (ec_obj.in ()))
@@ -179,20 +170,16 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
else
channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
this->connect_suppliers (scheduler.in (),
channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
- this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->activate_suppliers ();
ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -207,18 +194,15 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
this->dump_results ();
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_suppliers ();
ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
// @@ Deactivate the suppliers (as CORBA Objects?)
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n"));
}
@@ -257,12 +241,11 @@ ECT_Supplier_Driver::connect_suppliers
this->type_count_,
channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECT_Supplier_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECT_Supplier_Driver::activate_suppliers (void)
{
for (int i = 0; i < this->n_suppliers_; ++i)
{
@@ -271,12 +254,11 @@ ECT_Supplier_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-ECT_Supplier_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Supplier_Driver::disconnect_suppliers (void)
{
for (int i = 0; i < this->n_suppliers_; ++i)
{
- this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->disconnect ();
delete this->suppliers_[i];
this->suppliers_[i] = 0;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index e51f0f73551..71f06bf4de8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -53,10 +53,10 @@ private:
void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_suppliers (void);
// Connect the suppliers.
- void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void activate_suppliers (void);
// Activate the suppliers, i.e. they start generating events.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 8aeb5fbbc40..5a3c157b5d8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -71,12 +71,10 @@ ECT_Throughput::run (int argc, char* argv[])
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -85,14 +83,11 @@ ECT_Throughput::run (int argc, char* argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (this->parse_args (argc, argv))
return 1;
@@ -185,14 +180,12 @@ ECT_Throughput::run (int argc, char* argv[])
runtime_infos);
#endif
RtecScheduler::Scheduler_var scheduler =
- scheduler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler_impl._this ();
#if 0
CORBA::Object_var naming_obj =
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,
@@ -201,7 +194,6 @@ ECT_Throughput::run (int argc, char* argv[])
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This is the name we (potentially) register the Scheduling
// Service in the Naming Service.
@@ -211,13 +203,11 @@ ECT_Throughput::run (int argc, char* argv[])
CORBA::String_var str =
this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
str.in ()));
// Register the servant with the Naming Context....
naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::use_config (naming_context.in ());
#endif /* 0 */
@@ -230,31 +220,26 @@ ECT_Throughput::run (int argc, char* argv[])
TAO_EC_Event_Channel *ec =
new TAO_EC_Event_Channel (attr);
- ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->activate ();
auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec);
ec_impl = auto_ec_impl;
RtecEventChannelAdmin::EventChannel_var channel =
- ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl->_this ();
this->connect_consumers (scheduler.in (),
channel.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
this->connect_suppliers (scheduler.in (),
channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
- this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->activate_suppliers ();
ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -269,31 +254,25 @@ ECT_Throughput::run (int argc, char* argv[])
this->dump_results ();
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_consumers ();
ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n"));
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->disconnect_suppliers ();
ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
- channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ channel->destroy ();
ACE_DEBUG ((LM_DEBUG, "channel destroyed\n"));
{
// Deactivate the EC
PortableServer::POA_var poa =
- ec_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (ec_impl.get () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "EC deactivated\n"));
}
@@ -301,13 +280,10 @@ ECT_Throughput::run (int argc, char* argv[])
{
// Deactivate the Scheduler
PortableServer::POA_var poa =
- scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ scheduler_impl._default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
}
@@ -375,7 +351,6 @@ ECT_Throughput::connect_consumers
this->consumer_type_count_,
channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -403,12 +378,11 @@ ECT_Throughput::connect_suppliers
this->supplier_type_count_,
channel
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-ECT_Throughput::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECT_Throughput::activate_suppliers (void)
{
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -427,22 +401,20 @@ ECT_Throughput::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-ECT_Throughput::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Throughput::disconnect_suppliers (void)
{
for (int i = 0; i < this->n_suppliers_; ++i)
{
- this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->disconnect ();
}
}
void
-ECT_Throughput::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Throughput::disconnect_consumers (void)
{
for (int i = 0; i < this->n_consumers_; ++i)
{
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
}
}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index cb1ceae4a8b..9cfadae7a92 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -56,16 +56,16 @@ private:
void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_consumers (void);
// Connect and disconnect the consumers.
void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
RtecEventChannelAdmin::EventChannel_ptr local_ec
ACE_ENV_ARG_DECL);
- void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect_suppliers (void);
// Connect the suppliers.
- void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void activate_suppliers (void);
// Activate the suppliers, i.e. they start generating events.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 6e4b0d31665..83ead81a375 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -28,19 +28,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -50,25 +45,21 @@ main (int argc, char* argv[])
attributes.supplier_reconnect = 1;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -81,7 +72,6 @@ main (int argc, char* argv[])
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier1.connect (supplier_admin.in (),
event_source,
@@ -89,7 +79,6 @@ main (int argc, char* argv[])
event_source,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -113,7 +102,6 @@ main (int argc, char* argv[])
consumer01.connect (consumer_admin.in (),
consumer_qos01.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Consumer consumer0 ("Consumer/0", event_type);
// Create a consumer, intialize its RT_Info structures, and
@@ -122,7 +110,6 @@ main (int argc, char* argv[])
consumer0.connect (consumer_admin.in (),
consumer_qos0.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Consumer consumer1 ("Consumer/1", event_type);
// Create a consumer, intialize its RT_Info structures, and
@@ -131,7 +118,6 @@ main (int argc, char* argv[])
consumer1.connect (consumer_admin.in (),
consumer_qos1.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -151,24 +137,20 @@ main (int argc, char* argv[])
consumer0.connect (consumer_admin.in (),
consumer_qos0.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer1.connect (consumer_admin.in (),
consumer_qos1.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (i % 2 == 0)
{
consumer01.connect (consumer_admin.in (),
consumer_qos0.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
consumer01.connect (consumer_admin.in (),
consumer_qos01.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_OS::sleep (tv);
@@ -184,29 +166,22 @@ main (int argc, char* argv[])
// Cleanup..
- consumer01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer01.disconnect ();
+ consumer1.disconnect ();
+ consumer0.disconnect ();
// ****************************************************************
- supplier1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier1.disconnect ();
+ supplier0.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 93e068b6d84..88da8d128cc 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -75,14 +75,13 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
}
void
-EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_BCast::execute_test (void)
{
// Subscription determining which EC events will get sent out on the
// UDP socket.
RtecEventChannelAdmin::ConsumerQOS sub;
int shutdown_event_type;
this->build_consumer_qos (0, sub, shutdown_event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Obtain UDP address in the string format for Gateway initialization.
char address_server_arg [256];
@@ -111,13 +110,11 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
gateway.run (this->orb_.in (),
this->event_channel_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->allocate_tasks () == -1)
return;
- this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->activate_tasks ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers are active\n"));
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 3d1b701984a..0d07003579d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -46,7 +46,7 @@ public:
virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
/// Don't run the suppliers, just test connect and disconnect calls.
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
/// Don't dump the EC_Driver results, they are meaningless.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 83ee58c7eb8..3397f5ee01b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -23,19 +23,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -45,25 +40,21 @@ main (int argc, char* argv[])
attributes.supplier_reconnect = 1;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -74,28 +65,24 @@ main (int argc, char* argv[])
first_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
first_supplier.connect (supplier_admin.in (),
0x00001111UL,
0x11110000UL,
0x00001111UL,
0x11110000UL
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
EC_Counting_Supplier second_supplier;
second_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
second_supplier.connect (supplier_admin.in (),
0x01100000UL,
0x00000110UL,
0x01100000UL,
0x00000110UL
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -112,7 +99,6 @@ main (int argc, char* argv[])
consumer_bitmask_reject.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -129,7 +115,6 @@ main (int argc, char* argv[])
consumer_bitmask_accept.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -146,7 +131,6 @@ main (int argc, char* argv[])
consumer_bitmask_filter.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -164,7 +148,6 @@ main (int argc, char* argv[])
consumer_bitmask_value.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -182,7 +165,6 @@ main (int argc, char* argv[])
consumer_bitmask_loose.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -194,37 +176,26 @@ main (int argc, char* argv[])
// ****************************************************************
- consumer_bitmask_loose.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer_bitmask_value.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer_bitmask_filter.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer_bitmask_accept.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- consumer_bitmask_reject.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_bitmask_loose.disconnect ();
+ consumer_bitmask_value.disconnect ();
+ consumer_bitmask_filter.disconnect ();
+ consumer_bitmask_accept.disconnect ();
+ consumer_bitmask_reject.disconnect ();
// ****************************************************************
- second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ second_supplier.deactivate ();
+ second_supplier.disconnect ();
+ first_supplier.deactivate ();
+ first_supplier.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -241,8 +212,7 @@ main (int argc, char* argv[])
expected = second_supplier.event_count;
consumer_bitmask_loose.dump_results (expected, 5);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 5a021eb4e08..fef941cd784 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -7,8 +7,8 @@
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
-ACE_RCSID (EC_Tests,
- Complex,
+ACE_RCSID (EC_Tests,
+ Complex,
"$Id$")
int
@@ -22,19 +22,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -42,25 +37,21 @@ main (int argc, char* argv[])
poa.in ());
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -73,14 +64,12 @@ main (int argc, char* argv[])
supplier_00.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_00.connect (supplier_admin.in (),
event_source,
event_type,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -89,14 +78,12 @@ main (int argc, char* argv[])
supplier_01.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_01.connect (supplier_admin.in (),
event_source,
event_type + 1,
event_source,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -105,14 +92,12 @@ main (int argc, char* argv[])
supplier_10.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_10.connect (supplier_admin.in (),
event_source + 1,
event_type,
event_source + 1,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -121,14 +106,12 @@ main (int argc, char* argv[])
supplier_11.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_11.connect (supplier_admin.in (),
event_source + 1,
event_type + 1,
event_source + 1,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -147,7 +130,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -167,7 +149,6 @@ main (int argc, char* argv[])
consumer_01.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -179,42 +160,29 @@ main (int argc, char* argv[])
// ****************************************************************
- consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- supplier_11.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_10.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_01.disconnect ();
+
+ consumer_00.disconnect ();
+
+ supplier_11.deactivate ();
+ supplier_10.deactivate ();
+ supplier_01.deactivate ();
+ supplier_00.deactivate ();
+
+ supplier_11.disconnect ();
+ supplier_10.disconnect ();
+ supplier_01.disconnect ();
+ supplier_00.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index d5e07b61bb9..cc364beb3b9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -28,19 +28,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -50,25 +45,21 @@ main (int argc, char* argv[])
attributes.supplier_reconnect = 1;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -80,7 +71,6 @@ main (int argc, char* argv[])
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -95,7 +85,6 @@ main (int argc, char* argv[])
consumer0.connect (consumer_admin.in (),
consumer_qos0.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create a consumer, intialize its RT_Info structures, and
// connnect to the event channel....
@@ -104,7 +93,6 @@ main (int argc, char* argv[])
consumer1.connect (consumer_admin.in (),
consumer_qos0.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -127,30 +115,24 @@ main (int argc, char* argv[])
// The consumers should be disconnected already, but make sure
// that they did...
- //consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- //ACE_TRY_CHECK;
- //consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- //ACE_TRY_CHECK;
+ //consumer1.disconnect ();
+ //consumer0.disconnect ();
// ****************************************************************
- supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier0.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// ****************************************************************
@@ -200,6 +182,5 @@ Consumer::push (const RtecEventComm::EventSet& events
return;
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate ();
}
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index f0a3aafbcae..a834b3d9955 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -27,35 +27,26 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
@@ -74,13 +65,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -92,24 +80,20 @@ run_test (PortableServer::POA_ptr poa,
attributes.disconnect_callbacks = use_callbacks;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_consumers ();
// and the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -137,55 +121,41 @@ run_test (PortableServer::POA_ptr poa,
supplier_0.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_0.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i % 2 == 1)
{
supplier_1.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
- supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_0.disconnect ();
+ consumer_0.disconnect ();
if (i % 2 == 1)
{
- consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_1.disconnect ();
+ supplier_1.disconnect ();
}
}
supplier_0.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_0.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->destroy ();
deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong count_0 = 1;
CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 39c750d1a4d..f98ea924d49 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -8,8 +8,8 @@
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-ACE_RCSID (EC_Tests,
- Gateway,
+ACE_RCSID (EC_Tests,
+ Gateway,
"$Id$")
int
@@ -23,19 +23,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -45,46 +40,38 @@ main (int argc, char* argv[])
attributes.supplier_reconnect = 1;
TAO_EC_Event_Channel ec_impl_1 (attributes);
- ec_impl_1.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl_1.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel_1 =
- ec_impl_1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl_1._this ();
// ****************************************************************
TAO_EC_Event_Channel ec_impl_2 (attributes);
- ec_impl_2.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl_2.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel_2 =
- ec_impl_2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl_2._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_1 =
- event_channel_1->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel_1->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_1 =
- event_channel_1->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel_1->for_suppliers ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_2 =
- event_channel_2->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel_2->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_2 =
- event_channel_2->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel_2->for_suppliers ();
// ****************************************************************
@@ -94,12 +81,10 @@ main (int argc, char* argv[])
ACE_ENV_ARG_PARAMETER);
RtecEventChannelAdmin::Observer_var obs =
- gateway._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway._this ();
RtecEventChannelAdmin::Observer_Handle h =
event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
gateway.observer_handle (h);
@@ -114,28 +99,24 @@ main (int argc, char* argv[])
supplier_00.activate (consumer_admin_1.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_00.connect (supplier_admin_1.in (),
event_source,
event_type,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
EC_Counting_Supplier supplier_01;
supplier_01.activate (consumer_admin_1.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier_01.connect (supplier_admin_1.in (),
event_source,
event_type + 1,
event_source,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -152,7 +133,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin_2.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -183,7 +163,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin_2.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -210,7 +189,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin_2.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -228,8 +206,7 @@ main (int argc, char* argv[])
// ****************************************************************
- consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_00.disconnect ();
// ****************************************************************
@@ -241,7 +218,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin_2.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -272,7 +248,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin_2.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -299,7 +274,6 @@ main (int argc, char* argv[])
consumer_00.connect (consumer_admin_2.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -317,37 +291,27 @@ main (int argc, char* argv[])
// ****************************************************************
- consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_00.disconnect ();
- supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_01.deactivate ();
+ supplier_00.deactivate ();
- supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_01.disconnect ();
+ supplier_00.disconnect ();
- gateway.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ gateway.shutdown ();
// ****************************************************************
- event_channel_1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel_1->destroy ();
- event_channel_2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel_2->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 9f91b760a0a..596b32de23e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -28,35 +28,26 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
@@ -75,13 +66,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -93,12 +81,10 @@ run_test (PortableServer::POA_ptr poa,
attributes.disconnect_callbacks = use_callbacks;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl._this ();
Task task (event_channel.in (), use_callbacks);
@@ -110,11 +96,9 @@ run_test (PortableServer::POA_ptr poa,
// Wait for all the threads to complete and the return
ACE_Thread_Manager::instance ()->wait ();
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ event_channel->destroy ();
deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
Task::Task (RtecEventChannelAdmin::EventChannel_ptr ec,
@@ -132,8 +116,7 @@ Task::svc ()
{
ACE_TRY_NEW_ENV
{
- this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run_iteration ();
}
ACE_CATCHANY
{
@@ -145,17 +128,15 @@ Task::svc ()
}
void
-Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+Task::run_iteration (void)
{
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel->for_consumers ();
// and the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel->for_suppliers ();
// ****************************************************************
@@ -183,40 +164,30 @@ Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
supplier_0.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_0.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (i % 2 == 1)
{
supplier_1.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
- supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_0.disconnect ();
+ consumer_0.disconnect ();
if (i % 2 == 1)
{
- consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_1.disconnect ();
+ supplier_1.disconnect ();
}
}
deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong count_0 = 0;
CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index 06855260d66..df343b6f2f9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -31,7 +31,7 @@ public:
int svc (void);
/// Run a single iteration of the test
- void run_iteration (ACE_ENV_SINGLE_ARG_DECL);
+ void run_iteration (void);
private:
/// The event channel used on the test
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 37ab5c1fb30..3383cb24d2f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -23,19 +23,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -45,25 +40,21 @@ main (int argc, char* argv[])
attributes.supplier_reconnect = 1;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -76,42 +67,36 @@ main (int argc, char* argv[])
first_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
first_supplier.connect (supplier_admin.in (),
event_source,
event_type,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
EC_Counting_Supplier second_supplier;
second_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
second_supplier.connect (supplier_admin.in (),
event_source,
event_type + 1,
event_source,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
EC_Counting_Supplier third_supplier;
third_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
third_supplier.connect (supplier_admin.in (),
event_source,
event_type + 1,
event_source,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -128,7 +113,6 @@ main (int argc, char* argv[])
regular_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -146,7 +130,6 @@ main (int argc, char* argv[])
negation_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -158,38 +141,28 @@ main (int argc, char* argv[])
// ****************************************************************
- negation_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ negation_consumer.disconnect ();
// ****************************************************************
- regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ regular_consumer.disconnect ();
// ****************************************************************
- third_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- third_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ third_supplier.deactivate ();
+ third_supplier.disconnect ();
+ second_supplier.deactivate ();
+ second_supplier.disconnect ();
+ first_supplier.deactivate ();
+ first_supplier.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -201,8 +174,7 @@ main (int argc, char* argv[])
first_supplier.event_count;
regular_consumer.dump_results (expected, 5);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index d58d828573f..1760f2ba518 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -51,7 +51,6 @@ EC_Master::run (int argc, char* argv[])
this->seed_ = ACE_OS::time (0);
this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->parse_args (argc, argv))
return 1;
@@ -87,7 +86,6 @@ EC_Master::run (int argc, char* argv[])
for (int j = 0; j < targc; ++j)
targv[j] = argv[j];
this->channels_[i]->run_init (targc, targv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
delete[] targv;
}
@@ -95,8 +93,7 @@ EC_Master::run (int argc, char* argv[])
{
for (int i = 0; i != this->n_channels_; ++i)
{
- this->channels_[i]->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->channels_[i]->execute_test ();
}
}
@@ -117,22 +114,17 @@ EC_Master::run (int argc, char* argv[])
{
for (int i = 0; i != this->n_channels_; ++i)
{
- this->channels_[i]->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->channels_[i]->run_cleanup ();
}
}
{
for (int i = 0; i != this->n_channels_; ++i)
{
- this->channels_[i]->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->channels_[i]->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->channels_[i]->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->channels_[i]->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->channels_[i]->disconnect_clients ();
+ this->channels_[i]->shutdown_clients ();
+ this->channels_[i]->destroy_ec ();
+ this->channels_[i]->deactivate_ec ();
this->channels_[i]->cleanup_tasks ();
this->channels_[i]->cleanup_suppliers ();
this->channels_[i]->cleanup_consumers ();
@@ -143,10 +135,8 @@ EC_Master::run (int argc, char* argv[])
this->root_poa_->destroy (1,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCHANY
{
@@ -166,11 +156,9 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
{
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object.in ()))
{
@@ -181,14 +169,11 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
this->root_poa_ =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
int
@@ -275,7 +260,7 @@ EC_Observer::print_usage (void)
}
void
-EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Observer::execute_test (void)
{
int peer_count = this->master_->channel_count ();
ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
@@ -293,23 +278,19 @@ EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ENV_ARG_PARAMETER);
RtecEventChannelAdmin::Observer_var obs =
- this->gwys_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->gwys_[i]._this ();
RtecEventChannelAdmin::Observer_Handle h =
rmt_ec->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->gwys_[i].observer_handle (h);
- ACE_CHECK;
}
if (this->allocate_tasks () == -1)
return;
- this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->activate_tasks ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Observer[%d] (%P|%t) suppliers are active\n",
@@ -317,7 +298,7 @@ EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Observer::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
+EC_Observer::run_cleanup (void)
{
for (int j = 0; j != this->master_->channel_count (); ++j)
{
@@ -328,10 +309,8 @@ EC_Observer::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
this->master_->channel (j)->event_channel_.in ();
rmt_ec->remove_observer (this->gwys_[j].observer_handle ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->gwys_[j].shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->gwys_[j].shutdown ();
}
}
@@ -392,8 +371,7 @@ EC_Observer::consumer_push (void*,
"EC_Observer[%d] (%P|%t) reconnecting\n", this->id_));
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
for (int i = 1; i < this->n_consumers_; ++i)
{
@@ -401,14 +379,12 @@ EC_Observer::consumer_push (void*,
if (this->consumers_[i]->connected ())
{
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
}
else
{
this->EC_Driver::connect_consumer (consumer_admin.in (),
i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index bb788c01258..f4a3150655a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -94,8 +94,8 @@ public:
virtual void print_usage (void);
/// Run the suppliers, using the <thread_manager> parameter
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
- void run_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
+ void run_cleanup (void);
void dump_results (void);
void connect_consumer (
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index b9397f997ed..8e6f8be808d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -29,13 +29,10 @@ deactivate_servant (PortableServer::Servant servant
ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ servant->_default_POA ();
PortableServer::ObjectId_var oid =
poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -58,7 +55,6 @@ RND_Driver::run (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -121,15 +117,11 @@ RND_Driver::run (int argc, char *argv[])
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -139,24 +131,20 @@ RND_Driver::run (int argc, char *argv[])
attributes.supplier_reconnect = 1;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
this->consumer_admin_ =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
this->supplier_admin_ =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -178,7 +166,6 @@ RND_Driver::run (int argc, char *argv[])
this->timer_.connect (this->consumer_admin_.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -190,7 +177,6 @@ RND_Driver::run (int argc, char *argv[])
this->supplier_.connect (this->supplier_admin_.in (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -205,8 +191,7 @@ RND_Driver::run (int argc, char *argv[])
1);
CORBA::Object_var obj =
- this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumers_[i]->_this ();
}
// ****************************************************************
@@ -222,8 +207,7 @@ RND_Driver::run (int argc, char *argv[])
this->suppliers_[j]->activate ();
CORBA::Object_var obj =
- this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->suppliers_[j]->_this ();
}
// ****************************************************************
@@ -240,9 +224,7 @@ RND_Driver::run (int argc, char *argv[])
{
deactivate_servant (this->suppliers_[k]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->suppliers_[k]->_remove_ref ();
}
delete[] this->suppliers_;
this->suppliers_ = 0;
@@ -252,8 +234,7 @@ RND_Driver::run (int argc, char *argv[])
// We destroy now to verify that the callbacks work and do not
// produce any problems.
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
@@ -262,9 +243,7 @@ RND_Driver::run (int argc, char *argv[])
{
deactivate_servant (this->consumers_[k]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->consumers_[k]->_remove_ref ();
}
delete[] this->consumers_;
this->consumers_ = 0;
@@ -274,17 +253,14 @@ RND_Driver::run (int argc, char *argv[])
deactivate_servant (&ec_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -318,7 +294,6 @@ RND_Driver::timer (const RtecEventComm::Event &e
event[0] = e;
event[0].header.source ++;
this->supplier_.push (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
break;
@@ -343,7 +318,6 @@ RND_Driver::timer (const RtecEventComm::Event &e
this->suppliers_[n]->connect (this->supplier_admin_.in (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
break;
@@ -360,7 +334,6 @@ RND_Driver::timer (const RtecEventComm::Event &e
this->consumers_[n]->connect (this->consumer_admin_.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
break;
@@ -370,8 +343,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
// ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
- this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[n]->disconnect ();
}
break;
@@ -381,8 +353,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
// ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
- this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[n]->disconnect ();
}
break;
}
@@ -405,7 +376,6 @@ RND_Timer::push (const RtecEventComm::EventSet &event
ACE_TRY
{
this->driver_->timer (event[0] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -426,30 +396,26 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
if (CORBA::is_nil (this->proxy_.in ()))
{
- this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_ = admin->obtain_push_supplier ();
}
proxy =
RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
}
RtecEventComm::PushConsumer_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
proxy->connect_push_consumer (me.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Consumer::disconnect (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
if (CORBA::is_nil (this->proxy_.in ()))
return;
- this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_->disconnect_push_supplier ();
this->proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
}
@@ -463,7 +429,7 @@ RND_Consumer::push (const RtecEventComm::EventSet &event
}
void
-RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -481,37 +447,33 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
if (CORBA::is_nil (this->proxy_.in ()))
{
- this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_ = admin->obtain_push_consumer ();
}
proxy =
RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
}
RtecEventComm::PushSupplier_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
proxy->connect_push_supplier (me.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::disconnect (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
if (CORBA::is_nil (this->proxy_.in ()))
return;
- this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->proxy_->disconnect_push_consumer ();
this->proxy_ =
RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
}
void
-RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::push_new_event (void)
{
RtecEventComm::EventSet event (1);
event.length (1);
@@ -540,7 +502,7 @@ RND_Supplier::push (RtecEventComm::EventSet &event
}
void
-RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -559,8 +521,7 @@ RND_Supplier::svc (void)
ACE_Time_Value tv (0, 10000);
ACE_OS::sleep (tv);
- this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->push_new_event ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index a1821d24c0b..858179740a3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -38,13 +38,13 @@ public:
void push (const RtecEventComm::EventSet &event
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
const RtecEventChannelAdmin::ConsumerQOS &qos
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
protected:
/// The driver
@@ -99,14 +99,14 @@ public:
void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
const RtecEventChannelAdmin::SupplierQOS &qos
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Push a single event...
- void push_new_event (ACE_ENV_SINGLE_ARG_DECL);
+ void push_new_event (void);
void push (RtecEventComm::EventSet &event
ACE_ENV_ARG_DECL);
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Active method
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 1fd8c294029..8fad75483d0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -90,18 +90,16 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
}
void
-EC_Reconnect::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_test (void)
{
- this->execute_consumer_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->execute_supplier_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->execute_consumer_test ();
+ this->execute_supplier_test ();
ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf);
this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf);
- // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+ // this->EC_Driver::execute_test ();
}
void
@@ -110,12 +108,11 @@ EC_Reconnect::dump_results (void)
}
void
-EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_consumer_test (void)
{
RtecEventChannelAdmin::ConsumerQOS qos;
int shutdown_event_type;
this->build_consumer_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->allow_consumer_reconnect_)
{
@@ -126,7 +123,6 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
this->consumers_[0]->connect (qos,
shutdown_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_hrtime_t stop = ACE_OS::gethrtime ();
this->consumer_reconnect_.sample (stop - start_time,
stop - start);
@@ -139,7 +135,6 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
this->consumers_[0]->connect (qos,
shutdown_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
}
@@ -155,20 +150,17 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ENDTRY;
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
ACE_hrtime_t start_time = ACE_OS::gethrtime ();
for (int i = 0; i < this->disconnections_; ++i)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- this->consumers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[0]->disconnect ();
this->consumers_[0]->connect (consumer_admin.in (),
qos,
shutdown_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_hrtime_t stop = ACE_OS::gethrtime ();
this->consumer_reconnect_.sample (stop - start_time,
stop - start);
@@ -177,12 +169,11 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_supplier_test (void)
{
RtecEventChannelAdmin::SupplierQOS qos;
int shutdown_event_type;
this->build_supplier_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->allow_supplier_reconnect_)
{
@@ -192,7 +183,6 @@ EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_hrtime_t start = ACE_OS::gethrtime ();
this->suppliers_[0]->connect (qos, shutdown_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_hrtime_t stop = ACE_OS::gethrtime ();
this->supplier_reconnect_.sample (stop - start_time,
stop - start);
@@ -204,7 +194,6 @@ EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
{
this->suppliers_[0]->connect (qos, shutdown_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
}
@@ -220,20 +209,17 @@ EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ENDTRY;
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_suppliers ();
ACE_hrtime_t start_time = ACE_OS::gethrtime ();
for (int i = 0; i < this->disconnections_; ++i)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- this->suppliers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[0]->disconnect ();
this->suppliers_[0]->connect (supplier_admin.in (),
qos,
shutdown_event_type
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_hrtime_t stop = ACE_OS::gethrtime ();
this->supplier_reconnect_.sample (stop - start_time,
stop - start);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index e99cd4b9ffb..e1524d00b2c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -51,14 +51,14 @@ public:
virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
/// Don't run the suppliers, just test connect and disconnect calls.
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
/// Don't dump the EC_Driver results, they are meaningless.
void dump_results (void);
/// Separate the suppliers and consumers.
- void execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void execute_consumer_test (void);
+ void execute_supplier_test (void);
private:
/// What aspect of reconnection are we going to test?
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index b06b6e50355..21823adbeb0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -49,13 +49,12 @@ EC_Schedule::print_usage (void)
}
void
-EC_Schedule::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
+EC_Schedule::initialize_ec_impl (void)
{
this->scheduler_impl_ = new ACE_Config_Scheduler;
- this->scheduler_ = this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->scheduler_ = this->scheduler_impl_->_this ();
- this->EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->EC_Driver::initialize_ec_impl ();
}
void
@@ -72,7 +71,7 @@ EC_Schedule::cleanup_ec (void)
}
void
-EC_Schedule::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Schedule::execute_test (void)
{
CORBA::Long min_priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -94,7 +93,6 @@ EC_Schedule::execute_test (ACE_ENV_SINGLE_ARG_DECL)
configs.out (),
anomalies.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG,
@@ -123,7 +121,6 @@ EC_Schedule::build_consumer_qos (
RtecScheduler::handle_t rt_info =
this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// The worst case execution time is far less than 2
// milliseconds, but that is a safe estimate....
@@ -139,7 +136,6 @@ EC_Schedule::build_consumer_qos (
0,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
int type_start =
this->consumer_type_start_
@@ -169,7 +165,6 @@ EC_Schedule::build_supplier_qos (
RtecScheduler::handle_t rt_info =
this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_Time_Value tv (0, this->burst_pause_);
RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -190,7 +185,6 @@ EC_Schedule::build_supplier_qos (
1,
RtecScheduler::OPERATION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
int supplier_id = i + 1;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index c139b699227..7a96f7dd68f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -52,12 +52,12 @@ public:
virtual void print_usage (void);
/// Set the scheduling service attribute
- void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL);
+ void initialize_ec_impl (void);
void cleanup_ec (void);
virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
/// Don't run the suppliers, just compute the schedule.
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
/// Don't dump the EC_Driver results, they are meaningless.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index ea2c18a1743..42a021e0822 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -22,19 +22,17 @@ EC_Shutdown::EC_Shutdown (void)
}
void
-EC_Shutdown::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Shutdown::execute_test (void)
{
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
- this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_ec ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n"));
- this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate_ec ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec deactivated\n"));
@@ -44,16 +42,13 @@ EC_Shutdown::execute_test (ACE_ENV_SINGLE_ARG_DECL)
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n"));
- this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->initialize_ec_impl ();
+ this->connect_consumers ();
+ this->connect_suppliers ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n"));
- // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+ // this->EC_Driver::execute_test ();
}
void
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index 81050629f9f..bab331f1a07 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -36,7 +36,7 @@ public:
// = The EC_Driver methods
/// Don't run the suppliers just create the EC and then destroy it.
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
/// Don't dump the EC_Driver results, they are meaningless.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index f00ec8abab4..876866bfeb1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -25,19 +25,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -45,25 +40,21 @@ main (int argc, char* argv[])
poa.in ());
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -71,12 +62,10 @@ main (int argc, char* argv[])
supplier.activate (consumer_admin.in (),
50 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier.connect (supplier_admin.in (),
0, 20,
0, 20
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -103,7 +92,6 @@ main (int argc, char* argv[])
interval_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -130,7 +118,6 @@ main (int argc, char* argv[])
conjunction_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -153,7 +140,6 @@ main (int argc, char* argv[])
deadline_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -165,29 +151,22 @@ main (int argc, char* argv[])
// ****************************************************************
- deadline_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ deadline_consumer.disconnect ();
- conjunction_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ conjunction_consumer.disconnect ();
- interval_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ interval_consumer.disconnect ();
- supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.deactivate ();
+ supplier.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index af77cc9fcbd..7f8b2f0e7f3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -7,8 +7,8 @@
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
-ACE_RCSID (EC_Tests,
- Wildcard,
+ACE_RCSID (EC_Tests,
+ Wildcard,
"$Id$")
int
@@ -22,19 +22,14 @@ main (int argc, char* argv[])
// ORB initialization boiler plate...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// ****************************************************************
@@ -42,25 +37,21 @@ main (int argc, char* argv[])
poa.in ());
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
// Obtain the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
// ****************************************************************
@@ -73,14 +64,12 @@ main (int argc, char* argv[])
supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier.connect (supplier_admin.in (),
event_source,
event_type,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -89,14 +78,12 @@ main (int argc, char* argv[])
other_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
other_supplier.connect (supplier_admin.in (),
event_source + 1,
event_type + 1,
event_source + 1,
event_type + 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -105,14 +92,12 @@ main (int argc, char* argv[])
any_source_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
any_source_supplier.connect (supplier_admin.in (),
0,
event_type,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -121,14 +106,12 @@ main (int argc, char* argv[])
any_type_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
any_type_supplier.connect (supplier_admin.in (),
event_source,
0,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -137,14 +120,12 @@ main (int argc, char* argv[])
wildcard_supplier.activate (consumer_admin.in (),
milliseconds
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
wildcard_supplier.connect (supplier_admin.in (),
0,
0,
event_source,
event_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ****************************************************************
@@ -161,7 +142,6 @@ main (int argc, char* argv[])
regular_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -179,7 +159,6 @@ main (int argc, char* argv[])
any_type_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -197,7 +176,6 @@ main (int argc, char* argv[])
any_source_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -215,7 +193,6 @@ main (int argc, char* argv[])
wildcard_consumer.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// ****************************************************************
@@ -227,53 +204,37 @@ main (int argc, char* argv[])
// ****************************************************************
- wildcard_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ wildcard_consumer.disconnect ();
- any_source_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ any_source_consumer.disconnect ();
- any_type_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ any_type_consumer.disconnect ();
- regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ regular_consumer.disconnect ();
- wildcard_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- wildcard_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ wildcard_supplier.deactivate ();
+ wildcard_supplier.disconnect ();
- any_type_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ any_type_supplier.deactivate ();
- any_source_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- any_source_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ any_source_supplier.deactivate ();
+ any_source_supplier.disconnect ();
- other_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- other_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ other_supplier.deactivate ();
+ other_supplier.disconnect ();
- supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.deactivate ();
+ supplier.disconnect ();
// ****************************************************************
- event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// ****************************************************************
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index fe118587fac..64bd7e250f3 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -24,8 +24,7 @@ EC_Wrapper::~EC_Wrapper (void)
{
ACE_TRY_NEW_ENV
{
- this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->destroy_ec ();
}
ACE_CATCHANY
{
@@ -61,8 +60,7 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
ACE_TRY_NEW_ENV
{
- impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl->activate ();
}
ACE_CATCHANY
{
@@ -78,27 +76,27 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
}
RtecEventChannelAdmin::ConsumerAdmin_ptr
-EC_Wrapper::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->ec_impl_)
- return this->ec_impl_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ec_impl_->for_consumers ();
else
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), RtecEventChannelAdmin::ConsumerAdmin::_nil());
}
RtecEventChannelAdmin::SupplierAdmin_ptr
-EC_Wrapper::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->ec_impl_)
- return this->ec_impl_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->ec_impl_->for_suppliers ();
else
ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), RtecEventChannelAdmin::SupplierAdmin::_nil());
}
void
-EC_Wrapper::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::destroy_ec (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
auto_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_);
@@ -106,13 +104,12 @@ EC_Wrapper::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
if (ec_impl_aptr.get ())
{
- ec_impl_aptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_impl_aptr->destroy ();
}
}
void
-EC_Wrapper::destroy (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Deregister from POA.
@@ -120,8 +117,7 @@ EC_Wrapper::destroy (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->destroy_ec ();
}
ACE_CATCHANY
{
@@ -129,7 +125,6 @@ EC_Wrapper::destroy (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
this->orb_->shutdown ();
}
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 20031f40dc1..0cb0b2407d6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -44,15 +44,15 @@ public:
/// RtecEventChannelAdmin::Event_Channel methods.
//@{
virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
- for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ for_consumers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::SupplierAdmin_ptr
- for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ for_suppliers (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Destroy the Event Channel, deactivate from POA, and shut down
/// the ORB.
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual RtecEventChannelAdmin::Observer_Handle
@@ -80,7 +80,7 @@ private:
/// Helper - destroys Event Channel and deactivate from POA, if
/// necessary.
- void destroy_ec (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void destroy_ec (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Event Channel implementation.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 667ac9e8efb..a9f0c8d0fbf 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -61,7 +61,6 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb,
// Write EC ior to a file.
CORBA::String_var str;
str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w");
if (output_file == 0)
@@ -91,7 +90,6 @@ Gateway_EC::run (int argc, char ** argv)
// Initialize ORB and POA, POA Manager, parse args.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
orb_destroyer.init (orb);
if (parse_args (argc, argv) == -1)
@@ -99,17 +97,13 @@ Gateway_EC::run (int argc, char ** argv)
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (poa.in (), "POA") == -1)
return -1;
PortableServer::POAManager_var manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ manager->activate ();
// Set up EC.
TAO_EC_Servant_Var<EC_Wrapper> ec_wrapper (EC_Wrapper::create ());
@@ -127,11 +121,9 @@ Gateway_EC::run (int argc, char ** argv)
ec_wrapper.in (),
ec_deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ec_wrapper->set_deactivator (ec_deactivator);
this->write_ior_file (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set up multicast components.
// Obtain mcast gateway from service configurator.
@@ -142,14 +134,11 @@ Gateway_EC::run (int argc, char ** argv)
if (!gateway)
{
ACE_TRY_THROW (CORBA::INTERNAL ());
- ACE_TRY_CHECK;
}
gateway->run (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run server.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 390b0a14f09..440bad5455f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -24,14 +24,14 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// No-op.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
/// Helper - destroys EC, shutdowns the ORB and prints number of
/// events received.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL)
+ void disconnect (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Number of events of different types pushed to us by EC.
@@ -88,17 +88,17 @@ EC_Consumer::push (const RtecEventComm::EventSet &events
if (this->a_events_ >= 100
&& this->b_events_ >= 100
&& this->c_events_ >= 100)
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect ();
}
void
-EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->a_events_ == 100
@@ -111,8 +111,7 @@ EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
"(A, B, and C), as expected\n"));
}
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->destroy ();
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
@@ -144,31 +143,25 @@ main (int argc, char *argv[])
// Initialize ORB and POA, POA Manager, parse args.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
return 1;
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (poa.in (), "POA") == -1)
return 1;
PortableServer::POAManager_var manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Obtain reference to EC.
obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (ec.in (), "EC") == -1)
return 1;
@@ -186,18 +179,15 @@ main (int argc, char *argv[])
consumer_impl.in (),
consumer_deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer_deactivator.disallow_deactivation ();
// Obtain reference to ConsumerAdmin.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->for_consumers ();
// Obtain ProxyPushSupplier and connect this consumer.
RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
ACE_ConsumerQOS_Factory qos;
qos.start_disjunction_group (3);
@@ -207,15 +197,12 @@ main (int argc, char *argv[])
supplier->connect_push_consumer (consumer.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Allow processing of CORBA requests.
- manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager->activate ();
// Receive events from EC.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index ab13f1a28ef..0d93222b9ea 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -23,15 +23,12 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
// Send 1 event of each type.
events[0].header.type = A_EVENT_TYPE;
consumer->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
events[0].header.type = B_EVENT_TYPE;
consumer->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
events[0].header.type = C_EVENT_TYPE;
consumer->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -62,7 +59,6 @@ main (int argc, char *argv[])
// Initialize ORB and parse args.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
return 1;
@@ -70,23 +66,19 @@ main (int argc, char *argv[])
// Obtain reference to EC.
CORBA::Object_var obj =
orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (ec.in (), "EC") == -1)
return 1;
// Obtain reference to SupplierAdmin.
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->for_suppliers ();
// Obtain ProxyPushConsumer and connect this supplier.
RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
ACE_SupplierQOS_Factory qos;
qos.insert (SOURCE_ID, A_EVENT_TYPE, 0, 1);
@@ -97,15 +89,12 @@ main (int argc, char *argv[])
(RtecEventComm::PushSupplier::_nil (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Send events to EC.
send_events (consumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell EC to shut down.
- ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 7b95c67318f..1221a97921a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -22,7 +22,7 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
/// No-op.
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
//@}
@@ -30,7 +30,7 @@ private:
/// Helper - destroys EC, shutdowns the ORB and prints number of
/// events received.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Number of events pushed to us by EC.
size_t n_events_;
@@ -60,17 +60,17 @@ EC_Consumer::push (const RtecEventComm::EventSet &events
}
if (this->n_events_ >= 100)
- this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect ();
}
void
-EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (void)
{
if (this->n_events_ == 100)
{
@@ -78,11 +78,9 @@ EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
"SUCCESS: consumer received 100 events, as expected\n"));
}
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->destroy ();
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
////////////////////////////////////////////////////////////
@@ -112,31 +110,25 @@ main (int argc, char *argv[])
// Initialize ORB and POA, POA Manager, parse args.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
return 1;
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (poa.in (), "POA") == -1)
return 1;
PortableServer::POAManager_var manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Obtain reference to EC.
obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (ec.in (), "EC") == -1)
return 1;
@@ -154,18 +146,15 @@ main (int argc, char *argv[])
consumer_impl.in (),
consumer_deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer_deactivator.disallow_deactivation ();
// Obtain reference to ConsumerAdmin.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->for_consumers ();
// Obtain ProxyPushSupplier and connect this consumer.
RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
ACE_ConsumerQOS_Factory qos;
qos.start_disjunction_group (1);
@@ -173,15 +162,12 @@ main (int argc, char *argv[])
supplier->connect_push_consumer (consumer.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Allow processing of CORBA requests.
- manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager->activate ();
// Receive events from EC.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index d7d0b4f1973..307e6176a95 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -21,7 +21,6 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
for (int i = 0; i < 100; ++i)
{
consumer->push (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -51,7 +50,6 @@ main (int argc, char *argv[])
// Initialize ORB and parse args.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
return 1;
@@ -59,23 +57,19 @@ main (int argc, char *argv[])
// Obtain reference to EC.
CORBA::Object_var obj =
orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (ec.in (), "EC") == -1)
return 1;
// Obtain reference to SupplierAdmin.
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->for_suppliers ();
// Obtain ProxyPushConsumer and connect this supplier.
RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
ACE_SupplierQOS_Factory qos;
qos.insert (SOURCE_ID, EVENT_TYPE, 0, 1);
@@ -84,15 +78,12 @@ main (int argc, char *argv[])
(RtecEventComm::PushSupplier::_nil (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Send 100 events to EC.
send_events (consumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell EC to shut down.
- ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index ce7c85cdd95..cb529dba339 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -77,7 +77,7 @@ public:
ACE_THROW_SPEC((CORBA::SystemException));
/// Initiate shutdown().
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC((CORBA::SystemException));
//@}
@@ -107,9 +107,9 @@ private:
int check_args (CORBA::ORB_var orb,
RtecEventChannelAdmin::EventChannel_var ec);
/// Connects to EC as a supplier.
- void connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL);
+ void connect_as_supplier (void);
/// Connects to EC as a consumer. Activate with default POA.
- void connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL);
+ void connect_as_consumer (void);
/// Call destroy() on the EC. Does not propagate exceptions.
void destroy_ec (void);
/// Registers with orb's reactor for timeouts ocurring every 0.5
@@ -247,14 +247,12 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
}
// Connect to EC as a supplier.
- this->connect_as_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->connect_as_supplier ();
// Connect to EC as a consumer.
ACE_TRY
{
- this->connect_as_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->connect_as_consumer ();
}
ACE_CATCHANY
{
@@ -262,7 +260,6 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
// Register for reactor timeouts.
if (this->register_for_timeouts () == -1)
@@ -310,17 +307,15 @@ Heartbeat_Application::stop_timeouts (void)
}
void
-Heartbeat_Application::connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Heartbeat_Application::connect_as_supplier (void)
{
// Obtain reference to SupplierAdmin.
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->for_suppliers ();
// Obtain ProxyPushConsumer and connect this supplier.
RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
Consumer_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
ACE_SupplierQOS_Factory qos;
@@ -329,7 +324,6 @@ Heartbeat_Application::connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL)
proxy->connect_push_supplier (RtecEventComm::PushSupplier::_nil (),
qos.get_SupplierQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update resource managers.
this->consumer_ = proxy._retn ();
@@ -337,7 +331,7 @@ Heartbeat_Application::connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Heartbeat_Application::connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Heartbeat_Application::connect_as_consumer (void)
{
// Activate with poa.
RtecEventComm::PushConsumer_var consumer_ref;
@@ -349,17 +343,14 @@ Heartbeat_Application::connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL)
this,
deactivator
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Obtain reference to ConsumerAdmin.
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->for_consumers ();
// Obtain ProxyPushSupplier..
RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
Supplier_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
// Connect this consumer.
@@ -369,7 +360,6 @@ Heartbeat_Application::connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL)
proxy->connect_push_consumer (consumer_ref.in (),
qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Update resource managers.
this->supplier_proxy_disconnect_.set_command (new_proxy_disconnect);
@@ -400,7 +390,6 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
0);
this->consumer_->push (events ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
// We already sent the required number of heartbeats. Time to
@@ -467,7 +456,7 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events
}
void
-Heartbeat_Application::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Heartbeat_Application::disconnect_push_consumer (void)
ACE_THROW_SPEC((CORBA::SystemException))
{
this->shutdown ();
@@ -480,8 +469,7 @@ Heartbeat_Application::destroy_ec (void)
{
ACE_TRY_NEW_ENV
{
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_->destroy ();
}
ACE_CATCHANY
{
@@ -544,7 +532,6 @@ Heartbeat_Application::shutdown (void)
ACE_TRY_NEW_ENV
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -607,31 +594,25 @@ main (int argc, char *argv[])
// Initialize ORB and POA, POA Manager, parse args.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) == -1)
return 1;
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (poa.in (), "POA") == -1)
return 1;
PortableServer::POAManager_var manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Obtain reference to EC.
obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (check_for_nil (ec.in (), "EC") == -1)
return 1;
@@ -641,15 +622,12 @@ main (int argc, char *argv[])
return 1;
app->init (orb, ec ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Allow processing of CORBA requests.
- manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager->activate ();
// Receive events from EC.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 874f96cc737..8fdeeeb0f6e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -27,9 +27,9 @@ EC_Connect::EC_Connect (void)
}
void
-EC_Connect::execute_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Connect::execute_test (void)
{
- // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+ // this->EC_Driver::execute_test ();
}
int
@@ -151,24 +151,20 @@ EC_Connect::allocate_supplier (int i)
}
void
-EC_Connect::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::connect_clients (void)
{
this->start_time_ = ACE_OS::gethrtime ();
switch (this->order_)
{
default:
case 0:
- this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->connect_consumers ();
+ this->connect_suppliers ();
return;
case 1:
- this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->connect_suppliers ();
+ this->connect_consumers ();
return;
case 2:
@@ -180,47 +176,39 @@ EC_Connect::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
max = this->n_suppliers_;
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_suppliers ();
for (int i = 0; i != max; ++i)
{
if (i < this->n_consumers_)
{
this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (i < this->n_suppliers_)
{
this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
}
void
-EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_clients (void)
{
switch (this->order_)
{
default:
case 0:
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_suppliers ();
+ this->disconnect_consumers ();
return;
case 1:
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_consumers ();
+ this->disconnect_suppliers ();
return;
case 2:
@@ -232,12 +220,10 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
max = this->n_suppliers_;
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_suppliers ();
ACE_hrtime_t start_time = ACE_OS::gethrtime ();
for (int i = 0; i != max; ++i)
@@ -246,8 +232,7 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->disconnect ();
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->supplier_disconnect_.sample (now - start_time,
@@ -257,8 +242,7 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->consumer_disconnect_.sample (now - start_time,
@@ -271,15 +255,14 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Connect::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_consumers (void)
{
ACE_hrtime_t start_time = ACE_OS::gethrtime ();
for (int i = 0; i < this->n_consumers_; ++i)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->consumer_disconnect_.sample (now - start_time,
@@ -293,15 +276,14 @@ EC_Connect::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Connect::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_suppliers (void)
{
ACE_hrtime_t start_time = ACE_OS::gethrtime ();
for (int i = 0; i < this->n_suppliers_; ++i)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->disconnect ();
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->supplier_disconnect_.sample (now - start_time,
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index caaf08b425a..91e22f1d8d7 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -51,7 +51,7 @@ public:
virtual void print_usage (void);
virtual void print_args (void) const;
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
// Don't run the suppliers, just test connect and disconnect calls.
virtual void dump_results (void);
@@ -64,14 +64,14 @@ public:
RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
int i
ACE_ENV_ARG_DECL);
- virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
- virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_consumers (void);
+ virtual void disconnect_suppliers (void);
virtual EC_Consumer* allocate_consumer (int i);
virtual EC_Supplier* allocate_supplier (int i);
- virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
- virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void connect_clients (void);
+ virtual void disconnect_clients (void);
private:
ACE_hrtime_t start_time_;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index c3c4661d8c2..f2bc579fd69 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -56,11 +56,10 @@ EC_Inversion::parse_args (int &argc, char *argv [])
}
void
-EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Inversion::connect_consumers (void)
{
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
ACE_ConsumerQOS_Factory qos0;
qos0.start_disjunction_group (2);
@@ -93,11 +92,10 @@ EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Inversion::connect_suppliers (void)
{
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_suppliers ();
ACE_SupplierQOS_Factory qos0;
qos0.insert (1, ACE_ES_EVENT_UNDEFINED, 0, 1);
@@ -129,7 +127,7 @@ EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Inversion::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Inversion::activate_tasks (void)
{
int priority;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index 6811eb6c794..8bb062db7c2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -41,14 +41,14 @@ public:
// The options controlling the event types are ignored, and only two
// consumers are created.
- virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void connect_consumers (void);
+ virtual void connect_suppliers (void);
// In this test there are two consumers, the high priority consumer
// receives only events from a single high priority supplier. The
// other consumer receives events from a set of low priority
// suppliers.
- virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ virtual void activate_tasks (void);
// Activate the suppliers at different priorities
private:
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 2d0cd3903aa..9ac0e220da9 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -51,18 +51,15 @@ main (int argc, char *argv [])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#if (TAO_HAS_CORBA_MESSAGING == 1)
CORBA::Object_var manager_object =
orb->resolve_initial_references ("ORBPolicyManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::PolicyManager_var policy_manager =
CORBA::PolicyManager::_narrow (manager_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any sync_scope;
sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -73,11 +70,9 @@ main (int argc, char *argv [])
orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
sync_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policy_manager->set_policy_overrides (policy_list,
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#else
ACE_DEBUG ((LM_DEBUG,
"CORBA Messaging disabled in this configuration,"
@@ -86,7 +81,6 @@ main (int argc, char *argv [])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -95,14 +89,11 @@ main (int argc, char *argv [])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -110,12 +101,10 @@ main (int argc, char *argv [])
// Get the event channel object reference
CORBA::Object_var object =
orb->string_to_object (ec_ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var ec =
RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ec.in ()))
{
ACE_ERROR ((LM_ERROR,
@@ -136,16 +125,13 @@ main (int argc, char *argv [])
// Connect the consumer
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->for_consumers ();
RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var consumer_reference =
- consumer._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer._this ();
// Simple subscription, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -164,7 +150,6 @@ main (int argc, char *argv [])
proxy_supplier->connect_push_consumer (consumer_reference.in (),
consumer_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Connected consumer\n"));
@@ -173,16 +158,13 @@ main (int argc, char *argv [])
// The canonical protocol to connect to the EC
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->for_suppliers ();
RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var supplier_reference =
- supplier._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier._this ();
// Simple publication, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -196,7 +178,6 @@ main (int argc, char *argv [])
proxy_consumer->connect_push_supplier (supplier_reference.in (),
supplier_qos
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Connected supplier\n"));
@@ -209,7 +190,6 @@ main (int argc, char *argv [])
{
ACE_Time_Value tv (1, 0);
orb->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -239,25 +219,19 @@ main (int argc, char *argv [])
ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
- proxy_supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy_supplier->disconnect_push_supplier ();
- proxy_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ proxy_consumer->disconnect_push_consumer ();
PortableServer::ObjectId_var id;
id = root_poa->servant_to_id (&consumer ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
id = root_poa->servant_to_id (&supplier ACE_ENV_ARG_PARAMETER);
root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCH (CORBA::Exception, ex)
{
@@ -344,7 +318,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
}
void
-EC_Latency_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Latency_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -356,7 +330,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void)
}
void
-EC_Latency_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Latency_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -395,7 +369,6 @@ Task::svc (void)
ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
creation);
this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// ACE_Time_Value tv (0, 5000);
// ACE_OS::sleep (tv);
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 96a182baa25..2008d7f09fb 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -44,7 +44,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -66,7 +66,7 @@ public:
/// Constructor
EC_Latency_Supplier (void);
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 524d4301164..30f9eae7f9b 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -50,18 +50,15 @@ main (int argc, char *argv [])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#if (TAO_HAS_CORBA_MESSAGING == 1)
CORBA::Object_var manager_object =
orb->resolve_initial_references ("ORBPolicyManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::PolicyManager_var policy_manager =
CORBA::PolicyManager::_narrow (manager_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any sync_scope;
sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -72,11 +69,9 @@ main (int argc, char *argv [])
orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
sync_scope
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policy_manager->set_policy_overrides (policy_list,
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
#else
ACE_DEBUG ((LM_DEBUG,
"CORBA Messaging disabled in this configuration,"
@@ -85,7 +80,6 @@ main (int argc, char *argv [])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -94,14 +88,11 @@ main (int argc, char *argv [])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -109,16 +100,13 @@ main (int argc, char *argv [])
TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
root_poa.in ());
TAO_EC_Event_Channel ec_impl (attr);
- ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
RtecEventChannelAdmin::EventChannel_var ec =
- ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
CORBA::String_var str =
orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ior_file_name != 0)
{
@@ -132,16 +120,13 @@ main (int argc, char *argv [])
ACE_OS::fclose (output_file);
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
PortableServer::ObjectId_var id =
root_poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCH (CORBA::Exception, ex)
{
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 513434e07f9..727f5a22cdd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -49,9 +49,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
}
void
-EC_Throughput::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Throughput::execute_test (void)
{
- this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->EC_Driver::execute_test ();
}
void
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index f3d5ee6cc04..c460b502266 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -44,7 +44,7 @@ public:
virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
// set the throughpution flags
- void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ void execute_test (void);
// Don't run the suppliers, just test connect and disconnect calls.
void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 42a1a23e8db..8e06bcecd75 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -27,12 +27,10 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
ACE_ENV_ARG_DECL)
{
this->proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
RtecEventComm::PushConsumer_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Simple subscription, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -52,17 +50,15 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
this->proxy_->connect_push_consumer (me.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
{
ACE_TRY
{
// Disconnect from the proxy
- this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_->disconnect_push_supplier ();
}
ACE_CATCHANY
{
@@ -73,15 +69,12 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
// Deactivate this object
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Deactivate the object
poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -142,7 +135,7 @@ Consumer::push (const RtecEventComm::EventSet& events
}
void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
index 84de97e1df1..5a8fa58df14 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
@@ -41,7 +41,7 @@ public:
ACE_ENV_ARG_DECL);
// Connect to the Event Channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the event channel
// = The RtecEventComm::PushConsumer methods
@@ -49,7 +49,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 8cdb64a3ca5..8317c9e6c63 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -17,12 +17,10 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
ACE_ENV_ARG_DECL)
{
this->proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
RtecEventComm::PushSupplier_var me =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Simple publication, but usually the helper classes in
// $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -37,17 +35,15 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
this->proxy_->connect_push_supplier (me.in (), qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
{
// Disconnect from the EC
ACE_TRY
{
- this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->proxy_->disconnect_push_consumer ();
}
ACE_CATCHANY
{
@@ -55,13 +51,10 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
ACE_ENDTRY;
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -71,7 +64,7 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb)
}
void
-Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (void)
{
ACE_TRY
{
@@ -98,7 +91,6 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
}
this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -107,7 +99,7 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index 6f8b9b1310b..99f71afca5f 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -43,15 +43,15 @@ public:
ACE_ENV_ARG_DECL);
// Connect to the event channel
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the event channel
- void perform_push (ACE_ENV_SINGLE_ARG_DECL);
+ void perform_push (void);
// Push a single event
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The skeleton methods.
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index 30a675ede38..383bde44a26 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -50,7 +50,6 @@ main (int argc, char* argv[])
// Create the ORB, pass the argv list for parsing.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse the arguments, you usually want to do this after
// invoking ORB_init() because ORB_init() will remove all the
@@ -72,7 +71,6 @@ main (int argc, char* argv[])
orb->register_value_factory (vb_factory->tao_repository_id (),
vb_factory
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
vb_factory->_remove_ref (); // release ownership
}
@@ -82,15 +80,11 @@ main (int argc, char* argv[])
// it will not process any requests.
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// **************** THAT COMPLETS THE ORB SETUP
@@ -112,15 +106,13 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -156,8 +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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ as_impl._this ();
TAO_ECG_Refcounted_Endpoint endpoint(new TAO_ECG_UDP_Out_Endpoint);
@@ -189,7 +180,6 @@ main (int argc, char* argv[])
// events:
mcast_eh.open (event_channel.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Again the receiver connects to the event channel as a
// supplier of events, using the Observer features to detect
@@ -198,7 +188,6 @@ main (int argc, char* argv[])
endpoint,
address_server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// The Receiver is also a supplier of events. The exact type of
// events is only known to the application, because it depends
@@ -218,7 +207,6 @@ main (int argc, char* argv[])
pub.is_gateway = 1;
receiver->connect (pub ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE FEDERATION SETUP
@@ -228,11 +216,9 @@ main (int argc, char* argv[])
// channel
Consumer consumer (valuetype);
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_consumers ();
consumer.connect (consumer_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE CLIENT SETUP
@@ -244,8 +230,7 @@ main (int argc, char* argv[])
for (int i = 0; i != 100; ++i)
{
CORBA::Boolean there_is_work =
- orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending ();
if (there_is_work)
{
// We use a TAO extension. The CORBA mechanism does not
@@ -254,7 +239,6 @@ main (int argc, char* argv[])
// them results in a spin loop.
ACE_Time_Value tv (0, 50000);
orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_Time_Value tv (0, 100000);
ACE_OS::sleep (tv);
@@ -268,12 +252,10 @@ main (int argc, char* argv[])
// **************** HERE STARTS THE CLEANUP CODE
- consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer.disconnect ();
// Now let us close the Receiver
- receiver->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ receiver->shutdown ();
int const r = mcast_eh.shutdown ();
@@ -286,8 +268,7 @@ main (int argc, char* argv[])
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivating the event channel implementation is not strictly
// required, the POA will do it for us, but it is good manners:
@@ -298,25 +279,20 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Deactivate the object
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Finally destroy the ORB
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index 07d00c02a6a..2de064826ac 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -49,7 +49,6 @@ main (int argc, char* argv[])
// Create the ORB, pass the argv list for parsing.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse the arguments, you usually want to do this after
// invoking ORB_init() because ORB_init() will remove all the
@@ -67,15 +66,11 @@ main (int argc, char* argv[])
// it will not process any requests.
CORBA::Object_var object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ poa_manager->activate ();
// **************** THAT COMPLETS THE ORB SETUP
@@ -97,15 +92,13 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl.activate ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._this ();
// **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -141,8 +134,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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ as_impl._this ();
// We need a local socket to send the data, open it and check
// that everything is OK:
@@ -159,7 +151,6 @@ main (int argc, char* argv[])
address_server.in (),
endpoint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now we connect the sender as a consumer of events, it will
// receive any event from any source and send it to the "right"
@@ -174,7 +165,6 @@ main (int argc, char* argv[])
ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
sender->connect (sub ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE FEDERATION SETUP
@@ -183,11 +173,9 @@ main (int argc, char* argv[])
// And now create a supplier
Supplier supplier (valuetype);
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->for_suppliers ();
supplier.connect (supplier_admin.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **************** THAT COMPLETES THE CLIENT SETUP
@@ -199,8 +187,7 @@ main (int argc, char* argv[])
for (int i = 0; i != 25; ++i)
{
CORBA::Boolean there_is_work =
- orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending ();
if (there_is_work)
{
// We use a TAO extension. The CORBA mechanism does not
@@ -209,12 +196,10 @@ main (int argc, char* argv[])
// them results in a spin loop.
ACE_Time_Value tv (0, 50000);
orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_Time_Value tv (0, 100000);
ACE_OS::sleep (tv);
- supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.perform_push ();
}
// **************** THAT COMPLETES THE EVENT LOOP
@@ -222,18 +207,15 @@ main (int argc, char* argv[])
// **************** HERE STARTS THE CLEANUP CODE
// First the easy ones
- supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier.disconnect ();
// And also close the sender of events
- sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sender->shutdown ();
// 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ event_channel->destroy ();
// Deactivating the event channel implementation is not strictly
// required, the POA will do it for us, but it is good manners:
@@ -244,25 +226,20 @@ 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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec_impl._default_POA ();
// Get the Object Id used for the servant..
PortableServer::ObjectId_var oid =
poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Deactivate the object
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Finally destroy the ORB
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 1b04ac6a4c5..7306d2685ac 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -28,8 +28,7 @@ EC_Consumer::connect (
ACE_ENV_ARG_DECL)
{
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
}
@@ -47,15 +46,13 @@ EC_Consumer::connect (
if (CORBA::is_nil (this->myself_.in ()))
{
- this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->myself_ = this->_this ();
}
this->is_active_ = 1;
this->supplier_proxy_->connect_push_consumer (this->myself_.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int
@@ -65,33 +62,29 @@ EC_Consumer::connected (void) const
}
void
-EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (void)
{
if (CORBA::is_nil (this->supplier_proxy_.in ()))
return;
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
this->supplier_proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
}
void
-EC_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::shutdown (void)
{
if (!this->is_active_)
return;
// Deactivate the servant
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->myself_ = RtecEventComm::PushConsumer::_nil ();
this->is_active_ = 0;
}
@@ -115,7 +108,6 @@ EC_Consumer::push (const RtecEventComm::EventSet& events
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (events.length () == 0)
{
@@ -152,16 +144,14 @@ EC_Consumer::push (const RtecEventComm::EventSet& events
if (e.header.type == this->shutdown_event_type_)
this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
}
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 439b95f9747..cbab389f954 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -64,10 +64,10 @@ public:
/// The application can invoke this method to disconnect from the EC
/// and deactivate this class.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// The application is shutting down, deactivate the consumer.
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
/// Accumulate our statistics to the totals.
void accumulate (ACE_Throughput_Stats& throughput) const;
@@ -82,7 +82,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index 22e3480f3ce..cfa0c1c3b30 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -19,46 +19,39 @@ EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
// The canonical protocol to connect to the EC
RtecEventComm::PushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
if (CORBA::is_nil (this->supplier_proxy_.in ()))
{
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
}
this->supplier_proxy_->connect_push_consumer (consumer.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-EC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Consumer::disconnect (void)
{
if (!CORBA::is_nil (this->supplier_proxy_.in ()))
{
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
this->supplier_proxy_ =
RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
}
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
}
void
-EC_Counting_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Consumer::deactivate (void)
{
PortableServer::POA_var consumer_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var consumer_id =
consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -107,7 +100,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
}
void
-EC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Consumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 06878cb4b9f..f61be75b8c5 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -39,8 +39,8 @@ public:
void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
const RtecEventChannelAdmin::ConsumerQOS &qos
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
+ void deactivate (void);
/// Print out an error message if the event count is too far from the
/// expected count.
@@ -52,7 +52,7 @@ public:
virtual void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 59bfbe0b6ac..0d7c67a7469 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -23,12 +23,10 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
ACE_ENV_ARG_DECL)
{
RtecEventComm::PushConsumer_var consumer =
- this->consumer_adapter_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_adapter_._this ();
this->supplier_proxy_ =
- consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->obtain_push_supplier ();
// Let's say that the execution time for event 2 is 1
// milliseconds...
@@ -45,23 +43,18 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
this->supplier_proxy_->connect_push_consumer (consumer.in (),
consumer_qos.get_ConsumerQOS ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-EC_Counting_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier::deactivate (void)
{
- this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_proxy_->disconnect_push_supplier ();
PortableServer::POA_var consumer_poa =
- this->consumer_adapter_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_adapter_._default_POA ();
PortableServer::ObjectId_var consumer_id =
consumer_poa->servant_to_id (&this->consumer_adapter_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -92,39 +85,32 @@ EC_Counting_Supplier::connect (
ACE_ENV_ARG_DECL)
{
RtecEventComm::PushSupplier_var supplier =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
if (CORBA::is_nil (this->consumer_proxy_.in ()))
{
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
}
this->consumer_proxy_->connect_push_supplier (supplier.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-EC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier::disconnect (void)
{
if (!CORBA::is_nil (this->consumer_proxy_.in ()))
{
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
}
PortableServer::POA_var supplier_poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var supplier_id =
supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_proxy_ =
RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -145,18 +131,17 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&
event[0].header.ttl = 1;
this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_count++;
}
void
-EC_Counting_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Supplier::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-EC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
@@ -179,8 +164,7 @@ EC_Counting_Supplier_Task::svc ()
{
ACE_TRY_NEW_ENV
{
- this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run ();
}
ACE_CATCHANY
{
@@ -204,14 +188,13 @@ EC_Counting_Supplier_Task::push_count (void)
}
void
-EC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier_Task::run (void)
{
this->event_.length (1);
int stop = 0;
do {
this->supplier_->push (this->event_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Sleep for a short time to avoid spinning...
ACE_OS::sleep (0);
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 8e6f940daa6..7a89f71d468 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -47,7 +47,7 @@ public:
void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
int period
ACE_ENV_ARG_DECL);
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
/// Simple connect/disconnect methods..
void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
@@ -59,17 +59,17 @@ public:
void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
const RtecEventChannelAdmin::SupplierQOS &qos
ACE_ENV_ARG_DECL);
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// The Consumer side methods.
void push (const RtecEventComm::EventSet& events
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// The skeleton methods.
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Count the number of events sent
@@ -108,7 +108,7 @@ public:
CORBA::ULong push_count (void);
/// Run a single iteration of the test
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
private:
/// The supplier we are turning into an active object
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 4768e14fb5e..d83239d9f4d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -68,15 +68,12 @@ EC_Driver::run (int argc, char* argv[])
ACE_High_Res_Timer::calibrate ();
this->run_init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->execute_test ();
this->dump_results ();
- this->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->run_cleanup ();
}
ACE_CATCHANY
{
@@ -95,7 +92,6 @@ EC_Driver::run_init (int &argc, char* argv[]
ACE_ENV_ARG_DECL)
{
this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->parse_args (argc, argv))
ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
@@ -119,8 +115,7 @@ EC_Driver::run_init (int &argc, char* argv[]
ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
CORBA::COMPLETED_NO));
- this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->initialize_ec_impl ();
if (this->allocate_consumers () == -1)
ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
@@ -130,27 +125,22 @@ EC_Driver::run_init (int &argc, char* argv[]
ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
- this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->connect_clients ();
}
void
-EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::run_cleanup (void)
{
- this->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_clients ();
- this->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->shutdown_clients ();
- this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_ec ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n"));
- this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->deactivate_ec ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel deactivated\n"));
@@ -161,11 +151,9 @@ EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
this->cleanup_ec ();
this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->root_poa_ = PortableServer::POA::_nil ();
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->orb_->destroy ();
this->orb_ = CORBA::ORB::_nil ();
}
@@ -175,11 +163,9 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
{
this->orb_ =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object.in ()))
{
@@ -190,14 +176,11 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
this->root_poa_ =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
}
void
@@ -272,27 +255,25 @@ EC_Driver::move_to_rt_class (void)
}
void
-EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_ec_impl (void)
{
#if !defined(EC_DISABLE_REMOTE_EC)
if (this->use_remote_ec_ == 1)
{
- this->obtain_remote_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->obtain_remote_ec ();
return;
}
#endif
- this->initialize_new_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->initialize_new_ec ();
}
#if !defined(EC_DISABLE_REMOTE_EC)
void
-EC_Driver::obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::obtain_remote_ec (void)
{
CosNaming::NamingContext_var naming_context =
- this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->get_naming_context ();
CosNaming::Name channel_name (1);
channel_name.length (1);
@@ -300,19 +281,16 @@ EC_Driver::obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var tmp =
naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->event_channel_ =
RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::get_naming_context (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR ((LM_ERROR,
@@ -324,7 +302,7 @@ EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL)
#endif
void
-EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_new_ec (void)
{
TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
this->root_poa_.in ());
@@ -335,16 +313,14 @@ EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
new TAO_EC_Event_Channel (attr);
this->ec_impl_ = ec;
- ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->activate ();
this->event_channel_ =
- this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_impl_->_this ();
}
void
-EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::deactivate_ec (void)
{
#if !defined(EC_DISABLE_REMOTE_EC)
if (this->use_remote_ec_ == 1)
@@ -354,13 +330,10 @@ EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
{
// Deactivate the EC
PortableServer::POA_var poa =
- this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_impl_->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->verbose ())
@@ -369,10 +342,9 @@ EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
}
void
-EC_Driver::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::destroy_ec (void)
{
- this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->destroy ();
}
int
@@ -414,46 +386,38 @@ EC_Driver::allocate_supplier (int i)
}
void
-EC_Driver::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_clients (void)
{
- this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->connect_consumers ();
- this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->connect_suppliers ();
}
void
-EC_Driver::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_clients (void)
{
- this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_suppliers ();
- this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->disconnect_consumers ();
}
void
-EC_Driver::shutdown_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_clients (void)
{
- this->shutdown_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->shutdown_suppliers ();
- this->shutdown_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->shutdown_consumers ();
}
void
-EC_Driver::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_consumers (void)
{
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_consumers ();
for (int i = 0; i < this->n_consumers_; ++i)
{
this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected consumer(s)\n"));
@@ -468,7 +432,6 @@ EC_Driver::connect_consumer (
RtecEventChannelAdmin::ConsumerQOS qos;
int shutdown_event_type;
this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumers_[i]->connect (consumer_admin,
qos,
@@ -502,16 +465,14 @@ EC_Driver::build_consumer_qos (
}
void
-EC_Driver::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_suppliers (void)
{
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->event_channel_->for_suppliers ();
for (int i = 0; i < this->n_suppliers_; ++i)
{
this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (this->verbose ())
@@ -527,7 +488,6 @@ EC_Driver::connect_supplier (
RtecEventChannelAdmin::SupplierQOS qos;
int shutdown_event_type;
this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->suppliers_[i]->connect (supplier_admin,
qos,
@@ -562,13 +522,12 @@ EC_Driver::build_supplier_qos (
}
void
-EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::execute_test (void)
{
if (this->allocate_tasks () == -1)
return;
- this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->activate_tasks ();
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers are active\n"));
@@ -614,7 +573,7 @@ EC_Driver::allocate_task (int i)
}
void
-EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Driver::activate_tasks (void)
{
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -640,56 +599,52 @@ EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-EC_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_suppliers (void)
{
if (this->suppliers_ == 0)
return;
for (int i = 0; i < this->n_suppliers_; ++i)
{
- this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->disconnect ();
}
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers disconnected\n"));
}
void
-EC_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_consumers (void)
{
if (this->consumers_ == 0)
return;
for (int i = 0; i < this->n_consumers_; ++i)
{
- this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->disconnect ();
}
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers disconnected\n"));
}
void
-EC_Driver::shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_suppliers (void)
{
if (this->suppliers_ == 0)
return;
for (int i = 0; i < this->n_suppliers_; ++i)
{
- this->suppliers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->suppliers_[i]->shutdown ();
}
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers deactivated\n"));
}
void
-EC_Driver::shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_consumers (void)
{
if (this->consumers_ == 0)
return;
for (int i = 0; i < this->n_consumers_; ++i)
{
- this->consumers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumers_[i]->shutdown ();
}
if (this->verbose ())
ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers deactivated\n"));
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 64994560a36..31de1c799b1 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -68,7 +68,7 @@ public:
ACE_ENV_ARG_DECL);
/// The cleanup section
- virtual void run_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void run_cleanup (void);
/// Initialize the ORB and obtain the RootPOA object
virtual void initialize_orb_and_poa (int& argc, char* argv[]
@@ -88,23 +88,23 @@ public:
/// Construct the EC and its helper objects, also activates the EC in
/// the RootPOA.
- virtual void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void initialize_ec_impl (void);
/// By default connect the consumers and then the suppliers, other
/// orders should work too.
- virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect_clients (void);
/// By default disconnect the suppliers and then the consumers, other
/// orders should work too.
- virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_clients (void);
/// By default deactivate the suppliers and then the consumers, other
/// orders should work too.
- virtual void shutdown_clients (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown_clients (void);
/// Connect all the consumers, by default it lets each consumer
/// connect itself.
- virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect_consumers (void);
/// Connect consumer number <i> using the consumer_admin provided.
virtual void connect_consumer (
@@ -121,7 +121,7 @@ public:
/// Connect all the suppliers, by default it lets each supplier
/// connect itself.
- virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect_suppliers (void);
/// Connect supplier number <i> using the supplier_admin provided.
virtual void connect_supplier (
@@ -137,7 +137,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED);
/// Execute the test, by default simply call activate_suppliers()
- virtual void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_test (void);
/**
* Dump the results, i.e. invoke dump_results on all the suppliers
@@ -147,22 +147,22 @@ public:
virtual void dump_results (void);
/// Disconnect all the consumers.
- virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_consumers (void);
/// Disconnect all the suppliers.
- virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_suppliers (void);
/// Deactivate all the consumers.
- virtual void shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown_consumers (void);
/// Deactivate all the suppliers.
- virtual void shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void shutdown_suppliers (void);
/// Call EC->destroy
- virtual void destroy_ec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void destroy_ec (void);
/// De-activate the EC (and its helper classes).
- virtual void deactivate_ec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void deactivate_ec (void);
/// Cleanup the resources
virtual void cleanup_ec (void);
@@ -198,14 +198,14 @@ public:
#if !defined(EC_DISABLE_REMOTE_EC)
/// Obtain the EC from the Naming service
- virtual void obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void obtain_remote_ec (void);
virtual CosNaming::NamingContext_ptr
- get_naming_context (ACE_ENV_SINGLE_ARG_DECL);
+ get_naming_context (void);
#endif
/// Initialize the EC using the new implementation
- virtual void initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void initialize_new_ec (void);
/// Allocate the suppliers and the consumers
virtual int allocate_consumers (void);
@@ -221,7 +221,7 @@ public:
/// Activate all the tasks, by default runs each supplier on its
/// own thread.
- virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void activate_tasks (void);
protected:
/// The ORB
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 566a09d3c97..1bbf0a96679 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -73,7 +73,6 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event
ACE_hrtime_t start = ACE_OS::gethrtime ();
this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_hrtime_t end = ACE_OS::gethrtime ();
this->throughput_.sample (end - this->throughput_start_,
@@ -113,11 +112,9 @@ EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
ACE_ENV_ARG_DECL)
{
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->obtain_push_consumer ();
this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -133,55 +130,48 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
if (CORBA::is_nil (this->myself_.in ()))
{
- this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->myself_ = this->_this ();
}
this->is_active_ = 1;
this->consumer_proxy_->connect_push_supplier (this->myself_.in (),
qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-EC_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Supplier::disconnect (void)
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
return;
- this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_proxy_->disconnect_push_consumer ();
this->consumer_proxy_ =
RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
}
void
-EC_Supplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+EC_Supplier::shutdown (void)
{
if (!this->is_active_)
return;
// Deactivate the servant
PortableServer::POA_var poa =
- this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->is_active_ = 0;
this->myself_ = RtecEventComm::PushSupplier::_nil ();
}
void
-EC_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+EC_Supplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->driver_->supplier_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->consumer_proxy_ =
RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
}
@@ -257,7 +247,6 @@ EC_Supplier_Task::svc (void)
this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sys_ex)
{
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 065a20a15aa..29fd4a3451f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -64,7 +64,7 @@ public:
const RtecEventComm::Event& event);
/// Send a shutdown event.
- void send_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void send_shutdown (void);
/// Connect using a <supplier_admin> and publications (<qos>)
/// computed by the user
@@ -81,10 +81,10 @@ public:
ACE_ENV_ARG_DECL);
/// Disconnect from the EC, also deactivates the object
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Disconnect from the EC, also deactivates the object
- void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown (void);
/// Dump the results...
virtual void dump_results (const char* name,
@@ -98,7 +98,7 @@ public:
RtecEventComm::Event& event);
// = The PushSupplier methods
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 2c77a1e7750..0939a948c69 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -25,7 +25,7 @@ class FTClientMain
////////////
// execution
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
/////////////////
// implementation
@@ -40,7 +40,7 @@ private:
ACE_ENV_ARG_DECL);
- int next_replica (ACE_ENV_SINGLE_ARG_DECL);
+ int next_replica (void);
////////////////////
// forbidden methods
@@ -276,7 +276,6 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->set(%ld);\n", operand);
}
this->replica_->set(operand ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
counter = operand;
break;
}
@@ -286,8 +285,7 @@ int FTClientMain::pass (
{
ACE_OS::fprintf (stdout, "FT Client: ->get();\n");
}
- long value = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ long value = this->replica_->counter();
if (value == operand)
{
ACE_OS::fprintf (stdout, "FT Client: Good: Read %ld expecting %ld\n", value, operand);
@@ -308,7 +306,6 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->counter(%ld);\n", operand);
}
this->replica_->counter(operand ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
counter = operand;
break;
}
@@ -319,7 +316,6 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", operand);
}
this->replica_->increment(operand ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
counter += operand;
break;
}
@@ -330,7 +326,6 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", -operand);
}
this->replica_->increment(-operand ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
counter -= operand;
break;
}
@@ -340,8 +335,7 @@ int FTClientMain::pass (
{
ACE_OS::fprintf (stdout, "FT Client: ->counter();\n");
}
- long attribute = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ long attribute = this->replica_->counter();
ACE_OS::fprintf (stdout, "FT Client: Attribute: %ld\n", attribute);
echo = 0;
break;
@@ -352,8 +346,7 @@ int FTClientMain::pass (
{
ACE_OS::fprintf (stdout, "FT Client: ->is_alive();\n");
}
- int alive = this->replica_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int alive = this->replica_->is_alive();
ACE_OS::fprintf (stdout, "FT Client: Is alive? %d\n", alive);
break;
}
@@ -364,7 +357,6 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->die(%ld);\n", operand);
}
this->replica_->die(static_cast<FT_TEST::TestReplica::Bane> (operand) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
echo = 0;
break;
}
@@ -374,8 +366,7 @@ int FTClientMain::pass (
{
ACE_OS::fprintf (stdout, "FT Client: ->get_state();\n");
}
- state = this->replica_->get_state(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ state = this->replica_->get_state();
stateValue = counter;
break;
}
@@ -389,7 +380,6 @@ int FTClientMain::pass (
}
this->replica_->set_state (state.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
counter = stateValue;
}
else
@@ -404,8 +394,7 @@ int FTClientMain::pass (
{
ACE_OS::fprintf (stdout, "FT Client: ->get_update();\n");
}
- update = this->replica_->get_update(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ update = this->replica_->get_update();
updateValue = counter;
break;
}
@@ -418,7 +407,6 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->set_update(saved_update);\n");
}
this->replica_->set_update(update.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
counter = updateValue;
}
else
@@ -453,12 +441,10 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->shutdown();\n");
}
this->replica_->shutdown( ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
// @@ Note: this is here because the corba event loop seems to go to sleep
// if there's nothing for it to do.
// not quite sure why, yet. Dale
- this->replica_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->replica_->is_alive();
}
ACE_CATCHANY
{
@@ -488,8 +474,7 @@ int FTClientMain::pass (
ACE_OS::fprintf (stdout, "FT Client: ->get();\n");
}
- long value = this->replica_->get(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ long value = this->replica_->get();
if (value == counter)
{
if (this->verbose_ >= NORMAL)
@@ -508,7 +493,7 @@ int FTClientMain::pass (
return result;
}
-int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
+int FTClientMain::next_replica (void)
{
int result = 0;
if (this->replica_pos_ < this->replica_iors_.size())
@@ -516,7 +501,6 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
this->replica_name_ = this->replica_iors_[this->replica_pos_].c_str();
this->replica_pos_ += 1;
CORBA::Object_var rep_obj = this->orb_->string_to_object (this->replica_name_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
this->replica_ = FT_TEST::TestReplica::_narrow (rep_obj.in ());
if (! CORBA::is_nil (replica_.in ()))
{
@@ -537,21 +521,19 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
}
-int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
+int FTClientMain::run (void)
{
int result = 0;
this->orb_ = CORBA::ORB_init(this->argc_, this->argv_);
- int ok = next_replica (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int ok = next_replica ();
if (ok)
{
// retry information
ACE_CString command;
int retry = 0;
- long counter = this->replica_->get(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ long counter = this->replica_->get();
if (this->verbose_ >= NORMAL)
{
@@ -568,7 +550,6 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY_NEW_ENV
{
result = pass (counter, more, command, retry ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -578,8 +559,7 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
retry = 0;
int handled = 0;
- handled = next_replica(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ handled = next_replica();
if (handled)
{
ACE_OS::fprintf (stdout, "FT Client: Recovering from fault.\n");
@@ -632,8 +612,7 @@ main (int argc, char *argv[])
{
ACE_TRY_NEW_ENV
{
- result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = app.run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 996c2a27fb7..09a49aa7f0c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -141,10 +141,8 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var registry_obj
= this->orb_->string_to_object (this->registry_ior_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableGroup::FactoryRegistry_var registry
= PortableGroup::FactoryRegistry::_narrow(registry_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (! CORBA::is_nil (registry.in ()))
{
result = this->creator_.set_factory_registry(registry.in());
@@ -154,7 +152,6 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
if (result == 0)
{
result = this->creator_.init (orb ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
@@ -162,7 +159,6 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(naming_obj.in ()))
{
@@ -172,13 +168,12 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
}
this->naming_context_=
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return result;
}
-int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
+int FTAPP::FT_Creator::run (void)
{
int result = 0;
size_t typeCount = this->create_roles_.size();
@@ -191,12 +186,10 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
role,
this->write_iors_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
if (this->write_iogr_)
{
CORBA::String_var iogr = this->orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
char iogr_filename[1000];
ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename)-1, "%s%s_%d.iogr",
@@ -231,7 +224,6 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_->rebind (this_name, group.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
}
iogr_seq_ += 1;
@@ -243,7 +235,6 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
{
const char * role = this->unregister_roles_[nType].c_str();
result = this->creator_.unregister_role (role ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return result;
@@ -261,17 +252,14 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
- ACE_TRY_CHECK;
FTAPP::FT_Creator app;
result = app.parse_args(argc, argv);
if (result == 0)
{
result = app.init (orb.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == 0)
{
- result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = app.run ();
}
if (result == 0)
{
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 14e2664fda9..6545964e6c2 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -46,7 +46,7 @@ namespace FTAPP
////////////
// execution
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
////////////
// shut down
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index ba8b3d7e58d..9fae64420d9 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -75,8 +75,7 @@ FT_ReplicaFactory_i::FT_ReplicaFactory_i ()
{
ACE_DECLARE_NEW_CORBA_ENV;
char const * repo_id =
- FT_TEST::_tc_TestReplica->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ FT_TEST::_tc_TestReplica->id ();
ACE_DEBUG ((LM_DEBUG,
"TestReplica type_id: %s\n",
@@ -259,7 +258,6 @@ int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
// unless result is non-zero.
// non-zero result means panic.
replica->idle(result ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
}
@@ -297,7 +295,6 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
{
@@ -311,7 +308,6 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -320,25 +316,20 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var this_obj =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->ior_ = this->orb_->object_to_string (this_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->factory_registry_ior_ != 0)
{
@@ -346,7 +337,6 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var reg_obj = this->orb_->string_to_object(factory_registry_ior_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(reg_obj.in ());
if (CORBA::is_nil(this->factory_registry_.in ()))
{
@@ -365,16 +355,13 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
ACE_TRY_NEW_ENV
{
CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (replication_manager_.in ()))
{
this->have_replication_manager_ = 1;
// empty criteria
::PortableGroup::Criteria criteria;
this->factory_registry_ = this->replication_manager_->get_factory_registry(criteria ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->factory_registry_.in ()))
{
ACE_ERROR ((LM_ERROR,"ReplicaFactory: ReplicationManager failed to return FactoryRegistry. Factory will not be registered.\n" ));
@@ -383,7 +370,6 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
else
{
this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil(this->factory_registry_.in ()))
{
ACE_DEBUG ((LM_DEBUG,"Found a FactoryRegistry DBA ReplicationManager\n" ));
@@ -429,15 +415,13 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
));
char const * replica_repository_id =
- FT_TEST::_tc_TestReplica->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ FT_TEST::_tc_TestReplica->id ();
this->factory_registry_->register_factory(
roleName,
replica_repository_id,
info
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
this->registered_ = 1;
}
@@ -486,7 +470,6 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(naming_obj.in ())){
ACE_ERROR_RETURN ((LM_ERROR,
@@ -496,14 +479,12 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->this_name_.length (1);
this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
this->naming_context_->rebind (this->this_name_, this_obj.in() // CORBA::Object::_duplicate(this_obj)
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
// if we're testing. Create a replica at startup time
@@ -513,19 +494,16 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
InternalGuard guard (this->internals_);
FT_TestReplica_i * replica = create_replica ("test" ACE_ENV_ARG_PARAMETER);
- PortableServer::POA_var poa = replica->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ PortableServer::POA_var poa = replica->_default_POA ();
::CORBA::Object_var replica_obj = poa->servant_to_reference(replica ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
write_ior (this->test_output_file_, replicaIOR.in ());
}
return result;
}
-int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+int FT_ReplicaFactory_i::fini (void)
{
if (this->ior_output_file_ != 0)
{
@@ -536,7 +514,6 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
{
this->naming_context_->unbind (this_name_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->ns_name_ = 0;
}
@@ -558,7 +535,6 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
this->factory_registry_->unregister_factory_by_location (
location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
else
{
@@ -579,7 +555,6 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
roleName,
location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
}
@@ -595,8 +570,7 @@ void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * rep
{
if(this->replicas_[id] == replica)
{
- replica->fini(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ replica->fini();
delete replica;
this->replicas_[id] = 0;
this->empty_slots_ += 1;
@@ -696,7 +670,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
::CORBA::Object_ptr replica_obj =
- replica->_default_POA(ACE_ENV_SINGLE_ARG_PARAMETER)->servant_to_reference(replica);
+ replica->_default_POA()->servant_to_reference(replica);
METHOD_RETURN(FT_ReplicaFactory_i::create_object) replica_obj->_duplicate(replica_obj);
}
@@ -753,14 +727,14 @@ void FT_ReplicaFactory_i::delete_object (
METHOD_RETURN(FT_ReplicaFactory_i::delete_object);
}
-CORBA::Boolean FT_ReplicaFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
1;
}
-void FT_ReplicaFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void FT_ReplicaFactory_i::shutdown (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index a87cb08afe6..18678e96962 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -80,7 +80,7 @@ public:
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
int idle(int & result ACE_ENV_ARG_DECL);
@@ -105,7 +105,7 @@ public:
// CORBA interface
// See IDL for documentation
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -139,7 +139,7 @@ public:
//////////////////////////////////////////
// CORBA interface PullMonitorable methods
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/////////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 16f1f70eee4..4b2a849c9f9 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -64,7 +64,6 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
{
// Initialize the ORB.
this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse arguments.
result = this->parse_args (argc, argv);
@@ -75,17 +74,14 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
{
obj = this->orb_->string_to_object (
this->rm_ior_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
else
{
obj = this->orb_->resolve_initial_references (
"ReplicationManager" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->replication_manager_ = FT::ReplicationManager::_narrow (
obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->replication_manager_.in()))
{
ACE_ERROR ((LM_ERROR,
@@ -166,8 +162,7 @@ int TAO_FT_ReplicationManagerController::run ()
{
if (this->shutdown_ == 1)
{
- this->replication_manager_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->replication_manager_->shutdown ();
ACE_Time_Value tv (0, 500000);
ACE_OS::sleep (tv);
}
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index ad89659b3bc..1d9fa603940 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -157,8 +157,7 @@ const char * FT_TestReplica_i::repository_id()
ACE_DECLARE_NEW_CORBA_ENV;
const char * id =
- FT_TEST::_tc_TestReplica->id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ FT_TEST::_tc_TestReplica->id();
return id;
}
@@ -183,7 +182,7 @@ unsigned long FT_TestReplica_i::factory_id()const
return this->factory_id_;
}
-::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (void)
{
return ::PortableServer::POA::_duplicate(this->poa_.in ());
}
@@ -207,7 +206,6 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -219,7 +217,6 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
@@ -229,29 +226,26 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
-void FT_TestReplica_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
+void FT_TestReplica_i::_remove_ref (void)
{
//////////////////////////////////////////////////
// WARNING: The following call invokes fini then deletes this object
this->factory_->remove_replica(this->factory_id_, this ACE_ENV_ARG_PARAMETER);
}
-int FT_TestReplica_i::fini (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+int FT_TestReplica_i::fini (void)
{
return 0;
}
@@ -260,7 +254,7 @@ int FT_TestReplica_i::fini (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
/////////////////////////////////////////////////////
// class FT_TestReplica_i: PullMonitorable interface
-CORBA::Boolean FT_TestReplica_i::is_alive (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Boolean FT_TestReplica_i::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0)
@@ -277,7 +271,7 @@ CORBA::Boolean FT_TestReplica_i::is_alive (ACE_ENV_SINGLE_ARG_DECL)
/////////////////////////////////////////////////////
// class FT_TestReplica_i: Updateable interface
-FT::State * FT_TestReplica_i::get_update (ACE_ENV_SINGLE_ARG_DECL)
+FT::State * FT_TestReplica_i::get_update (void)
ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable))
{
KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0)
@@ -303,7 +297,7 @@ void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
/////////////////////////////////////////////////////
// class FT_TestReplica_i: Checkpointable interface
-::FT::State * FT_TestReplica_i::get_state (ACE_ENV_SINGLE_ARG_DECL)
+::FT::State * FT_TestReplica_i::get_state (void)
ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable))
{
#if defined(FT_TEST_LACKS_STATE)
@@ -371,7 +365,7 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta
return counter;
}
-CORBA::Long FT_TestReplica_i::get (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Long FT_TestReplica_i::get (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
KEVORKIAN_DURING_RETURN(get, 0)
@@ -379,7 +373,7 @@ CORBA::Long FT_TestReplica_i::get (ACE_ENV_SINGLE_ARG_DECL)
return counter;
}
-CORBA::Long FT_TestReplica_i::counter (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Long FT_TestReplica_i::counter (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
KEVORKIAN_DURING_RETURN([get]counter, 0)
@@ -407,7 +401,7 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane when
KEVORKIAN(RIGHT_NOW, die)
}
-void FT_TestReplica_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void FT_TestReplica_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 77551ea21a0..a13ce425118 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -68,7 +68,7 @@ public:
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* idle time activity.
@@ -89,9 +89,9 @@ public:
//////////////////////////////////////////
// Override CORBA servant virtual methods
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ virtual PortableServer::POA_ptr _default_POA (void);
- virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void _remove_ref (void);
private:
///////////////////////////
@@ -104,10 +104,10 @@ private:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Long get (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Long counter (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Long counter (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void counter (CORBA::Long counter
@@ -118,25 +118,25 @@ private:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
///////////////////////////
// override PullMonitorable
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
///////////////////////////
// override Updatable
- virtual ::FT::State * get_update (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::FT::State * get_update (void)
ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable));
virtual void set_update (const FT::State & s ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate));
- virtual ::FT::State * get_state (ACE_ENV_SINGLE_ARG_DECL)
+ virtual ::FT::State * get_state (void)
ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable));
virtual void set_state (const FT::State & s ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 12357cb9297..31b74887a84 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -132,10 +132,8 @@ int ReplicationManagerFaultConsumerAdapter::init (
CORBA::Object_var detector_obj = this->orb_->string_to_object (
this->detector_ior_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->factory_ = ::FT::FaultDetectorFactory::_narrow (
detector_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->factory_.in()))
{
ACE_ERROR_RETURN ((
@@ -156,10 +154,8 @@ int ReplicationManagerFaultConsumerAdapter::init (
CORBA::Object_var notifier_ior = this->orb_->string_to_object (
this->notifier_ior_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->notifier_ = ::FT::FaultNotifier::_narrow (
notifier_ior.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->notifier_.in()))
{
ACE_ERROR_RETURN ((
@@ -197,10 +193,8 @@ int ReplicationManagerFaultConsumerAdapter::init (
// Get the RootPOA from the ORB.
CORBA::Object_var poa_obj = this->orb_->resolve_initial_references (
"RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POA_var poa = PortableServer::POA::_narrow (
poa_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create a fault analyzer.
TAO::FT_FaultAnalyzer * analyzer = 0;
@@ -220,7 +214,6 @@ int ReplicationManagerFaultConsumerAdapter::init (
this->notifier_.in(),
analyzer
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (result != 0)
{
ACE_ERROR_RETURN ((
@@ -234,10 +227,8 @@ int ReplicationManagerFaultConsumerAdapter::init (
// Activate the RootPOA.
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa->the_POAManager ();
+ poa_manager->activate ();
/////////////////////////
// Set up fault detectors
@@ -256,10 +247,8 @@ int ReplicationManagerFaultConsumerAdapter::init (
const char * iorName = this->replica_iors_[nRep];
CORBA::Object_var replica_obj = this->orb_->string_to_object (
iorName ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow (
replica_obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(replica.in()))
{
ACE_ERROR_RETURN ((
@@ -327,7 +316,6 @@ int ReplicationManagerFaultConsumerAdapter::init (
criteria.in(),
factory_creation_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
}
@@ -358,10 +346,10 @@ const char * ReplicationManagerFaultConsumerAdapter::identity () const
/**
* Clean house for process shut down.
*/
-int ReplicationManagerFaultConsumerAdapter::fini (ACE_ENV_SINGLE_ARG_DECL)
+int ReplicationManagerFaultConsumerAdapter::fini (void)
{
// Delegate to the FT_FaultConsumer.
- return this->p_fault_consumer_->fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->p_fault_consumer_->fini ();
}
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 6b45d786a6e..804fb572a80 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -60,7 +60,7 @@ public:
/**
* Clean house for process shut down.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
size_t notifications() const;
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 6d0e445511f..50fc461555f 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -27,7 +27,7 @@ int StubBatchConsumer::parse_args (int argc, char * argv[])
}
-::PortableServer::POA_ptr StubBatchConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr StubBatchConsumer::_default_POA (void)
{
return ::PortableServer::POA::_duplicate(this->poa_.in ());
}
@@ -53,7 +53,6 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -64,7 +63,6 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
this->poa_ = PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
@@ -74,23 +72,19 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// find my identity as an object
CORBA::Object_var this_obj =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil();
@@ -112,7 +106,7 @@ const char * StubBatchConsumer::identity () const
/**
* Clean house for process shut down.
*/
-void StubBatchConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
+void StubBatchConsumer::fini (void)
{
this->notifier_->disconnect_consumer(this->consumer_id_ ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 60df5048d5b..9cadd2dbbfe 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -38,7 +38,7 @@ public:
*/
virtual ~StubBatchConsumer ();
- ::PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ ::PortableServer::POA_ptr _default_POA (void);
::PortableServer::ObjectId objectId()const;
/**
@@ -66,7 +66,7 @@ public:
/**
* Clean house for process shut down.
*/
- void fini (ACE_ENV_SINGLE_ARG_DECL);
+ void fini (void);
public:
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 56731cf5f59..7951b5f1bd5 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -136,14 +136,12 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
result = this->faultConsumer_.init (orb, this->notifier_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
if (result == 0)
{
result = this->batchConsumer_.init (orb, this->notifier_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
/////////////////////////
@@ -221,7 +219,6 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
criteria.in(),
factory_creation_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
}
@@ -251,10 +248,10 @@ const char * StubFaultAnalyzer::identity () const
/**
* Clean house for process shut down.
*/
-int StubFaultAnalyzer::fini (ACE_ENV_SINGLE_ARG_DECL)
+int StubFaultAnalyzer::fini (void)
{
- this->faultConsumer_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
- this->batchConsumer_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->faultConsumer_.fini();
+ this->batchConsumer_.fini();
return 0;
}
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 2a5067ad4a2..6f75ae1d52a 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -66,7 +66,7 @@ public:
* Prepare to exit.
* @return zero for success; nonzero is process return code for failure.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/////////////////
// Implementation
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 25a2934df15..8c89a2ade40 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -17,7 +17,7 @@ StubFaultConsumer::~StubFaultConsumer ()
{
}
-::PortableServer::POA_ptr StubFaultConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr StubFaultConsumer::_default_POA (void)
{
return ::PortableServer::POA::_duplicate(this->poa_.in ());
}
@@ -169,7 +169,6 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -181,7 +180,6 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -190,23 +188,19 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// find my identity as an object
CORBA::Object_var this_obj =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil();
@@ -228,7 +222,7 @@ const char * StubFaultConsumer::identity () const
/**
* Clean house for process shut down.
*/
-int StubFaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
+int StubFaultConsumer::fini (void)
{
this->notifier_->disconnect_consumer(this->consumer_id_ ACE_ENV_ARG_PARAMETER);
return 0;
@@ -301,7 +295,7 @@ void StubFaultConsumer::offer_change (
));
}
-void StubFaultConsumer::disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void StubFaultConsumer::disconnect_structured_push_consumer(void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 4e8603710e1..b423f43d1df 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -40,7 +40,7 @@ public:
virtual ~StubFaultConsumer ();
- ::PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+ ::PortableServer::POA_ptr _default_POA (void);
::PortableServer::ObjectId objectId()const;
/**
@@ -69,7 +69,7 @@ public:
/**
* Clean house for process shut down.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
size_t notifications() const;
@@ -91,7 +91,7 @@ public:
)
ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
- virtual void disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void disconnect_structured_push_consumer(void)
ACE_THROW_SPEC ((CORBA::SystemException));
////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 24c320efb8e..1fb1c8dd487 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -22,7 +22,7 @@ StubFaultNotifier::~StubFaultNotifier ()
}
-::PortableServer::POA_ptr StubFaultNotifier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr StubFaultNotifier::_default_POA (void)
{
return ::PortableServer::POA::_duplicate(this->poa_.in ());
}
@@ -107,13 +107,12 @@ int StubFaultNotifier::parse_args (int argc, char * argv[])
/**
* Prepare to exit.
*/
-int StubFaultNotifier::fini (ACE_ENV_SINGLE_ARG_DECL)
+int StubFaultNotifier::fini (void)
{
if(this->ns_name_ != 0)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (CORBA::is_nil(naming_obj.in ())){
ACE_ERROR_RETURN ((LM_ERROR,
@@ -123,7 +122,6 @@ int StubFaultNotifier::fini (ACE_ENV_SINGLE_ARG_DECL)
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
CosNaming::Name this_name (1);
this_name.length (1);
@@ -131,7 +129,6 @@ int StubFaultNotifier::fini (ACE_ENV_SINGLE_ARG_DECL)
naming_context->unbind (this_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
}
return 0;
}
@@ -149,7 +146,6 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -161,7 +157,6 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(this->poa_.in ()))
{
@@ -171,22 +166,18 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
}
PortableServer::POAManager_var poa_manager =
- this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
// Register with the POA.
this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// find my identity as a corba object
CORBA::Object_var this_obj =
this->poa_->id_to_reference (object_id_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
//////////////////////////////////////////
// resolve references to detector factory
@@ -272,7 +263,6 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
criteria.in(),
factory_creation_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
}
@@ -297,7 +287,6 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil(naming_obj.in ())){
ACE_ERROR_RETURN ((LM_ERROR,
@@ -307,7 +296,6 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNaming::Name this_name (1);
this_name.length (1);
@@ -315,7 +303,6 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
naming_context->rebind (this_name, this_obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
}
return result;
@@ -345,7 +332,7 @@ const char * StubFaultNotifier::identity () const
/**
* Clean house for process shut down.
*/
-void StubFaultNotifier::shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
+void StubFaultNotifier::shutdown_i (void)
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
@@ -454,7 +441,7 @@ void StubFaultNotifier::disconnect_consumer (
ACE_THROW (CORBA::NO_IMPLEMENT());
}
-CORBA::Boolean StubFaultNotifier::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean StubFaultNotifier::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 1;
@@ -469,7 +456,6 @@ int StubFaultNotifier::idle(int & result ACE_ENV_ARG_DECL_NOT_USED)
if(!CORBA::is_nil(this->factory_.in ()))
{
int ok = this->factory_->is_alive( ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!ok)
{
quit = 1;
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 612c5198fa1..ff2d4995d95 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -53,7 +53,7 @@ public:
/**
* Prepare to exit.
*/
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int fini (void);
/**
* Return a string to identify this object for logging/console message purposes.
@@ -68,7 +68,7 @@ public:
int idle(int &result ACE_ENV_ARG_DECL);
// override virtuals
-::PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+::PortableServer::POA_ptr _default_POA (void);
PortableServer::ObjectId objectId()const;
@@ -76,7 +76,7 @@ public:
/**
* Clean house for process shut down.
*/
- void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
+ void shutdown_i (void);
////////////////////////////////
// CORBA interface FaultNotifier
@@ -122,7 +122,7 @@ public:
//////////////////////////////////////////
// CORBA interface PullMonitorable methods
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 8bb35b960a1..4d3ae2c4b8f 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -54,12 +54,10 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
CORBA::Object_var rm_obj
= orb->resolve_initial_references (
"ReplicationManager" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->replication_manager_
= ::FT::ReplicationManager::_narrow (
rm_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (this->replication_manager_.in ()))
{
this->have_replication_manager_ = 1;
@@ -68,7 +66,6 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
this->registry_
= this->replication_manager_->get_factory_registry (
criteria ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (this->registry_.in ()))
{
this->detector_infos_
@@ -76,7 +73,6 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
FT::FAULT_DETECTOR_ROLE_NAME,
this->detector_type_id_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong count = this->detector_infos_->length ();
ACE_DEBUG ( (LM_DEBUG,
"%T %n (%P|%t)Object_Group_Creator: found %u factories for FaultDetectors\n",
@@ -120,7 +116,6 @@ int TAO::Object_Group_Creator::unregister_role (const char * role ACE_ENV_ARG_DE
role
));
this->registry_->unregister_factory_by_role (role ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return result;
}
@@ -189,7 +184,6 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
criteria.in (),
factory_creation_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
result = 1;
}
}
@@ -230,7 +224,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
type_id,
properties
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (group._retn ());
::PortableGroup::GenericFactory::FactoryCreationId_var creation_id;
PortableGroup::Criteria criteria (1);
@@ -245,7 +238,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
creation_id
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
else
{
@@ -268,7 +260,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
CORBA::String_var type_id;
::PortableGroup::FactoryInfos_var infos = this->registry_->list_factories_by_role (role, type_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
CORBA::ULong count = infos->length ();
ACE_ERROR ((LM_INFO,
@@ -318,7 +309,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
creation_id
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
//@@ this is a bit of a hack
creation_id >>= group_id;
@@ -344,7 +334,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
info.the_criteria,
factory_creation_id.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if ( !CORBA::is_nil (created_obj.in ()) )
{
// that which was first shall now be last if (nFact == 0)
@@ -360,10 +349,8 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
group_id,
info.the_location
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
const char * replica_ior = orb_->object_to_string (created_obj.in () ACE_ENV_ARG_PARAMETER );
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
if (write_iors)
@@ -419,7 +406,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
info.the_location,
created_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
}
else
@@ -433,7 +419,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
if (first_location != 0 && this->have_replication_manager_)
{
group = this->replication_manager_->set_primary_member (group.in (), * first_location ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
ACE_ERROR ( (LM_INFO,
"%T %n (%P|%t) Object_Group_Creator: Successfully created group of %s\n",
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index a446d0d7eff..45a25c7fda0 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -39,13 +39,11 @@ Server_ORBInitializer::post_init (
TAO::VMCID,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
this->server_interceptor_ = interceptor;
info->add_server_request_interceptor (interceptor
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index fe39a7dc7b6..7151a24463a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -47,31 +47,28 @@ Server_Request_Interceptor::forward_references (
char *argv[] = {NULL};
int argc = 0;
-
+
// Fetch the ORB having been initialized in main()
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::String_var str1 = orb->object_to_string (obj1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::String_var str2 = orb->object_to_string (obj2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->obj_[0] = orb->string_to_object (str1.in () ACE_ENV_ARG_PARAMETER);
this->obj_[1] = orb->string_to_object (str2.in () ACE_ENV_ARG_PARAMETER);
}
char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("Server_Request_Interceptor");
}
void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::release (this->obj_[0]);
@@ -97,7 +94,6 @@ Server_Request_Interceptor::receive_request_service_contexts (
IOP::ServiceContext_var svc =
ri->get_request_service_context (IOP::FT_GROUP_VERSION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// extract the group component
TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -155,7 +151,6 @@ Server_Request_Interceptor::receive_request (
IOP::ServiceContext_var svc =
ri->get_request_service_context (IOP::FT_GROUP_VERSION
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// extract the group component
TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index d8a5ce664cf..6c50f49e8e7 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -55,7 +55,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- /// Reset to initial state, like counter etc, keeps the object-references
+ /// Reset to initial state, like counter etc, keeps the object-references
virtual void reset (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
@@ -70,10 +70,10 @@ public:
*/
//@{
/// Return the name of this ServerRequestinterceptor.
- virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * name (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void receive_request_service_contexts (
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 58fd3cc610b..ac5c1e777d2 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -46,7 +46,6 @@ main (int argc, char *argv[])
argv,
"Client ORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (::parse_args (argc, argv) != 0)
return -1;
@@ -56,11 +55,9 @@ main (int argc, char *argv[])
// this test.
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ForwardRequestTest::test_var server =
ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Before and after the LOCATION_FORWARD_PERM the marshaled
// object reference must differ.
@@ -84,8 +81,7 @@ main (int argc, char *argv[])
"CLIENT: Issuing request %d.\n",
i));
- number += server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ number += server->number ();
ACE_DEBUG ((LM_INFO,
"CLIENT: Number %d .\n",
@@ -116,8 +112,7 @@ main (int argc, char *argv[])
ACE_OS::abort ();
}
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 407c832a27b..d4e3d3653f2 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -54,11 +54,9 @@ add_ft_prop (CORBA::ORB_ptr o,
o->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_IOP::TAO_IOR_Manipulation_var iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -86,7 +84,6 @@ add_ft_prop (CORBA::ORB_ptr o,
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
obj1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (retval != 0)
{
@@ -94,7 +91,6 @@ add_ft_prop (CORBA::ORB_ptr o,
obj1,
obj1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -106,7 +102,6 @@ add_ft_prop (CORBA::ORB_ptr o,
retval = iorm->set_property (&iogr_prop,
obj2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (retval != 0)
{
@@ -114,7 +109,6 @@ add_ft_prop (CORBA::ORB_ptr o,
obj2,
obj2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
return;
@@ -130,7 +124,7 @@ void test_colocal (ForwardRequestTest::test_ptr server
"CLIENT: Issuing colocal request %d.\n",
i));
CORBA::ULong retval =
- server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+ server->number ();
if (retval != 1 && retval != 317)
{
// Not a valid return value, forwarding went wrong and
@@ -142,7 +136,6 @@ void test_colocal (ForwardRequestTest::test_ptr server
}
number += retval;
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_INFO,
@@ -174,15 +167,12 @@ main (int argc, char *argv[])
PortableInterceptor::register_orb_initializer (orb_initializer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -191,11 +181,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (::parse_args (argc, argv) != 0)
return -1;
@@ -211,46 +199,38 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::ObjectId_var oid1 =
first_poa->activate_object (&servant1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::ObjectId_var oid2 =
first_poa->activate_object (&servant2
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj1 =
first_poa->servant_to_reference (&servant1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj2 =
first_poa->servant_to_reference (&servant2
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
(void) add_ft_prop (orb.in (),
obj1.in (),
obj2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"ForwardRequestTest::test servant 1: <%s>\n",
ior.in ()));
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Set the forward references in the server request interceptor.
PortableInterceptor::ServerRequestInterceptor_var
@@ -259,7 +239,6 @@ main (int argc, char *argv[])
ForwardRequestTest::ServerRequestInterceptor_var interceptor =
ForwardRequestTest::ServerRequestInterceptor::_narrow (
server_interceptor.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (interceptor.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -270,7 +249,6 @@ main (int argc, char *argv[])
interceptor->forward_references (obj1.in (),
obj2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run co-local test
{
@@ -279,7 +257,7 @@ main (int argc, char *argv[])
test_colocal (server.in() ACE_ENV_ARG_PARAMETER);
// Reset interceptor for remote tests
- interceptor->reset (ACE_ENV_SINGLE_ARG_PARAMETER);
+ interceptor->reset ();
}
// Write each IOR to a file.
@@ -296,14 +274,11 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
// Run the ORB event loop.
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index adafe5be28d..122324ab774 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -18,14 +18,14 @@ test_i::~test_i (void)
}
CORBA::Short
-test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::number (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->number_;
}
void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
index 34f6bcbdbc3..d22fba97d4c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
@@ -33,11 +33,11 @@ public:
~test_i (void);
/// Return the number assigned to this object.
- virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Short number (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Shutdown the ORB.
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index 110808818f7..5b95112cdf1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -33,7 +33,7 @@ public:
Client_i (CORBA::ORB_ptr orb);
// Our constructor
- void init (ACE_ENV_SINGLE_ARG_DECL);
+ void init (void);
// Initialize the ORB etc.
private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 543da3eff4f..87fc72368e8 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -72,20 +72,17 @@ main (int argc,
manager.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// the command line arguments
if (parse_args (argc, argv) == -1)
return -1;
// Merge the different IORS
- manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager.make_merged_iors ();
// Set properties. This is the most important portion of the
// test
- manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ manager.set_properties ();
// Write IOR to file
manager.write_to_file ();
@@ -93,8 +90,7 @@ main (int argc,
// Client, who is going to use the merged IOR
// Construct that with the managers ORB
Client_i client_imp (manager.orb ());
- client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client_imp.init ();
}
ACE_CATCHANY
{
@@ -123,53 +119,44 @@ Manager::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Obtain the RootPOA.
CORBA::Object_var obj_var =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get the POA_var object from Object_var.
PortableServer::POA_var root_poa_var =
PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get the POAManager of the RootPOA.
PortableServer::POAManager_var poa_manager_var =
- root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_var->the_POAManager ();
- poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager_var->activate ();
}
int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (void)
{
// First server
object_primary =
this->orb_->string_to_object (first_ior
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
//Second server
object_secondary =
this->orb_->string_to_object (second_ior
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Get an object reference for the ORBs IORManipultion object!
CORBA::Object_var IORM =
this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create the list
@@ -181,13 +168,12 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
// Create a merged set 1;
merged_set_ =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
+Manager::set_properties (void)
{
FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -216,7 +202,6 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Boolean retval = iorm->set_property (&iogr_prop,
this->merged_set_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Set the primary
// See we are setting the second ior as the primary
@@ -226,19 +211,17 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
object_secondary.in (),
this->merged_set_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
}
int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
{
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
@@ -289,7 +272,7 @@ run_test (Simple_Server_ptr server
ACE_ENV_ARG_DECL);
void
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
+Client_i::init (void)
{
// Open the file for reading.
ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
@@ -315,18 +298,15 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var object =
this->orb_->string_to_object (data
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Combined IOR stuff
Simple_Server_var server =
Simple_Server::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -337,7 +317,6 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
run_test (server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ior_buffer.alloc ()->free (data);
ACE_OS::close (f_handle);
@@ -359,16 +338,14 @@ void run_test (Simple_Server_ptr server
j++)
{
// Make a remote call
- server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->remote_call ();
}
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("*********************************\n")));
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("I am going to shutdown the server\n")));
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
ACE_OS::sleep (2);
}
ACE_CATCH (CORBA::TRANSIENT, t)
@@ -399,6 +376,5 @@ void run_test (Simple_Server_ptr server
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index 6bdc3e7cf1c..f31970bd98f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -41,13 +41,13 @@ public:
// Initialize the ORB, POA etc.
- int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int make_merged_iors (void);
// Merges the different IORS
- int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int set_properties (void);
// Sets the properties for the profiles
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the ORB event loop..
int write_to_file (void);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index ade1a560f4d..4b8a80b26d6 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -41,14 +41,12 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// We do the command line parsing first
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,22 +55,18 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Instantiate the LCD_Display implementation class
Simple_Server_i display_impl (orb.in ());
Simple_Server_var server =
- display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ display_impl._this ();
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -89,8 +83,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
orb->run ();
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 9813825c275..d16bb668f1d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -31,7 +31,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index f7944307d55..d9cdfe56754 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -34,10 +34,10 @@ public:
// ctor
// = The Simple_Server methods.
- void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void remote_call (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 72014970c1d..30ea67466a3 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -40,7 +40,6 @@ main (int argc, char *argv[])
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **********************************************************************
// Get an object reference for the ORBs IORManipulation object!
@@ -48,23 +47,19 @@ main (int argc, char *argv[])
orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_IOP::TAO_IOR_Manipulation_var iorm =
TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **********************************************************************
// Create a few fictitious IORs
CORBA::Object_var name1 =
orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var name2 =
orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// **********************************************************************
// Create IOR list for use with merge_iors.
@@ -76,7 +71,6 @@ main (int argc, char *argv[])
CORBA::Object_var merged =
iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check for set and get primaries
// Make a dummy property set
@@ -85,7 +79,6 @@ main (int argc, char *argv[])
CORBA::Boolean retval =
iorm->set_primary (&prop, name2.in (), merged.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval != 0)
ACE_DEBUG ((LM_DEBUG,
@@ -101,7 +94,6 @@ main (int argc, char *argv[])
retval = iorm->is_primary_set (&prop,
merged.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval)
ACE_DEBUG ((LM_DEBUG,
@@ -121,7 +113,6 @@ main (int argc, char *argv[])
iorm->get_primary (&prop,
merged.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check whether we got back the right primary
if (prim->_is_equivalent (name2.in ()))
@@ -161,7 +152,6 @@ main (int argc, char *argv[])
retval = iorm->set_property (&prop,
merged.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Extract the property
FT::TagFTGroupTaggedComponent ftc;
@@ -172,7 +162,6 @@ main (int argc, char *argv[])
ftc
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) Testing for tagged component \n"));
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 12e291c0f78..1d5b35d58c5 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -36,20 +36,17 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event
void
-PushConsumer_impl::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+PushConsumer_impl::disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
PortableServer::Current_var current =
resolve_init<PortableServer::Current>(orb_.in(), "POACurrent" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- PortableServer::POA_var poa = current->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var poa = current->get_POA();
- PortableServer::ObjectId_var oid = current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::ObjectId_var oid = current->get_object_id();
poa->deactivate_object(oid.in ()
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 8c1b1757ecf..dfb6f713cff 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -48,13 +48,11 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_
ACE_DEBUG((LM_DEBUG, "for_suppliers\n"));
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- channel->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ channel->for_suppliers();
ACE_DEBUG((LM_DEBUG, "obtain_push_consumer\n"));
consumer_ =
- supplier_admin->obtain_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ supplier_admin->obtain_push_consumer();
@@ -101,13 +99,10 @@ void PushSupplier_impl::disconnect_push_supplier (
PortableServer::Current_var current =
resolve_init<PortableServer::Current>(orb_.in(), "POACurrent" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- PortableServer::POA_var poa = current->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::POA_var poa = current->get_POA();
- PortableServer::ObjectId_var oid = current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::ObjectId_var oid = current->get_object_id();
poa->deactivate_object (oid.in ()
ACE_ENV_ARG_PARAMETER);
@@ -133,7 +128,6 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
event[0].data.any_value <<= seq_no_;
consumer_->push(event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "sending data %d\n", seq_no_));
++seq_no_;
}
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 45874808c2f..657c5a47d5d 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -38,10 +38,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
{
CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
break;
case 'n':
@@ -69,18 +67,16 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
CosNaming::NamingContext_var naming_context =
resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
channel = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
if (use_gateway)
{
ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway);
- return gateway->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return gateway->_this();
}
else
return channel._retn();
@@ -91,11 +87,9 @@ int main(int argc, ACE_TCHAR** argv)
ACE_TRY_NEW_ENV {
orb = CORBA::ORB_init(argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var channel
= get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(channel.in()))
@@ -104,22 +98,17 @@ int main(int argc, ACE_TCHAR** argv)
PortableServer::POA_var poa =
resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ PortableServer::POAManager_var mgr = poa->the_POAManager();
- mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate();
PushConsumer_impl push_consumer_impl(orb.in());
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- channel->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ channel->for_consumers();
RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
- consumer_admin->obtain_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_admin->obtain_push_supplier();
RtecEventChannelAdmin::ConsumerQOS qos;
qos.is_gateway = 1;
@@ -135,9 +124,8 @@ int main(int argc, ACE_TCHAR** argv)
supplier->connect_push_consumer(push_consumer.in(),
qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->run();
}
ACE_CATCHANY {
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 9033f5b02c2..06ddb75bf7b 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -37,10 +37,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
{
CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
break;
case 'n':
@@ -73,19 +71,17 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
CosNaming::NamingContext_var naming_context =
resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
channel = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
if (use_gateway)
{
// use local gateway to communicate with FTRTEC
ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway);
- return gateway->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
+ return gateway->_this();
}
else
return channel._retn();
@@ -98,12 +94,10 @@ int main(int argc, ACE_TCHAR** argv)
ACE_TRY {
orb = CORBA::ORB_init(argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecEventChannelAdmin::EventChannel_var channel
= get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(channel.in()))
@@ -112,13 +106,10 @@ int main(int argc, ACE_TCHAR** argv)
PortableServer::POA_var poa =
resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ PortableServer::POAManager_var mgr = poa->the_POAManager();
- mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate();
PushSupplier_impl push_supplier(orb.in());
if (push_supplier.init(channel.in() ACE_ENV_ARG_PARAMETER) == -1)
@@ -128,7 +119,7 @@ int main(int argc, ACE_TCHAR** argv)
supplier = push_supplier._this();
- orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->run();
}
ACE_CATCHANY {
@@ -136,7 +127,6 @@ int main(int argc, ACE_TCHAR** argv)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN(-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index 4586a4d67a1..f5e313c8dea 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -58,7 +58,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
void
-AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0);
@@ -66,7 +66,7 @@ AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Long
-AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index 161d329e7ff..4bd216bae5a 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -38,10 +38,10 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException,
A::DidTheRightThing));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL)
+ CORBA::Long yadda (void)
ACE_THROW_SPEC ((CORBA::SystemException));
void yadda (CORBA::Long yadda
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index efc9e973701..28e9425c44a 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -125,8 +125,7 @@ public:
"Callback method <foo_excep> called: \n"));
ACE_TRY
{
- excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ excep_holder->raise_exception ();
}
ACE_CATCHANY
{
@@ -134,7 +133,6 @@ public:
"Caught exception:");
}
ACE_ENDTRY;
- ACE_CHECK;
};
void get_yadda (CORBA::Long result
@@ -154,7 +152,7 @@ public:
"Callback method <get_yadda_excep> called: \n"));
};
- void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void set_yadda (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -183,7 +181,6 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -192,11 +189,9 @@ main (int argc, char *argv[])
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
A::AMI_Test_var server =
A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -210,7 +205,6 @@ main (int argc, char *argv[])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -219,14 +213,11 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Let the client perform the test in a separate thread
@@ -253,13 +244,11 @@ main (int argc, char *argv[])
while (number_of_replies > 0)
{
CORBA::Boolean pending =
- orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending();
if (pending)
{
- orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work();
}
}
@@ -280,10 +269,8 @@ main (int argc, char *argv[])
root_poa->destroy (1, // ethernalize objects
0 // wait for completion
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -320,7 +307,6 @@ Client::svc (void)
number,
"Let's talk AMI."
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
if (debug)
{
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index ee6a7282b5f..2518bebee9b 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -66,11 +66,9 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,11 +77,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -93,12 +89,10 @@ main (int argc, char *argv[])
AMI_Test_i ami_test_i (orb.in ());
A::AMI_Test_var ami_test_var =
- ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ami_test_i._this ();
CORBA::String_var ior =
orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -115,19 +109,15 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
root_poa->destroy (1, // ethernalize objects
0 // wait for completion
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
}
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 442d7a9356f..f0181ed1358 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -102,8 +102,7 @@ public:
"Testing proper exception handling ...\n"));
ACE_TRY
{
- excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ excep_holder->raise_exception ();
}
ACE_CATCH (A::DidTheRightThing, ex)
{
@@ -116,7 +115,6 @@ public:
"... caught the wrong exception -> ERROR\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
};
@@ -137,7 +135,7 @@ public:
"Callback method <get_yadda_excep> called: \n"));
};
- void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void set_yadda (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -165,33 +163,26 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object_var =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa_var =
PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager_var =
- poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_var->the_POAManager ();
- poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager_var->activate ();
if (parse_args (argc, argv) != 0)
return 1;
// We reuse the object_var smart pointer!
object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
A::AMI_Test_var ami_test_var =
A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ami_test_var.in ()))
{
@@ -206,8 +197,7 @@ main (int argc, char *argv[])
// Instantiate the ReplyHandler and register that with the POA.
Handler handler;
A::AMI_AMI_TestHandler_var the_handler_var =
- handler._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ handler._this ();
// Try out sending asynchronous messages without a reply handler
// registered. Things fail if we get an exception.
@@ -216,7 +206,6 @@ main (int argc, char *argv[])
0,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Trigger the DidTheRightThing exception on the server side
@@ -228,7 +217,6 @@ main (int argc, char *argv[])
0,
"Let's talk AMI."
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Long l = 931247;
@@ -242,22 +230,18 @@ main (int argc, char *argv[])
l,
"Let's talk AMI."
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Begin test of attributes
ami_test_var->sendc_get_yadda (the_handler_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ami_test_var->sendc_set_yadda (the_handler_var.in (),
4711
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ami_test_var->sendc_get_yadda (the_handler_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// End test of attributes
@@ -282,7 +266,6 @@ main (int argc, char *argv[])
l,
"Let's talk SMI."
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (debug)
{
@@ -294,17 +277,14 @@ main (int argc, char *argv[])
if (shutdown_flag)
{
ACE_DEBUG ((LM_DEBUG, "invoking shutdown\n"));
- ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ami_test_var->shutdown ();
}
poa_var->destroy (1, // ethernalize objects
0 // wait for completion
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
@@ -313,7 +293,6 @@ main (int argc, char *argv[])
return 1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_END_TEST;
return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index a9a6dac7d63..3ca60704965 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -49,11 +49,9 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -62,11 +60,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Policies for the childPOA to be created.
CORBA::PolicyList policies (1);
@@ -78,7 +74,6 @@ main (int argc, char *argv[])
orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
pol
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create POA as child of RootPOA with the above policies. This POA
// will receive request in the same connection in which it sent
@@ -88,30 +83,25 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of childPOA is over. Destroy the Policy objects.
for (CORBA::ULong i = 0;
i < policies.length ();
++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Server_var server =
Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -125,18 +115,15 @@ main (int argc, char *argv[])
servant = new Callback_i (orb.in ());
Callback_var callback =
- servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servant->_this ();
// Send the calback object to the server
server->callback_object (callback.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// A method to kickstart callbacks from the server
CORBA::Long r =
server->test_method (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (r != 0)
{
@@ -145,11 +132,9 @@ main (int argc, char *argv[])
r));
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index acd21da590e..665f5ae15e7 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -47,11 +47,9 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,11 +58,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Policies for the childPOA to be created.
CORBA::PolicyList policies (1);
@@ -76,7 +72,6 @@ main (int argc, char *argv[])
orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
pol
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create POA as child of RootPOA with the above policies. This POA
// will receive request in the same connection in which it sent
@@ -86,19 +81,16 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of childPOA is over. Destroy the Policy objects.
for (CORBA::ULong i = 0;
i < policies.length ();
++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -112,19 +104,15 @@ main (int argc, char *argv[])
child_poa->activate_object_with_id (id.in (),
server_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- server_impl->_remove_ref(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_impl->_remove_ref();
CORBA::Object_var obj =
child_poa->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -147,23 +135,19 @@ main (int argc, char *argv[])
// Just process one upcall. We know that we would get the
// clients IOR in that call.
CORBA::Boolean pending =
- orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending();
if (pending)
{
- orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work();
}
// Now that hopefully we have the clients IOR, just start
// making remote calls to the client.
- retval = server_impl->call_client (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = server_impl->call_client ();
}
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 8750ae59899..0555b1d3a0d 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -14,7 +14,7 @@
ACE_RCSID(BiDirectional, test_i, "$Id$")
void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
@@ -55,7 +55,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
}
int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (void)
{
if (this->flag_)
{
@@ -63,8 +63,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
for (int times = 0; times < this->no_iterations_; ++times)
{
- this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->callback_->callback_method ();
if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
{
@@ -75,8 +74,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
}
}
- this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->callback_->shutdown ();
this->flag_ = 0;
return 1;
@@ -87,7 +85,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index 9cf3cb4977c..7958d4fb10f 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
Callback_i (CORBA::ORB_ptr orb);
// ctor
- void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Safe way to shutdown
- void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+ void callback_method (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The callback method
@@ -66,10 +66,10 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int call_client (void);
private:
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index b6f13134438..df3567c792c 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
}
char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "in get_string\n"));
@@ -19,7 +19,7 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index 68311a6634e..ea78ac96072 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -22,10 +22,10 @@ public:
Hello (CORBA::ORB_ptr orb);
// = The skeleton methods
- virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index e8d3ff65f68..13471720090 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -46,18 +46,15 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Hello_var hello =
Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (hello.in ()))
{
@@ -68,18 +65,15 @@ main (int argc, char *argv[])
}
CORBA::String_var the_string =
- hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->get_string ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client Main - string returned <%s>\n",
the_string.in ()));
- hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->shutdown ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client Main - shutdown returned\n"));
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index e3ba7544ee9..b70a2cfd393 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -51,17 +51,14 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//------ Get Root POA & POA Manager references
CORBA::Object_var obj =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -69,8 +66,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
//------- Get IOR Table reference to support CORBALOC URLs
@@ -101,12 +97,10 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(hello_impl);
Test::Hello_var hello =
- hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//--------- Publish IOR using various means
@@ -133,23 +127,19 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Root poa destroyed\n"));
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - orb destroyed\n"));
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "server exiting\n"));
}
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 0639cfcefeb..e178808d455 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void)
}
CORBA::Boolean
-MCast_Server_i::connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MCast_Server_i::connect_server (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index 1056dc77929..693419395cb 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -11,7 +11,7 @@ public:
// Simple method just to see that the client contacted the
// server. If does contact, a '0' is returned.
- CORBA::Boolean connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ CORBA::Boolean connect_server (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index 7a79bec47bc..d0a2253a051 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -14,7 +14,6 @@ int main (int argc, char *argv [])
int init_result;
init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
return 0;
}
@@ -27,7 +26,6 @@ int main (int argc, char *argv [])
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 26a0d6c3e12..72cb2e61691 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -27,11 +27,9 @@ ior_mcast_Client_i::init (int& argc,
argv,
"" /* the ORB name, it can be anything! */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var mcast_server_object =
orb->resolve_initial_references ("MCASTServer" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (mcast_server_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,7 +38,6 @@ ior_mcast_Client_i::init (int& argc,
MCast::Server_var mcast_srvr =
MCast::Server::_narrow (mcast_server_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (mcast_srvr.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,8 +46,7 @@ ior_mcast_Client_i::init (int& argc,
// Invoke a request on the server
CORBA::Boolean ret_value =
- mcast_srvr->connect_server (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mcast_srvr->connect_server ();
if (ret_value != 0)
{
@@ -74,7 +70,6 @@ ior_mcast_Client_i::init (int& argc,
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 6602be6a96e..f88141b0eaf 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -21,7 +21,7 @@ class ior_mcast_Client_i
ior_mcast_Client_i (void);
~ior_mcast_Client_i (void);
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Execute the client example code.
int init (int& argc, char *argv[] ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index be8c6ab97c8..eabe5f473dd 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -10,7 +10,6 @@ int main (int argc, char *argv[])
Server_i svr_i;
const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (init_result != 0)
return 1;
@@ -22,7 +21,6 @@ int main (int argc, char *argv[])
"CORBA exception raised in server!");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index e9a12f65dc5..30c6212b5c6 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -43,26 +43,21 @@ Server_i::init (int &argc,
this->argv_,
"" /* the ORB name, it can be anything! */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference to the RootPOA.
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down to the correct reference.
PortableServer::POA_var poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set a POA Manager.
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Activate the POA Manager.
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::String_var ior;
@@ -75,11 +70,9 @@ Server_i::init (int &argc,
CORBA::Object_var table_object =
this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (adapter.in ()))
{
@@ -90,9 +83,7 @@ Server_i::init (int &argc,
ior =
this->orb_->object_to_string (mcast_server.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
adapter->bind ("MCASTServer", ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
// Enable such that the server can listen for multicast requests
@@ -107,8 +98,7 @@ Server_i::init (int &argc,
}
// Run the ORB
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
//Destroy the POA, waiting until the destruction terminates.
poa->destroy (1, 1);
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index b885f1b28ed..9de2488801a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -11,11 +11,9 @@ int main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var ns_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ns_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -25,7 +23,6 @@ int main (int argc, char *argv[])
CosNaming::NamingContext_var inc =
CosNaming::NamingContext::_narrow (ns_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (inc.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -37,7 +34,6 @@ int main (int argc, char *argv[])
name[0].id = CORBA::string_dup ("yourself");
inc->bind (name, ns_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 079c8e9b4e1..9633238aa85 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -64,8 +64,7 @@ Airplane_Client_i::get_planes (size_t count)
ACE_TRY
{
CORBA::String_var response =
- this->server_->get_plane (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->server_->get_plane ();
ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
}
@@ -112,7 +111,6 @@ Airplane_Client_i::init (int argc, char **argv)
this->argv_,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -126,10 +124,8 @@ Airplane_Client_i::init (int argc, char **argv)
CORBA::Object_var server_object =
this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->server_ = Paper_Airplane_Server::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 90f93c31e54..3276aac194c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -5,8 +5,8 @@
#include "tao/debug.h"
#include "ace/OS_NS_time.h"
-ACE_RCSID (ImplRepo,
- airplane_i,
+ACE_RCSID (ImplRepo,
+ airplane_i,
"$Id$")
// Constructor
@@ -29,7 +29,7 @@ Airplane_i::~Airplane_i (void)
// Returns a random plane and page number
char *
-Airplane_i::get_plane (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Airplane_i::get_plane (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 10982838106..da4beedac2f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -48,7 +48,7 @@ public:
~Airplane_i (void);
/// Returns a random plane.
- virtual char *get_plane (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char *get_plane (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 45f4bd9bca3..05d69d7f205 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -17,14 +17,12 @@ main (int argc, char *argv[])
ACE_TRY
{
int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
return -1;
-
-
- retval = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+
+ retval = server.run ();
ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 92ffd886c0f..46c5be55077 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -71,7 +71,6 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
{
// Initialize the ORB
this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Save pointers to the command line arguments
this->argc_ = argc;
@@ -87,16 +86,13 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (obj.in ()));
// Narrow the object to a POA.
root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get the POA_Manager.
- this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_ = this->root_poa_->the_POAManager ();
// We now need to create a POA with the persistent and user_id policies,
// since they are need for use with the Implementation Repository.
@@ -112,21 +108,18 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->airplane_poa_ =
this->root_poa_->create_POA (poa_name,
this->poa_manager_.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
ACE_NEW_RETURN (this->server_impl_, Airplane_i, -1);
@@ -137,22 +130,17 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
this->airplane_poa_->activate_object_with_id (server_id.in (),
this->server_impl_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->airplane_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "The ImRified IOR is: <%s>\n", ior.in ()));
TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(airplane_poa_.in());
obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var plain_ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "The plain IOR is: <%s>\n", plain_ior.in ()));
@@ -160,17 +148,13 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
// invoke indirectly using a simple object_key reference
// like "corbaloc::localhost:8888/airplane_server".
obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
adapter->bind (poa_name, plain_ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_->activate ();
if (this->ior_output_file_)
{
@@ -185,13 +169,12 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Airplane_Server_i::run (void)
{
ACE_TRY
{
@@ -199,7 +182,6 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
ACE_Time_Value tvStart = ACE_OS::gettimeofday();
this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Time_Value tvEnd = ACE_OS::gettimeofday();
@@ -216,7 +198,6 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index 3b9a1b1131e..ea00f591a58 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -42,7 +42,7 @@ public:
int init (int argc, char **argv ACE_ENV_ARG_DECL);
/// Run the orb
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
private:
/// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index a92bf39e6c8..4335b7e83cb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -104,7 +104,6 @@ Nestea_Client_i::init (int argc, char **argv)
this->argv_,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -118,10 +117,8 @@ Nestea_Client_i::init (int argc, char **argv)
CORBA::Object_var server_object =
this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->server_ = Nestea_Bookshelf::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 4706cf0304d..55793984a58 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -69,7 +69,7 @@ Nestea_i::crush (CORBA::Long cans
// Returns the number of cans in the bookshelf.
CORBA::Long
-Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::bookshelf_size (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
@@ -81,7 +81,7 @@ Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
// Returns comments about your collection.
char *
-Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::get_praise (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
@@ -100,7 +100,7 @@ Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Nestea_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 3e9aa019ff6..baf6ef4d8a9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -55,14 +55,14 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns the number of cans in the bookshelf.
- virtual CORBA::Long bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Long bookshelf_size (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns comments about your collection.
- virtual char *get_praise (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char *get_praise (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown(void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
/// Saves bookshelf data to a file.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 51a8ec71ebe..34b63ca6ea7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -15,14 +15,12 @@ main (int argc, char *argv[])
ACE_TRY
{
int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
return -1;
else
{
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index f3278167081..cffa76eae74 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -97,7 +97,6 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
{
// Initialize the ORB
this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Save pointers to the command line arguments
this->argc_ = argc;
@@ -113,14 +112,11 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (obj.in ()));
this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_ = this->root_poa_->the_POAManager ();
// We now need to create a POA with the persistent and user_id policies,
// since they are need for use with the Implementation Repository.
@@ -136,21 +132,18 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
policies[1] =
this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->nestea_poa_ =
this->root_poa_->create_POA (poa_name,
this->poa_manager_.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of the new POA is over, so destroy the Policy_ptr's.
for (CORBA::ULong i = 0; i < policies.length (); ++i)
{
CORBA::Policy_ptr policy = policies[i];
- policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policy->destroy ();
}
ACE_NEW_RETURN (this->server_impl_,
@@ -163,36 +156,27 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
this->nestea_poa_->activate_object_with_id (server_id.in (),
this->server_impl_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->nestea_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", ior.in ()));
TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(nestea_poa_.in());
obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var rawior =
this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var adapter =
IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
adapter->bind (poa_name, rawior.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->poa_manager_->activate ();
if (this->ior_output_file_)
{
@@ -207,13 +191,12 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Nestea_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Nestea_Server_i::run (void)
{
int status = 0;
@@ -233,7 +216,6 @@ Nestea_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return status;
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index ff3aee780de..a7e2e4e1aea 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -42,7 +42,7 @@ public:
int init (int argc, char **argv ACE_ENV_ARG_DECL);
/// Run the orb
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
private:
/// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index f5e1e660533..38766d2d780 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -11,20 +11,15 @@ int main(int argc, char* argv[]) {
ACE_TRY_NEW_ENV
{
-
+
ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
test_var test = test::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! is_nil(test.in()));
- Long n = test->get(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- Long m = test->get(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Long n = test->get();
+ Long m = test->get();
if (m == n + 1)
ACE_DEBUG((LM_DEBUG, "Client: All tests ran successfully.\n"));
else
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index 769d8126ae4..c18c843e2d1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -11,14 +11,12 @@ main (int argc, char *argv[])
Server_i server;
int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (retval == -1)
return -1;
else
{
- server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server.run ();
}
}
ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 21edebb203f..622fec14c14 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -23,17 +23,13 @@ public:
}
virtual ~test_i () {
}
- virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) {
+ virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
++n_;
CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
ACE_ASSERT(! CORBA::is_nil(cur.in()));
- PortableServer::POA_var poa = cur->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
- CORBA::String_var poaname = poa->the_name(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
+ PortableServer::POA_var poa = cur->get_POA();
+ CORBA::String_var poaname = poa->the_name();
ACE_DEBUG((LM_DEBUG, "%s: get() %d\n", poaname.in(), n_));
return n_;
@@ -100,7 +96,6 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
ACE_TRY
{
this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int retval = this->parse_args (argc, argv);
if (retval != 0)
@@ -108,21 +103,16 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->root_poa_ =
PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
IORTable::Table_var ior_table =
IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
// If -orbuseimr 1 is specified then all persistent poas will be
@@ -130,9 +120,7 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
CORBA::PolicyList policies (2);
policies.length (2);
policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
test_i* test_svt;
ACE_NEW_RETURN (test_svt, test_i(orb_.in()), -1);
@@ -152,26 +140,19 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
poa->activate_object_with_id (server_id.in (), test_svt ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(poa.in());
obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ior_table->bind (name.c_str(), ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
- policies[0]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- policies[1]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[0]->destroy();
+ policies[1]->destroy();
}
ACE_CATCHANY
{
@@ -180,22 +161,19 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
{
ACE_TRY
{
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// We have potentially lots of IORs, so just write out a simple text
// file that the run_test.pl can use to know we're done.
@@ -210,8 +188,7 @@ Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
this->server_name_.c_str(),
this->count_));
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
this->root_poa_->destroy(1, 1);
this->orb_->destroy();
@@ -223,7 +200,6 @@ Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 222b179634a..8e947b72b69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -17,7 +17,7 @@ public:
int init (int argc, char **argv ACE_ENV_ARG_DECL);
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
private:
int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index 3e16668c65b..8cca55aa007 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -3,8 +3,8 @@
#include "ifr_dii_client.h"
-ACE_RCSID (Application_Test,
- client,
+ACE_RCSID (Application_Test,
+ client,
"$Id$")
int
@@ -24,8 +24,7 @@ main (int argc, char *argv[])
}
else
{
- int status = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int status = client.run ();
if (status == -1)
{
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index f6dd2238e12..0c1248fbf1b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -30,7 +30,6 @@ IFR_DII_Client::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// In a reall application, we would get the scoped or
// local name from the Interface Repository and use that
@@ -40,7 +39,6 @@ IFR_DII_Client::init (int argc,
this->target_ =
this->orb_->string_to_object ("file://iorfile"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->target_.in ()))
@@ -60,14 +58,13 @@ IFR_DII_Client::init (int argc,
}
int
-IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::run (void)
{
int result = 0;
if (this->lookup_by_name_)
{
- result = this->lookup_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->lookup_interface_def ();
if (result == -1)
{
@@ -76,8 +73,7 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
}
else
{
- result = this->find_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result = this->find_interface_def ();
if (result == -1)
{
@@ -85,14 +81,11 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
}
}
- this->get_operation_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->get_operation_def ();
- this->create_dii_request (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_dii_request ();
- this->invoke_and_display (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->invoke_and_display ();
return 0;
}
@@ -127,11 +120,10 @@ IFR_DII_Client::parse_args (int argc,
}
int
-IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::find_interface_def (void)
{
this->target_def_ =
- this->target_->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->target_->_get_interface ();
if (CORBA::is_nil (this->target_def_.in ()))
{
@@ -144,16 +136,14 @@ IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
}
int
-IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::lookup_interface_def (void)
{
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
this->repo_ = CORBA::Repository::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
// Is there a contained object of some kind at any level in the
// repository called "warehouse"?
@@ -163,7 +153,6 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
CORBA::dk_all, // Any type of contained object.
1 // Exclude parents of interfaces.
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
CORBA::ULong length = candidates->length ();
CORBA::Container_var candidate;
@@ -184,7 +173,6 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
candidate =
CORBA::Container::_narrow (candidates[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
// Is this contained item itself a container?
if (!CORBA::is_nil (candidate.in ()))
@@ -193,7 +181,6 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
interfaces = candidate->contents (CORBA::dk_Interface,
1 // Exclude parents.
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
n_interfaces = interfaces->length ();
@@ -213,29 +200,26 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
// be any length.
for (CORBA::ULong j = 0; j < n_interfaces ; ++j)
{
- name = interfaces[j]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
+ name = interfaces[j]->name ();
if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
{
this->target_def_ =
CORBA::InterfaceDef::_narrow (interfaces[j]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
}
}
return 0;
}
void
-IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::get_operation_def (void)
{
// What operation(s) does this interface contain?
CORBA::ContainedSeq_var operations =
this->target_def_->contents (CORBA::dk_Operation,
0 // Do not exclude inherited operations.
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong n_operations = operations->length ();
CORBA::String_var operation_name;
@@ -244,15 +228,13 @@ IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
// be any length.
for (CORBA::ULong i = 0; i < n_operations; ++i)
{
- operation_name = operations[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ operation_name = operations[i]->name ();
if (!ACE_OS::strcmp (operation_name.in (), this->op_name.in ()))
{
this->op_ =
CORBA::OperationDef::_narrow (operations[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
break;
}
@@ -260,20 +242,17 @@ IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
}
void
-IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::create_dii_request (void)
{
this->req_ = this->target_->_request (this->op_name.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->result_ = this->op_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->result_ = this->op_->result ();
this->req_->set_return_type (this->result_.in ());
CORBA::ParDescriptionSeq_var params =
- this->op_->params (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->op_->params ();
CORBA::ULong length = params->length ();
@@ -284,8 +263,7 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
for (CORBA::ULong i = 0; i < length; ++i)
{
CORBA::TCKind const kind =
- params[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ params[i].type->kind ();
switch (params[i].mode)
{
@@ -322,7 +300,6 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
any,
CORBA::ARG_OUT
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
break;
@@ -332,15 +309,13 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
}
void
-IFR_DII_Client::invoke_and_display (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::invoke_and_display (void)
{
- this->req_->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->req_->invoke ();
CORBA::TypeCode_var tc = this->req_->return_value ().type ();
- CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind const kind = tc->kind ();
if (kind == CORBA::tk_boolean)
{
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index a362e0053cc..d0f3245c5eb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -23,7 +23,7 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the client.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the client.
private:
@@ -31,20 +31,20 @@ private:
char *argv[]);
// Process the command line arguments.
- int find_interface_def (ACE_ENV_SINGLE_ARG_DECL);
+ int find_interface_def (void);
// Query the object reference to get its InterfaceDef in the IFR.
- int lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL);
+ int lookup_interface_def (void);
// Look up the InterfaceDef by name in the IFR.
- void get_operation_def (ACE_ENV_SINGLE_ARG_DECL);
+ void get_operation_def (void);
// Find the desired operation in the interface definition.
- void create_dii_request (ACE_ENV_SINGLE_ARG_DECL);
+ void create_dii_request (void);
// Query the interface definition to get the info needed
// to construct a CORBA::Request.
- void invoke_and_display (ACE_ENV_SINGLE_ARG_DECL);
+ void invoke_and_display (void);
// Do the invocation and display the results.
CORBA::ORB_var orb_;
@@ -77,7 +77,7 @@ private:
// Are we looking up info on the target object by querying the
// IFR directly with the target's name, or indirectly
// by calling _get_interface() on the target object?
-
+
bool debug_;
// Display results and debugging info?
};
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 7cfe8d9c287..70347fee4ef 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -47,35 +47,28 @@ main (int argc, char *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
inventory_i servant_impl;
warehouse::inventory_var servant =
- servant_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servant_impl._this ();
CORBA::String_var ior =
orb->object_to_string (servant.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int write_result = write_ior_to_file (ior.in ());
@@ -87,13 +80,11 @@ main (int argc, char *argv[])
-1);
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
root_poa->destroy (1,
1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index 410ad1fd4f3..74e4560bb97 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -3,8 +3,8 @@
#include "idl3_client.h"
-ACE_RCSID (Application_Test,
- client,
+ACE_RCSID (Application_Test,
+ client,
"$Id$")
int
@@ -23,8 +23,7 @@ main (int argc, char *argv[])
}
else
{
- int status = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int status = client.run ();
if (status == -1)
{
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 4dc662ff7f3..e2f2a8d3ed8 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -265,12 +265,10 @@ IDL3_Client::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (obj.in ()))
{
@@ -282,7 +280,6 @@ IDL3_Client::init (int argc,
this->repo_ =
CORBA::ComponentIR::Repository::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->repo_.in ()))
{
@@ -300,10 +297,9 @@ IDL3_Client::init (int argc,
}
int
-IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::run (void)
{
- int status = this->component_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int status = this->component_test ();
if (status != 0)
{
@@ -313,15 +309,13 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
status = this->valuetype_test (VALUETYPE_ID,
"value"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
return status;
}
- status = this->home_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ status = this->home_test ();
if (status != 0)
{
@@ -331,7 +325,6 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
status = this->valuetype_test (EVENTTYPE_ID,
"event"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -368,12 +361,11 @@ IDL3_Client::parse_args (int argc,
}
int
-IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::component_test (void)
{
CORBA::Contained_var result =
this->repo_->lookup_id (COMPONENT_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (result.in ()))
{
@@ -387,8 +379,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::String_var str =
- result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ result->absolute_name ();
const char *tmp = str.in ();
@@ -418,11 +409,9 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ComponentIR::ComponentDef_var comp_def =
CORBA::ComponentIR::ComponentDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::TypeCode_var comp_tc =
- comp_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ comp_def->type ();
if (CORBA::is_nil (comp_tc.in ()))
{
@@ -436,8 +425,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
- tmp = comp_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ tmp = comp_tc->id ();
if (tmp == 0 || ACE_OS::strcmp (tmp, COMPONENT_ID) != 0)
{
@@ -452,8 +440,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var desc =
- comp_def->describe_ext_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ comp_def->describe_ext_interface ();
if (desc.ptr () == 0)
{
@@ -469,7 +456,6 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
int status = this->component_attribute_test (desc
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -478,7 +464,6 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
status = this->component_inheritance_test (comp_def
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -487,7 +472,6 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
status = this->component_port_test (comp_def
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -498,12 +482,11 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
}
int
-IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::home_test (void)
{
CORBA::Contained_var result =
this->repo_->lookup_id (HOME_ID
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (result.in ()))
{
@@ -519,7 +502,6 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ComponentIR::HomeDef_var home =
CORBA::ComponentIR::HomeDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (result.in ()))
{
@@ -533,8 +515,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::ComponentIR::ComponentDef_var managed =
- home->managed_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ home->managed_component ();
if (CORBA::is_nil (managed.in ()))
{
@@ -547,8 +528,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
- CORBA::String_var str = managed->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CORBA::String_var str = managed->id ();
if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMPONENT_ID) != 0)
{
@@ -562,8 +542,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::ValueDef_var pkey =
- home->primary_key (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ home->primary_key ();
if (CORBA::is_nil (pkey.in ()))
{
@@ -576,8 +555,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
- str = pkey->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ str = pkey->id ();
if (str.in () == 0 || ACE_OS::strcmp (str.in (), HOME_KEY_ID) != 0)
{
@@ -592,7 +570,6 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
int status = this->home_inheritance_test (home
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -600,8 +577,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Contained::Description_var desc =
- home->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ home->describe ();
CORBA::ComponentIR::HomeDescription *home_desc = 0;
@@ -618,7 +594,6 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
status = this->home_factory_test (home_desc
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -627,7 +602,6 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
status = this->home_finder_test (home_desc
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -645,7 +619,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
CORBA::Contained_var result =
this->repo_->lookup_id (repo_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (result.in ()))
{
@@ -662,7 +635,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
CORBA::ExtValueDef_var evd =
CORBA::ExtValueDef::_narrow (result.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (evd.in ()))
{
@@ -676,13 +648,11 @@ IDL3_Client::valuetype_test (const char *repo_id,
}
CORBA::ExtValueDef::ExtFullValueDescription_var desc =
- evd->describe_ext_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ evd->describe_ext_value ();
int status = this->valuetype_attribute_test (desc,
prefix
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -692,7 +662,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
status = this->valuetype_inheritance_test (evd,
prefix
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -702,7 +671,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
status = this->valuetype_operation_test (desc,
prefix
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -712,7 +680,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
status = this->valuetype_member_test (desc,
prefix
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -722,7 +689,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
status = this->valuetype_factory_test (desc,
prefix
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -769,8 +735,7 @@ IDL3_Client::component_attribute_test (
}
CORBA::TCKind kind =
- desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ desc->attributes[i].type->kind ();
if (kind != ATTR_TC_KINDS[i])
{
@@ -824,8 +789,7 @@ IDL3_Client::component_inheritance_test (
)
{
CORBA::ComponentIR::ComponentDef_var comp_base =
- comp_def->base_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ comp_def->base_component ();
if (CORBA::is_nil (comp_base.in ()))
{
@@ -839,8 +803,7 @@ IDL3_Client::component_inheritance_test (
return -1;
}
- CORBA::String_var str = comp_base->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CORBA::String_var str = comp_base->id ();
if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMP_BASE_ID) != 0)
{
@@ -855,8 +818,7 @@ IDL3_Client::component_inheritance_test (
}
CORBA::InterfaceDefSeq_var supported =
- comp_base->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ comp_base->supported_interfaces ();
CORBA::ULong length = supported->length ();
@@ -874,8 +836,7 @@ IDL3_Client::component_inheritance_test (
for (CORBA::ULong i = 0; i < length; ++i)
{
- str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ str = supported[i]->id ();
if (str.in () == 0
|| ACE_OS::strcmp (str.in (), COMP_SUPPORTED_IDS[i]) != 0)
@@ -902,8 +863,7 @@ IDL3_Client::component_port_test (
)
{
CORBA::Contained::Description_var desc =
- comp_def->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ comp_def->describe ();
CORBA::ComponentIR::ComponentDescription *cd = 0;
@@ -921,7 +881,6 @@ IDL3_Client::component_port_test (
int status = this->provides_test (cd->provided_interfaces
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -930,7 +889,6 @@ IDL3_Client::component_port_test (
status = this->uses_test (cd->used_interfaces
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -943,7 +901,6 @@ IDL3_Client::component_port_test (
EMITS_NAMES,
EMITS_IDS
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -956,7 +913,6 @@ IDL3_Client::component_port_test (
PUBLISHES_NAMES,
PUBLISHES_IDS
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -969,7 +925,6 @@ IDL3_Client::component_port_test (
CONSUMES_NAMES,
CONSUMES_IDS
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status != 0)
{
@@ -1169,8 +1124,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
const char *prefix
ACE_ENV_ARG_DECL)
{
- CORBA::ValueDef_var bvd = vd->base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CORBA::ValueDef_var bvd = vd->base_value ();
if (CORBA::is_nil (bvd.in ()))
{
@@ -1185,8 +1139,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
return -1;
}
- CORBA::String_var str = bvd->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CORBA::String_var str = bvd->id ();
if (str.in () == 0 || ACE_OS::strcmp (str.in (), VT_BASE_ID) != 0)
{
@@ -1202,8 +1155,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
}
CORBA::InterfaceDefSeq_var supported =
- vd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ vd->supported_interfaces ();
CORBA::ULong length = supported->length ();
@@ -1222,8 +1174,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
for (CORBA::ULong i = 0; i < length; ++i)
{
- str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ str = supported[i]->id ();
if (str.in () == 0
|| ACE_OS::strcmp (str.in (), VT_SUPPORTED_IDS[i]) != 0)
@@ -1284,8 +1235,7 @@ IDL3_Client::valuetype_attribute_test (
}
CORBA::TCKind kind =
- desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ desc->attributes[i].type->kind ();
if (kind != ATTR_TC_KINDS[i])
{
@@ -1380,8 +1330,7 @@ IDL3_Client::valuetype_operation_test (
}
CORBA::TCKind ret_kind =
- desc->operations[i].result.in ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ desc->operations[i].result.in ()->kind ();
if (ret_kind != OP_RET_KINDS[i])
{
@@ -1625,8 +1574,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
ACE_ENV_ARG_DECL)
{
CORBA::ComponentIR::HomeDef_var bhd =
- hd->base_home (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ hd->base_home ();
if (CORBA::is_nil (bhd.in ()))
{
@@ -1640,8 +1588,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
return -1;
}
- CORBA::String_var str = bhd->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CORBA::String_var str = bhd->id ();
if (str.in () == 0 || ACE_OS::strcmp (str.in (), HOME_BASE_ID) != 0)
{
@@ -1656,8 +1603,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
}
CORBA::InterfaceDefSeq_var supported =
- bhd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ bhd->supported_interfaces ();
CORBA::ULong length = supported->length ();
@@ -1675,8 +1621,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
for (CORBA::ULong i = 0; i < length; ++i)
{
- str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ str = supported[i]->id ();
if (str.in () == 0
|| ACE_OS::strcmp (str.in (), HOME_SUPPORTED_IDS[i]) != 0)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 60e84a9f3d4..2368de601eb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -42,7 +42,7 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the ORB and get the IFR object reference.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Execute test code.
private:
@@ -50,8 +50,8 @@ private:
char *argv[]);
// Process the command line arguments.
- int component_test (ACE_ENV_SINGLE_ARG_DECL);
- int home_test (ACE_ENV_SINGLE_ARG_DECL);
+ int component_test (void);
+ int home_test (void);
// Also tests eventtype.
int valuetype_test (const char *repo_id,
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 2b862e5fdb1..1eba54b811a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -21,11 +21,9 @@ void printContents( const CORBA::ContainedSeq& cont )
CORBA::InterfaceDef_var intDef =
CORBA::InterfaceDef::_narrow (cont[i]
ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
CORBA::InterfaceDef::FullInterfaceDescription* desc =
- intDef->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ intDef->describe_interface ();
//printf( "-- %s:\n", (const char*)(desc->name) );
@@ -44,12 +42,10 @@ void printContents( const CORBA::ContainedSeq& cont )
CORBA::ModuleDef_var moduleDef =
CORBA::ModuleDef::_narrow (cont[i]
ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
CORBA::ContainedSeq_var moduleContents =
moduleDef->contents (CORBA::dk_all,1
ACE_ENV_ARG_PARAMETER );
- ACE_TRY_CHECK;
printContents (moduleContents.in ());
}
}
@@ -72,11 +68,9 @@ int main(int argc, char** argv)
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
orb->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (object.in ()))
{
@@ -91,7 +85,6 @@ int main(int argc, char** argv)
CORBA::Repository_var ifr =
CORBA::Repository::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ifr.in ()))
{
@@ -102,7 +95,6 @@ int main(int argc, char** argv)
CORBA::ContainedSeq_var cont = ifr->contents (CORBA::dk_all, 0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
printContents (cont.in ());
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index ef26b0b054d..2e0af0e1929 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -64,7 +64,6 @@ Admin_Client::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int retval = this->parse_args (argc,
argv);
@@ -75,7 +74,6 @@ Admin_Client::init (int argc,
CORBA::Object_var object =
this->orb_->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (object.in ()))
{
@@ -90,7 +88,6 @@ Admin_Client::init (int argc,
this->repo_ =
CORBA::Repository::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->repo_.in ()))
{
@@ -124,8 +121,7 @@ Admin_Client::run (void)
// CORBA::BAD_PARAM exception the second time.
for (CORBA::ULong j = 0; j < this->iterations_; ++j)
{
- (this->*test_array_[i])(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ (this->*test_array_[i])();
}
}
}
@@ -136,7 +132,6 @@ Admin_Client::run (void)
(this->*test_array_[this->which_test_])(
ACE_ENV_SINGLE_ARG_PARAMETER
);
- ACE_TRY_CHECK;
}
}
}
@@ -202,7 +197,7 @@ Admin_Client::parse_args (int argc,
}
void
-Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::array_test (void)
{
if (this->debug_)
{
@@ -214,16 +209,13 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::IDLType_var atype =
this->repo_->create_string (7 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ArrayDef_var avar =
this->repo_->create_array (5,
atype.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::ULong bound = avar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULong bound = avar->length ();
if (this->debug_)
{
@@ -234,11 +226,9 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (bound == 5);
- CORBA::TypeCode_var tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var tc = avar->type ();
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = tc->kind ();
if (this->debug_)
{
@@ -249,10 +239,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_array);
- tc = avar->element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tc = avar->element_type ();
+ kind = tc->kind ();
if (this->debug_)
{
@@ -264,10 +252,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_string);
CORBA::IDLType_var tdef =
- avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::DefinitionKind dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ avar->element_type_def ();
+ CORBA::DefinitionKind dk = tdef->def_kind ();
if (this->debug_)
{
@@ -283,9 +269,7 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::StringDef_var pvar =
CORBA::StringDef::_narrow (tdef.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- bound = pvar->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ bound = pvar->bound ();
if (this->debug_)
{
@@ -299,10 +283,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::PrimitiveDef_var pdef =
this->repo_->get_primitive (CORBA::pk_short
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
avar->element_type_def (pdef.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -310,10 +292,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("ArrayDef::element_type_def (set)\n")));
}
- tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tc = avar->type ();
+ kind = tc->kind ();
if (this->debug_)
{
@@ -324,10 +304,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_array);
- tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tdef = avar->element_type_def ();
+ dk = tdef->def_kind ();
if (this->debug_)
{
@@ -341,9 +319,7 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::PrimitiveDef_var zvar =
CORBA::PrimitiveDef::_narrow (tdef.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::PrimitiveKind pkind = zvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::PrimitiveKind pkind = zvar->kind ();
if (this->debug_)
{
@@ -354,12 +330,11 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (pkind == CORBA::pk_short);
- avar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ avar->destroy ();
}
void
-Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::enum_test (void)
{
if (this->debug_)
{
@@ -382,10 +357,8 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::String_var str = evar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var str = evar->id ();
if (this->debug_)
{
@@ -396,8 +369,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
- str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = evar->name ();
if (this->debug_)
{
@@ -408,8 +380,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
- str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = evar->absolute_name ();
if (this->debug_)
{
@@ -420,8 +391,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_enum") == 0);
- str = evar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = evar->version ();
if (this->debug_)
{
@@ -433,8 +403,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
CORBA::DefinitionKind dkind =
- evar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ evar->def_kind ();
if (this->debug_)
{
@@ -446,8 +415,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (dkind == CORBA::dk_Enum);
CORBA::Contained::Description_var desc =
- evar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ evar->describe ();
dkind = desc->kind;
@@ -499,8 +467,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
- CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = td->type->kind ();
if (this->debug_)
{
@@ -511,8 +478,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_enum);
- str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = td->type->id ();
if (this->debug_)
{
@@ -523,8 +489,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
- str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = td->type->name ();
if (this->debug_)
{
@@ -536,8 +501,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
CORBA::ULong count =
- td->type->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ td->type->member_count ();
if (this->debug_)
{
@@ -555,7 +519,6 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < count; ++i)
{
str = td->type->member_name (i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -578,7 +541,6 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
evar->members (members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -587,8 +549,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::EnumMemberSeq_var fellows =
- evar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ evar->members ();
count = fellows->length ();
const char *tmp = 0;
@@ -611,9 +572,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
evar->name ("another_enum"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = evar->name ();
if (this->debug_)
{
@@ -630,8 +589,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "another_enum") == 0);
- str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = evar->absolute_name ();
if (this->debug_)
{
@@ -642,12 +600,11 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "::another_enum") == 0);
- evar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ evar->destroy ();
}
void
-Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::alias_test (void)
{
if (this->debug_)
{
@@ -661,13 +618,11 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::IDLType_var sq_elem =
this->repo_->create_wstring (7 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::SequenceDef_var sq_var =
this->repo_->create_sequence (5,
sq_elem.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::AliasDef_var a_var =
this->repo_->create_alias ("IDL:my_alias:1.0",
@@ -675,10 +630,8 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
sq_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::String_var str = a_var->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var str = a_var->id ();
if (this->debug_)
{
@@ -689,8 +642,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
- str = a_var->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = a_var->name ();
if (this->debug_)
{
@@ -701,8 +653,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
- str = a_var->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = a_var->absolute_name ();
if (this->debug_)
{
@@ -713,8 +664,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_alias") == 0);
- str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = a_var->version ();
if (this->debug_)
{
@@ -733,10 +683,8 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
a_var->version ("1.1"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = a_var->version ();
if (this->debug_)
{
@@ -747,11 +695,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.1") == 0);
- CORBA::TypeCode_var tc = a_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var tc = a_var->type ();
- str = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = tc->name ();
if (this->debug_)
{
@@ -762,8 +708,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = tc->kind ();
if (this->debug_)
{
@@ -775,11 +720,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_alias);
CORBA::TypeCode_var ct =
- tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tc->content_type ();
- kind = ct->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ kind = ct->kind ();
if (this->debug_)
{
@@ -790,8 +733,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_sequence);
- CORBA::ULong length = ct->length (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULong length = ct->length ();
if (this->debug_)
{
@@ -803,11 +745,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (length == 5);
CORBA::TypeCode_var ct2 =
- ct->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ct->content_type ();
- kind = ct2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ kind = ct2->kind ();
if (this->debug_)
{
@@ -819,8 +759,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_wstring);
- length = ct2->length (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ length = ct2->length ();
if (this->debug_)
{
@@ -833,8 +772,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (length == 7);
CORBA::Contained::Description_var desc =
- a_var->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ a_var->describe ();
CORBA::TypeDescription *td;
desc->value >>= td;
@@ -857,8 +795,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0);
- kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ kind = td->type->kind ();
if (this->debug_)
{
@@ -869,8 +806,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_alias);
- str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = td->type->id ();
if (this->debug_)
{
@@ -881,8 +817,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
- str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = td->type->name ();
if (this->debug_)
{
@@ -894,16 +829,13 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
CORBA::IDLType_var i_var =
- a_var->original_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ a_var->original_type_def ();
CORBA::SequenceDef_var seq_var =
CORBA::SequenceDef::_narrow (i_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- length = seq_var->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ length = seq_var->bound ();
if (this->debug_)
{
@@ -914,12 +846,11 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (length == 5);
- a_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ a_var->destroy ();
}
void
-Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::native_test (void)
{
if (this->debug_)
{
@@ -934,10 +865,8 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
"my_native",
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::String_var str = nvar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var str = nvar->id ();
if (this->debug_)
{
@@ -948,8 +877,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_native:1.0") == 0);
- str = nvar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = nvar->name ();
if (this->debug_)
{
@@ -960,8 +888,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_native") == 0);
- str = nvar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = nvar->version ();
if (this->debug_)
{
@@ -972,8 +899,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
- str = nvar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = nvar->absolute_name ();
if (this->debug_)
{
@@ -985,8 +911,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_native") == 0);
CORBA::DefinitionKind kind =
- nvar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ nvar->def_kind ();
if (this->debug_)
{
@@ -997,12 +922,11 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::dk_Native);
- nvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ nvar->destroy ();
}
void
-Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::struct_test (void)
{
if (this->debug_)
{
@@ -1018,13 +942,11 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
members[0].name = CORBA::string_dup ("ub_string");
members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
members[1].name = CORBA::string_dup ("bd_string");
members[1].type_def = this->repo_->create_string (5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
CORBA::EnumMemberSeq e_members (2);
@@ -1041,7 +963,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
e_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
@@ -1051,14 +972,11 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// This also tests the members() function.
- CORBA::TypeCode_var tc = svar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var tc = svar->type ();
- CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULong length = tc->member_count ();
if (this->debug_)
{
@@ -1075,7 +993,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -1089,8 +1006,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Contained::Description_var desc =
- svar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ svar->describe ();
CORBA::TypeDescription *td;
desc->value >>= td;
@@ -1126,7 +1042,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
members[0].name = CORBA::string_dup ("long_mem");
members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
members[1].name = CORBA::string_dup ("array_mem");
@@ -1134,12 +1049,10 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
this->repo_->create_array (5,
members[0].type_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
svar->members (members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -1158,11 +1071,9 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
def_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::StructMemberSeq_var out_members =
- svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ svar->members ();
length = out_members->length ();
int cmp_result = 0;
@@ -1193,10 +1104,8 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = fox->absolute_name ();
if (this->debug_)
{
@@ -1209,10 +1118,8 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
fox = svar->lookup ("my_enum"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = fox->absolute_name ();
if (this->debug_)
{
@@ -1223,15 +1130,12 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
- CORBA::Container_var outer = fox->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Container_var outer = fox->defined_in ();
CORBA::Contained_var schizo =
CORBA::Contained::_narrow (outer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = schizo->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = schizo->absolute_name ();
if (this->debug_)
{
@@ -1247,7 +1151,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
this->repo_->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -1263,7 +1166,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
contents = svar->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -1278,8 +1180,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->absolute_name ();
if (this->debug_)
{
@@ -1306,7 +1207,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -1321,8 +1221,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->absolute_name ();
if (this->debug_)
{
@@ -1343,7 +1242,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
0,
-1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = cont_desc->length ();
@@ -1361,8 +1259,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::TypeDescription *td;
cont_desc[i].value >>= td;
- str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = td->type->id ();
if (this->debug_)
{
@@ -1386,7 +1283,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
svar->name ("your_struct"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -1397,7 +1293,6 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
contents = svar->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -1414,8 +1309,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->absolute_name ();
if (this->debug_)
{
@@ -1439,14 +1333,12 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_UNUSED_ARG (tmp);
#endif /* ACE_NDEBUG */
- e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ e_var->destroy ();
+ svar->destroy ();
}
void
-Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::union_test (void)
{
if (this->debug_)
{
@@ -1470,7 +1362,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
d_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::StructMemberSeq s_members (1);
s_members.length (1);
@@ -1478,7 +1369,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
s_members[0].type_def =
this->repo_->create_string (6
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
CORBA::StructDef_var s_var =
@@ -1487,7 +1377,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
s_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::UnionMemberSeq u_members (4);
u_members.length (4);
@@ -1496,10 +1385,8 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
u_members[0].type_def =
this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
- CORBA::TypeCode_var d_type = d_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var d_type = d_var->type ();
TAO_OutputCDR maker2;
maker2.write_ulong (3); // THREE
TAO_InputCDR maker2_in (maker2);
@@ -1515,7 +1402,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
u_members[1].type_def =
this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
TAO_OutputCDR maker0;
maker0.write_ulong (2); // TWO
@@ -1547,7 +1433,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
u_members[3].type_def =
this->repo_->create_string (17
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
u_members[3].label <<= CORBA::Any::from_octet (0); // default case (ONE)
@@ -1558,15 +1443,12 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
d_var.in (),
u_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::TypeCode_var disc_tc =
- u_var->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ u_var->discriminator_type ();
CORBA::ULong length =
- disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disc_tc->member_count ();
if (this->debug_)
{
@@ -1579,11 +1461,9 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (length == 4);
- CORBA::TypeCode_var tc = u_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var tc = u_var->type ();
- length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ length = tc->member_count ();
if (this->debug_)
{
@@ -1594,8 +1474,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (length == 3);
- CORBA::Long slot = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::Long slot = tc->default_index ();
if (this->debug_)
{
@@ -1613,7 +1492,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
{
str = tc->member_name (i
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -1628,7 +1506,6 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Any_var label = tc->member_label (i
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
CORBA::ULong val;
@@ -1668,16 +1545,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
}
}
- u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- s_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- d_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ u_var->destroy ();
+ s_var->destroy ();
+ d_var->destroy ();
}
void
-Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::exception_test (void)
{
if (this->debug_)
{
@@ -1693,17 +1567,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
members[0].name = CORBA::string_dup ("ub_string");
members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[0].type =
- members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[0].type_def->type ();
members[1].name = CORBA::string_dup ("bd_string");
members[1].type_def = this->repo_->create_string (5
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[1].type = members[1].type_def->type ();
CORBA::EnumMemberSeq e_members (2);
e_members.length (2);
@@ -1718,13 +1588,11 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
e_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
members[2].type =
- members[2].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[2].type_def->type ();
CORBA::ExceptionDef_var exvar =
this->repo_->create_exception ("IDL:my_exception:1.0",
@@ -1732,13 +1600,10 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::TypeCode_var tc = exvar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var tc = exvar->type ();
- CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::ULong length = tc->member_count ();
if (this->debug_)
{
@@ -1755,7 +1620,6 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -1769,8 +1633,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Contained::Description_var desc =
- exvar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ exvar->describe ();
CORBA::ExceptionDescription *ed;
desc->value >>= ed;
@@ -1815,25 +1678,20 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
members[0].name = CORBA::string_dup ("long_mem");
members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[0].type =
- members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[0].type_def->type ();
members[1].name = CORBA::string_dup ("array_mem");
CORBA::ArrayDef_ptr a_ptr =
this->repo_->create_array (5,
members[0].type_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
members[1].type_def = a_ptr;
members[1].type =
- members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[1].type_def->type ();
exvar->members (members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -1852,11 +1710,9 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
def_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::StructMemberSeq_var out_members =
- exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ exvar->members ();
length = out_members->length ();
int cmp_result = 0;
@@ -1883,8 +1739,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
}
}
- a_ptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ a_ptr->destroy ();
if (this->debug_)
{
@@ -1892,8 +1747,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("\nArrayDef::destroy\n\n")));
}
- out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_members = exvar->members ();
length = out_members->length ();
for (i = 0; i < length; ++i)
@@ -1922,10 +1776,8 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = fox->absolute_name ();
if (this->debug_)
{
@@ -1938,10 +1790,8 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
fox = exvar->lookup ("my_enum"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = fox->absolute_name ();
if (this->debug_)
{
@@ -1956,7 +1806,6 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
this->repo_->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -1972,7 +1821,6 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
contents = exvar->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -1987,8 +1835,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->absolute_name ();
if (this->debug_)
{
@@ -2009,7 +1856,6 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -2024,8 +1870,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->absolute_name ();
if (this->debug_)
{
@@ -2045,7 +1890,6 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
0,
-1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = cont_desc->length ();
@@ -2069,8 +1913,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
cont_desc[i].value >>= ed;
CORBA::TypeCode_ptr tc = ed->type.in ();
- length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ length = tc->member_count ();
if (this->debug_)
{
@@ -2099,8 +1942,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
cont_desc[i].value >>= td;
CORBA::TypeCode_ptr tc = td->type.in ();
- length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ length = tc->member_count ();
if (this->debug_)
{
@@ -2128,7 +1970,6 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
exvar->name ("your_exception"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2139,15 +1980,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
contents = exvar->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
const char *tmp = "::your_exception";
for (i = 0; i < length; ++i)
{
- str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->absolute_name ();
if (this->debug_)
{
@@ -2167,14 +2006,12 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_UNUSED_ARG (tmp);
#endif /* ACE_NDEBUG */
- e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- exvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ e_var->destroy ();
+ exvar->destroy ();
}
void
-Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::constant_test (void)
{
if (this->debug_)
{
@@ -2187,7 +2024,6 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::IDLType_var ivar =
this->repo_->get_primitive (CORBA::pk_string
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Any any;
const char *s = "hello";
@@ -2200,12 +2036,9 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ivar.in (),
any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::TypeCode_var tc = cvar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TypeCode_var tc = cvar->type ();
+ CORBA::TCKind kind = tc->kind ();
if (this->debug_)
{
@@ -2217,11 +2050,9 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (kind == CORBA::tk_string);
CORBA::IDLType_var tdef =
- cvar->type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ cvar->type_def ();
CORBA::DefinitionKind def_kind =
- tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ tdef->def_kind ();
if (this->debug_)
{
@@ -2233,8 +2064,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (def_kind == CORBA::dk_Primitive);
CORBA::Any_var out_any;
- out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_any = cvar->value ();
const char *out_s;
out_any >>= out_s;
@@ -2250,16 +2080,13 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ivar = this->repo_->get_primitive (CORBA::pk_double
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
cvar->type_def (ivar.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Double double_val = -1223.42256;
any <<= double_val;
cvar->value (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2268,8 +2095,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("ConstantDef::value (set)\n")));
}
- out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_any = cvar->value ();
CORBA::Double out_double_val;
out_any >>= out_double_val;
@@ -2300,9 +2126,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
cvar->value (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_any = cvar->value ();
CORBA::Short out_short_val;
out_any >>= out_short_val;
@@ -2318,10 +2142,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ivar = this->repo_->get_primitive (CORBA::pk_float
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
cvar->type_def (ivar.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2335,9 +2157,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
cvar->value (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_any = cvar->value ();
CORBA::Float out_float_val;
out_any >>= out_float_val;
@@ -2353,10 +2173,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
ivar = this->repo_->get_primitive (CORBA::pk_ulonglong
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
cvar->type_def (ivar.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2370,9 +2188,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
cvar->value (any
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_any = cvar->value ();
CORBA::ULongLong out_ull_val;
out_any >>= out_ull_val;
@@ -2392,12 +2208,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ASSERT (out_ull_val == ull_val);
- cvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ cvar->destroy ();
}
void
-Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::interface_test (void)
{
if (this->debug_)
{
@@ -2418,12 +2233,10 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
in_bases
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::PrimitiveDef_var p_long =
this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::AttributeDef_var gp_attr =
gp_ivar->create_attribute ("IDL:gp_iface/gp_attr:1.0",
@@ -2432,7 +2245,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
p_long.in (),
CORBA::ATTR_NORMAL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
in_bases.length (1);
in_bases[0] = CORBA::InterfaceDef::_duplicate (gp_ivar.in ());
@@ -2443,11 +2255,9 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
in_bases
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::StringDef_var p_string =
this->repo_->create_string (5 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::AttributeDef_var p_attr =
p_ivar->create_attribute ("IDL:p_iface/p_attr:1.0",
@@ -2456,7 +2266,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
p_string.in (),
CORBA::ATTR_READONLY
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
const char *names[] = {"inarg", "inoutarg", "outarg"};
@@ -2478,7 +2287,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ExceptionDefSeq get_seq (1);
get_seq.length (1);
@@ -2491,8 +2299,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
{
par_seq[i].name = names[i];
par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
- par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ par_seq[i].type = p_long->type ();
par_seq[i].mode = modes[i];
con_seq[i] = contexts[i];
}
@@ -2507,11 +2314,9 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
get_seq,
con_seq
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Contained::Description_var desc =
- p_op->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ p_op->describe ();
CORBA::OperationDescription *od;
desc->value >>= od;
@@ -2527,8 +2332,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0") == 0);
CORBA::TypeCode_var result = od->result;
- CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::TCKind kind = result->kind ();
if (this->debug_)
{
@@ -2583,7 +2387,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2596,7 +2399,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
is_it = p_ivar->is_a ("IDL:gp_iface:1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2609,7 +2411,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
is_it = gp_ivar->is_a ("IDL:p_iface:1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -2621,11 +2422,9 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (is_it == 0);
CORBA::InterfaceDef::FullInterfaceDescription_var fifd =
- p_ivar->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ p_ivar->describe_interface ();
- CORBA::String_var str = fifd->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CORBA::String_var str = fifd->type->id ();
if (this->debug_)
{
@@ -2725,10 +2524,8 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
in_bases
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- desc = ivar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ desc = ivar->describe ();
CORBA::InterfaceDescription *ifd;
desc->value >>= ifd;
@@ -2762,8 +2559,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::InterfaceDefSeq_var out_bases =
- ivar->base_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ivar->base_interfaces ();
length = out_bases->length ();
@@ -2778,8 +2574,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = out_bases[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = out_bases[i]->name ();
if (this->debug_)
{
@@ -2795,7 +2590,6 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = contents->length ();
@@ -2810,8 +2604,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = contents[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = contents[i]->name ();
if (this->debug_)
{
@@ -2822,16 +2615,13 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
}
CORBA::Container_var cr =
- contents[i]->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ contents[i]->defined_in ();
CORBA::Contained_var cd =
CORBA::Contained::_narrow (cr.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = cd->name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = cd->name ();
if (this->debug_)
{
@@ -2846,18 +2636,14 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
|| ACE_OS::strcmp (str.in (), "gp_iface") == 0);
}
- ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- gp_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- p_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ex_var->destroy ();
+ ivar->destroy ();
+ gp_ivar->destroy ();
+ p_ivar->destroy ();
}
void
-Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::move_test (void)
{
if (this->debug_)
{
@@ -2879,7 +2665,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
e_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
e_members[0] = CORBA::string_dup ("TEN");
e_members[1] = CORBA::string_dup ("ELEVEN");
@@ -2890,7 +2675,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
e_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::StructMemberSeq s_members (2);
s_members.length (2);
@@ -2901,16 +2685,13 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
s_members[0].type_def =
this->repo_->get_primitive (CORBA::pk_string
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
s_members[0].type =
- s_members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ s_members[0].type_def->type ();
s_members[1].name = s_names[1];
s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ());
s_members[1].type =
- s_members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ s_members[1].type_def->type ();
CORBA::StructDef_var s_var =
this->repo_->create_struct ("IDL:o_struct:1.0",
@@ -2918,7 +2699,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
s_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::UnionMemberSeq u_members (2);
u_members.length (2);
@@ -2927,8 +2707,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
u_members[0].name = u_names[0];
u_members[0].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
- u_members[0].type = e_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ u_members[0].type = e_var->type ();
CORBA::Long label = 0;
CORBA::Any any;
any <<= label;
@@ -2936,8 +2715,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
u_members[1].name = u_names[1];
u_members[1].type_def = CORBA::StructDef::_duplicate (s_var.in ());
- u_members[1].type = s_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ u_members[1].type = s_var->type ();
label = 1;
any <<= label;
u_members[1].label = any;
@@ -2945,7 +2723,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::PrimitiveDef_var d_var =
this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::UnionDef_var u_var =
this->repo_->create_union ("IDL:the_union:1.0",
@@ -2954,11 +2731,9 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
d_var.in (),
u_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::UnionMemberSeq_var out_u_members =
- u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ u_var->members ();
CORBA::ULong length = out_u_members->length ();
@@ -2993,7 +2768,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
u_var->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = out_contents->length ();
@@ -3010,7 +2784,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
u_names[0],
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -3018,8 +2791,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("\nEnumDef::move (into union)\n")));
}
- out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_u_members = u_var->members ();
length = out_u_members->length ();
@@ -3057,7 +2829,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
out_contents = u_var->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = out_contents->length ();
@@ -3074,8 +2845,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = out_contents[i]->absolute_name ();
if (this->debug_)
{
@@ -3097,13 +2867,11 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
s_names[1],
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
s_var->move (u_var.in (),
u_names[1],
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -3115,7 +2883,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
out_contents = this->repo_->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = out_contents->length ();
@@ -3128,8 +2895,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (length == 1);
- out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ out_u_members = u_var->members ();
length = out_u_members->length ();
@@ -3160,7 +2926,6 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
out_contents = u_var->contents (CORBA::dk_all,
1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = out_contents->length ();
@@ -3179,8 +2944,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = out_contents[i]->absolute_name ();
if (this->debug_)
{
@@ -3199,14 +2963,12 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
{
s_tmp = CORBA::StructDef::_narrow (out_contents[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
out_contents = s_tmp->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = out_contents->length ();
@@ -3223,8 +2985,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = out_contents[i]->absolute_name ();
if (this->debug_)
{
@@ -3246,8 +3007,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
#endif /* ACE_NDEBUG */
CORBA::StructMemberSeq_var out_s_members =
- s_tmp->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ s_tmp->members ();
length = out_s_members->length ();
@@ -3275,12 +3035,11 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (tmp, s_names[i]) == 0);
}
- u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ u_var->destroy ();
}
void
-Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::module_test (void)
{
if (this->debug_)
{
@@ -3295,21 +3054,18 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
"outer",
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ModuleDef_var middle =
outer->create_module ("IDL:outer/middle:1.0",
"middle",
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ModuleDef_var inner =
middle->create_module ("IDL:outer/middle/inner:1.0",
"inner",
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::InterfaceDefSeq in_bases (1);
in_bases.length (0);
@@ -3320,7 +3076,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
in_bases
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
in_bases.length (1);
in_bases[0] = CORBA::InterfaceDef::_duplicate (p_iface.in ());
@@ -3331,16 +3086,13 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
in_bases
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::PrimitiveDef_var p_void =
this->repo_->get_primitive (CORBA::pk_void
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::PrimitiveDef_var p_long =
this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::AttributeDef_var attr =
p_iface->create_attribute ("IDL:iface/attr:1.0",
@@ -3349,7 +3101,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
p_void.in (),
CORBA::ATTR_NORMAL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong length = 3;
CORBA::ULong i = 0;
@@ -3367,8 +3118,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
{
par_seq[i].name = p_names[i];
par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
- par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ par_seq[i].type = p_long->type ();
par_seq[i].mode = static_cast<CORBA::ParameterMode> (i);
con_seq[i] = contexts[i];
@@ -3383,7 +3133,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ExceptionDefSeq get_seq (1);
get_seq.length (1);
@@ -3399,17 +3148,14 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
get_seq,
con_seq
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::String_var str;
CORBA::Contained_var result =
inner->lookup ("::outer::middle::inner::iface::op"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = result->absolute_name ();
if (this->debug_)
{
@@ -3427,10 +3173,8 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
result = middle->lookup ("inner::iface::op"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = result->absolute_name ();
if (this->debug_)
{
@@ -3452,7 +3196,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = cseq->length ();
@@ -3467,8 +3210,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = cseq[i]->absolute_name ();
if (this->debug_)
{
@@ -3491,7 +3233,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::dk_Attribute,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = cseq->length ();
@@ -3506,8 +3247,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = cseq[i]->absolute_name ();
if (this->debug_)
{
@@ -3526,7 +3266,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
"iface",
"1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->debug_)
{
@@ -3539,7 +3278,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
length = cseq->length ();
@@ -3554,8 +3292,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
for (i = 0; i < length; ++i)
{
- str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ str = cseq[i]->absolute_name ();
if (this->debug_)
{
@@ -3570,8 +3307,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
ACE_ASSERT (ACE_OS::strcmp (str.in (), "::outer::iface::op") == 0);
}
- ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- outer->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ex_var->destroy ();
+ outer->destroy ();
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index 2c478800c52..51fd0283640 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -50,24 +50,24 @@ public:
// Execute test code.
private:
- void array_test (ACE_ENV_SINGLE_ARG_DECL);
- void enum_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void alias_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void native_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void struct_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void union_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void exception_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void constant_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void interface_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void move_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void module_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void array_test (void);
+ void enum_test (void);
+ void alias_test (void);
+ void native_test (void);
+ void struct_test (void);
+ void union_test (void);
+ void exception_test (void);
+ void constant_test (void);
+ void interface_test (void);
+ void move_test (void);
+ void module_test (void);
// The various IFR tests.
int parse_args (int argc,
char *argv[]);
// Process the command line arguments.
- void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void);
// Array of pointers to the test functions.
static const char *test_names_[];
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index c29daa4ff2a..d147c4c45bd 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -7,8 +7,8 @@
#include "ace/Stats.h"
#include "ace/Sample_History.h"
-ACE_RCSID (Latency_Test,
- Latency_Query_Client,
+ACE_RCSID (Latency_Test,
+ Latency_Query_Client,
"$Id$")
const CORBA::ULong DEFAULT_NUMCALLS = 20000;
@@ -34,7 +34,6 @@ Latency_Query_Client::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int retval = this->parse_args (argc,
argv);
@@ -47,7 +46,6 @@ Latency_Query_Client::init (int argc,
CORBA::Object_var object =
this->orb_->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (object.in ()))
{
@@ -62,7 +60,6 @@ Latency_Query_Client::init (int argc,
this->repo_ =
CORBA::Repository::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->repo_.in ()))
{
@@ -71,8 +68,7 @@ Latency_Query_Client::init (int argc,
-1);
}
- retval = this->populate_ifr (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = this->populate_ifr ();
if (retval != 0)
{
@@ -100,8 +96,7 @@ Latency_Query_Client::run (void)
{
for (int j = 0; j < 100; ++j)
{
- am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ am = this->attr_->mode ();
if (am != CORBA::ATTR_NORMAL)
{
@@ -116,8 +111,7 @@ Latency_Query_Client::run (void)
{
ACE_hrtime_t start = ACE_OS::gethrtime ();
- am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ am = this->attr_->mode ();
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
@@ -127,12 +121,12 @@ Latency_Query_Client::run (void)
if (this->debug_)
{
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"test finished\n"));
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"High resolution timer calibration...."));
ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
- ACE_DEBUG ((LM_DEBUG,
+ ACE_DEBUG ((LM_DEBUG,
"done\n"));
if (this->do_dump_history_)
@@ -144,7 +138,7 @@ Latency_Query_Client::run (void)
history.collect_basic_stats (stats);
stats.dump_results ("Total", gsf);
- ACE_Throughput_Stats::dump_throughput ("Total",
+ ACE_Throughput_Stats::dump_throughput ("Total",
gsf,
test_end - test_start,
stats.samples_count ());
@@ -152,7 +146,7 @@ Latency_Query_Client::run (void)
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
"Latency_Query_Client::run:");
return -1;
}
@@ -176,10 +170,10 @@ Latency_Query_Client::parse_args (int argc,
case 'd':
this->debug_ = true;
break;
- case 'h':
+ case 'h':
this->do_dump_history_ = true;
break;
- case 'i':
+ case 'i':
result = ACE_OS::atoi (opts.opt_arg ());
if (result > 0)
@@ -204,17 +198,15 @@ Latency_Query_Client::parse_args (int argc,
}
int
-Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
+Latency_Query_Client::populate_ifr (void)
{
CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (! CORBA::is_nil (irobj.in ()))
{
this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->attr_.in ()))
{
@@ -236,12 +228,10 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
in_bases
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::PrimitiveDef_var p_long =
this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->attr_ =
iface->create_attribute ("IDL:dummt/attr:1.0",
@@ -250,7 +240,6 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
p_long.in (),
CORBA::ATTR_NORMAL
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index fa223454637..1400b2bd059 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -48,7 +48,7 @@ private:
char *argv[]);
// Process the command line arguments.
- int populate_ifr (ACE_ENV_SINGLE_ARG_DECL);
+ int populate_ifr (void);
// Put in something to query about.
private:
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 10146a9a882..989aca924bf 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -27,7 +27,6 @@ Ptest::init (int argc,
argv,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int retval = this->parse_args (argc,
argv);
@@ -38,7 +37,6 @@ Ptest::init (int argc,
CORBA::Object_var object =
this->orb_->resolve_initial_references ("InterfaceRepository"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (object.in ()))
{
@@ -53,7 +51,6 @@ Ptest::init (int argc,
this->repo_ =
CORBA::Repository::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->repo_.in ()))
{
@@ -81,13 +78,11 @@ Ptest::run (void)
{
if (this->query_ == 1)
{
- this->query (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->query ();
}
else
{
- this->populate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->populate ();
}
}
ACE_CATCHANY
@@ -132,7 +127,7 @@ Ptest::parse_args (int argc,
}
void
-Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
+Ptest::populate (void)
{
if (this->debug_)
{
@@ -147,17 +142,13 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
members[0].name = CORBA::string_dup ("long_mem");
members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[0].type = members[0].type_def->type ();
members[1].name = CORBA::string_dup ("array_mem");
members[1].type_def = this->repo_->create_array (5,
members[0].type_def.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ members[1].type = members[1].type_def->type ();
CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0",
@@ -165,7 +156,6 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::EnumMemberSeq def_members (2);
def_members.length (2);
@@ -178,11 +168,10 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
"1.0",
def_members
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
+Ptest::query (void)
{
if (this->debug_)
{
@@ -199,11 +188,10 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
"my_enum"
};
- CORBA::ContainedSeq_var contents =
+ CORBA::ContainedSeq_var contents =
this->repo_->contents (CORBA::dk_all,
0
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::ULong length = contents->length ();
@@ -221,13 +209,11 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
CORBA::StructDef_var svar =
CORBA::StructDef::_narrow (contents[i]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (svar.in ()));
CORBA::StructMemberSeq_var out_members =
- svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ svar->members ();
length = out_members->length ();
@@ -265,6 +251,5 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
ACE_UNUSED_ARG (members);
#endif /* ACE_NDEBUG */
- svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ svar->destroy ();
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index bec1b5d88c7..89b64f0cbfc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -50,8 +50,8 @@ public:
// Execute test code.
private:
- void populate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- void query (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ void populate (void);
+ void query (void);
// The two IFR tests.
int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index a7b13988c33..b86d36f0440 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -33,8 +33,7 @@ int main (int argc, char *argv [])
if (client.init (argc, argv) != 0)
return 1;
- result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = client.run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 2f6f2d7ad72..8d88b5cca1e 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -148,7 +148,7 @@ NContextExt_Client_i::get_name ()
}
int
-NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
+NContextExt_Client_i::run (void)
{
ACE_TRY_EX (OuterBlock)
@@ -256,7 +256,6 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -286,7 +285,6 @@ NContextExt_Client_i::init (int argc, char **argv)
// Get a reference to the Naming Service
CORBA::Object_var naming_context_object =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (naming_context_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -297,7 +295,6 @@ NContextExt_Client_i::init (int argc, char **argv)
this->naming_context_ =
CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->naming_context_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 930aeaf426a..422a144f817 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -39,7 +39,7 @@ class NContextExt_Client_i
NContextExt_Client_i (void);
~NContextExt_Client_i (void);
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Execute the client example code.
int init (int argc, char **argv);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 0fc3f158fc1..0c5e9f31e86 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -19,14 +19,14 @@ Basic::Basic (CORBA::Object_ptr object_group,
}
char *
-Basic::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->location_);
}
void
-Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Basic::remove_member (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -37,7 +37,6 @@ Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
this->lm_->remove_member (this->object_group_.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
this->location_));
@@ -65,7 +64,7 @@ Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index 72a6aeb8977..9cfeea8e6ca 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -27,13 +27,13 @@ public:
CORBA::ORB_ptr orb,
const char *loc);
- virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void remove_member (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void remove_member (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index f112c8a0af6..d91fc041946 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -21,13 +21,10 @@ LB_server::destroy (void)
{
this->lm_->delete_object (this->fcid_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCHANY
{
@@ -86,12 +83,10 @@ LB_server::start_orb_and_poa (void)
this->orb_ = CORBA::ORB_init (this->argc_,
this->argv_,
"" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -100,14 +95,11 @@ LB_server::start_orb_and_poa (void)
this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
@@ -115,7 +107,6 @@ LB_server::start_orb_and_poa (void)
this->lm_ =
CosLoadBalancing::LoadManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->lm_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -159,12 +150,10 @@ LB_server::create_object_group (void)
criteria,
this->fcid_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (this->object_group_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->write_ior_to_file (ior.in ());
}
@@ -186,8 +175,7 @@ LB_server::register_servant (Basic *servant, const char *loc)
ACE_TRY_NEW_ENV
{
Test::Basic_var basic =
- servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servant->_this ();
PortableGroup::Location location (1);
location.length (1);
@@ -198,7 +186,6 @@ LB_server::register_servant (Basic *servant, const char *loc)
location,
basic.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index 3a588d90066..a87be7e3a74 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -40,18 +40,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Basic_var basic =
Test::Basic::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (basic.in ()))
{
@@ -64,21 +61,17 @@ main (int argc, char *argv[])
for (int i = 0; i < 5; i++)
{
CORBA::String_var the_string =
- basic->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ basic->get_string ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n",
the_string.in ()));
}
- basic->remove_member (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ basic->remove_member ();
- basic->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ basic->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 68236f62685..240e4e281a1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -91,8 +91,7 @@ main (int argc, char *argv[])
return 1;
}
- lb_server.orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ lb_server.orb ()->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 1c0798efa7e..265df58ad6a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -31,7 +31,6 @@ Factory::create_object (
Simple,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
PortableServer::ServantBase_var safe_servant = servant;
@@ -53,21 +52,18 @@ Factory::create_object (
ACE_NEW_THROW_EX (my_fcid,
PortableGroup::GenericFactory::FactoryCreationId,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
fcid = my_fcid;
*my_fcid <<= tmp_fcid;
this->poa_ =
- servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
+ servant->_default_POA ();
this->oid_ = this->poa_->servant_to_id (servant
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
- return servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return servant->_this ();
}
@@ -98,7 +94,6 @@ Factory::delete_object (
{
this->poa_->deactivate_object (this->oid_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index fef78510c70..a8060cbfeb3 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -30,7 +30,6 @@ LB_server::run (void)
while (1)
{
this->orb_->perform_work (&period);
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
@@ -52,13 +51,10 @@ LB_server::destroy (void)
{
this->lm_->delete_object (this->fcid_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCHANY
{
@@ -99,12 +95,10 @@ LB_server::start_orb_and_poa (void)
this->orb_ = CORBA::ORB_init (this->argc_,
this->argv_,
"" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,14 +107,11 @@ LB_server::start_orb_and_poa (void)
this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
@@ -128,7 +119,6 @@ LB_server::start_orb_and_poa (void)
this->lm_ =
CosLoadBalancing::LoadManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->lm_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -159,12 +149,10 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
Factory factory_object2;
PortableGroup::GenericFactory_var factory_obj1 =
- factory_object1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ factory_object1._this ();
PortableGroup::GenericFactory_var factory_obj2 =
- factory_object2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ factory_object2._this ();
PortableGroup::FactoriesValue factory_infos;
factory_infos.length (2);
@@ -226,12 +214,10 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
criteria,
this->fcid_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (this->object_group_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->write_ior_to_file (ior.in ());
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index a4de93fd1b0..cd173291fe0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -11,7 +11,7 @@ Simple::Simple (void)
}
char *
-Simple::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple::get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup ("TAO Load Balancing Works!");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index 7eb93b15f5c..d8767be2696 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -20,7 +20,7 @@ public:
Simple (void);
/// Constructor
- virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 8a85b412846..0d207c0e676 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -42,18 +42,15 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Simple_var simple =
Test::Simple::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (simple.in ()))
{
@@ -64,14 +61,12 @@ main (int argc, char *argv[])
}
CORBA::String_var the_string =
- simple->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ simple->get_string ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
the_string.in ()));
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index b858c9947a5..02087ce3b0e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -21,21 +21,21 @@ Basic::Basic (CORBA::Object_ptr object_group,
}
CORBA::Short
-Basic::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::number (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->number_;
}
char *
-Basic::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->location_);
}
void
-Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Basic::remove_member (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -46,7 +46,6 @@ Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
this->lm_->remove_member (this->object_group_.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
this->location_));
@@ -74,7 +73,7 @@ Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index ad2bb53be84..5f8a5eb3465 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -26,16 +26,16 @@ public:
CORBA::Short num,
const char *loc);
- virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void remove_member (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void remove_member (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Short number (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 14c3fdcf727..4df551249ec 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -22,17 +22,13 @@ LB_server::destroy (void)
{
this->lm_->delete_object (this->basic_fcid_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->lm_->delete_object (this->simple_fcid_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->destroy ();
}
ACE_CATCHANY
{
@@ -79,12 +75,10 @@ LB_server::start_orb_and_poa (void)
this->orb_ = CORBA::ORB_init (this->argc_,
this->argv_,
"" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -93,14 +87,11 @@ LB_server::start_orb_and_poa (void)
this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
CORBA::Object_var obj =
this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
@@ -108,7 +99,6 @@ LB_server::start_orb_and_poa (void)
this->lm_ =
CosLoadBalancing::LoadManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (this->lm_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -152,12 +142,10 @@ LB_server::create_basic_object_group (void)
criteria,
this->basic_fcid_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (this->basic_object_group_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -196,12 +184,10 @@ LB_server::create_simple_object_group (void)
criteria,
this->simple_fcid_.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
this->orb_->object_to_string (this->simple_object_group_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -231,7 +217,6 @@ LB_server::remove_basic_member (void)
this->lm_->remove_member (this->basic_object_group_.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
printf("Removed Basic Member at location %s\n\n", loc);
}
@@ -261,7 +246,6 @@ LB_server::remove_simple_member (void)
this->lm_->remove_member (this->simple_object_group_.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
printf("Removed Simple Member at location %s\n\n", loc);
}
@@ -282,8 +266,7 @@ LB_server::register_basic_servant (Basic *servant, const char *loc)
ACE_TRY_NEW_ENV
{
Test::Basic_var basic =
- servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servant->_this ();
PortableGroup::Location location (1);
location.length (1);
@@ -294,10 +277,9 @@ LB_server::register_basic_servant (Basic *servant, const char *loc)
location,
basic.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Short number = 0;
- number = servant->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+ number = servant->number ();
printf("Added Basic member %d at location %s\n", number, loc);
}
@@ -318,8 +300,7 @@ LB_server::register_simple_servant (Simple *servant, const char *loc)
ACE_TRY_NEW_ENV
{
Test::Simple_var simple =
- servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ servant->_this ();
PortableGroup::Location location (1);
location.length (1);
@@ -330,10 +311,9 @@ LB_server::register_simple_servant (Simple *servant, const char *loc)
location,
simple.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Short number = 0;
- number = servant->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+ number = servant->number ();
printf("Added Simple member %d at location %s\n", number, loc);
}
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 7949918ee73..f1594dd2f56 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -21,21 +21,21 @@ Simple::Simple (CORBA::Object_ptr object_group,
}
CORBA::Short
-Simple::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple::number (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->number_;
}
char *
-Simple::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple::get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->location_);
}
void
-Simple::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Simple::remove_member (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -46,7 +46,6 @@ Simple::remove_member (ACE_ENV_SINGLE_ARG_DECL)
this->lm_->remove_member (this->object_group_.in (),
location
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
this->location_));
@@ -74,7 +73,7 @@ Simple::remove_member (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Simple::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index 0a3d63efa23..5a274f26153 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -28,16 +28,16 @@ public:
CORBA::Short num,
const char *loc);
- virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual char * get_string (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void remove_member (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void remove_member (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Short number (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 4f4724ab6c6..88e26146e35 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -112,7 +112,6 @@ main (int argc, char *argv[])
}
lb_server.orb ()->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index ccae399abb8..589a654f033 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -72,18 +72,15 @@ main (int argc, char *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Obtain a reference to the LoadManager.
CORBA::Object_var obj =
orb->resolve_initial_references ("LoadManager"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::LoadManager_var lm =
CosLoadBalancing::LoadManager::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::Location the_location (1);
the_location.length (1);
@@ -119,7 +116,6 @@ main (int argc, char *argv[])
ACE_OS::sleep (2);
}
ACE_ENDTRY;
- ACE_TRY_CHECK;
}
if (retrieved_load == 0)
@@ -133,17 +129,14 @@ main (int argc, char *argv[])
::check_loads (loads.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Attempt to get loads directly from the LoadMonitor.
CosLoadBalancing::LoadMonitor_var monitor =
lm->get_load_monitor (the_location
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosLoadBalancing::Location_var cpu_mon_location =
- monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ monitor->the_location ();
if (cpu_mon_location.in () != the_location)
{
@@ -156,15 +149,13 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_INFO,
"Retrieving loads directly from LoadMonitor ..."));
- loads = monitor->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ loads = monitor->loads ();
ACE_DEBUG ((LM_INFO,
" DONE\n"));
::check_loads (loads.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index d7123478053..319d340157e 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -38,7 +38,6 @@ BasicLog_Test::init (int argc, char *argv[])
argv,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
@@ -49,8 +48,7 @@ BasicLog_Test::init (int argc, char *argv[])
return -1;
// Initialize the factory
- int init_result = this->init_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ int init_result = this->init_factory ();
if (init_result != 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -70,7 +68,7 @@ BasicLog_Test::init (int argc, char *argv[])
}
int
-BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
+BasicLog_Test::init_factory (void)
{
// Assumpting INS for finding LogServie
@@ -78,11 +76,9 @@ BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
//CORBA::Object_var logging_obj = orb_->resolve_initial_references ("BasicLogFactory",
// ACE_TRY_ENV);
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_naming_service ();
- this->resolve_basic_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_basic_factory ();
/*
if (TAO_debug_level > 0)
@@ -116,7 +112,6 @@ BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::String_var str =
orb_->object_to_string (basicLog_.in()
ACE_ENV_ARG_PARAMETER); //Init the Client
- ACE_CHECK_RETURN (-1);
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
@@ -136,7 +131,6 @@ BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
basicLog_ = factory_->create(DsLogAdmin::wrap, maxSize, id);
// @@ Krish, never use != 0 to compare a NIL object reference!!!
ACE_ASSERT (!CORBA::is_nil (basicLog_.in ()));
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"The logger id is %d\n",
id));
@@ -203,7 +197,6 @@ BasicLog_Test::test_LogAction ()
// make sure that it is full and when writing
this->write_records (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Wrote records instead should have thrown exception"));
@@ -369,7 +362,6 @@ BasicLog_Test::test_adminState()
ACE_TRY
{
this->write_records(0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed. DsLogAdmin::LogLocked not thrown.\n"),-1);
@@ -412,7 +404,6 @@ BasicLog_Test::test_logSize (void)
ACE_TRY
{
basicLog_->set_max_size (1);
- ACE_TRY_CHECK;
ACE_ERROR_RETURN ((LM_ERROR,
"Setting max size less than current size failed.\n"
@@ -463,7 +454,6 @@ BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy)
ACE_TRY
{
this->write_records (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -567,12 +557,11 @@ BasicLog_Test::parse_args (int argc, char *argv[])
}
void
-BasicLog_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+BasicLog_Test::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (naming_sevice_name_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -580,11 +569,10 @@ BasicLog_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-BasicLog_Test::resolve_basic_factory (ACE_ENV_SINGLE_ARG_DECL)
+BasicLog_Test::resolve_basic_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -592,11 +580,9 @@ BasicLog_Test::resolve_basic_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->factory_ =
DsLogAdmin::BasicLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -606,8 +592,7 @@ BasicLog_Test::destroy_log()
{
if (!CORBA::is_nil(basicLog_.in ()))
{
- basicLog_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ basicLog_->destroy ();
basicLog_ = DsLogAdmin::BasicLog::_nil ();
}
@@ -629,7 +614,6 @@ BasicLog_Test::test_log_destroy (void)
ACE_TRY_NEW_ENV
{
this->write_records (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_INFO, "Wrote to log\n"));
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -749,7 +733,6 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
ACE_TRY
{
basicLog_->set_capacity_alarm_thresholds (list);
- ACE_TRY_CHECK;
ACE_ERROR_RETURN ((LM_ERROR,
"Setting an invalid alarm threshold failed. "
"DsLogAdmin::InvalidThreshold not thrown.\n"),
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index cde2e00f5a0..03f8ca751af 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -48,7 +48,7 @@ class BasicLog_Test
int display_records ();
-int
+int
delete_records (CORBA::ULongLong numberOfRecords);
int
@@ -111,7 +111,7 @@ private:
BasicLog_Test& operator=(const BasicLog_Test&);
int
- init_factory (ACE_ENV_SINGLE_ARG_DECL);
+ init_factory (void);
int
parse_args(int argc, char *argv[]);
@@ -121,11 +121,11 @@ private:
// writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite.
void
- resolve_basic_factory (ACE_ENV_SINGLE_ARG_DECL);
+ resolve_basic_factory (void);
// resolve log factory
void
- resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ resolve_naming_service (void);
// resolve nameing service
void
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index c9b304c57bd..18ef2957365 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -55,7 +55,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload ACE_ENV_ARG_DECL
}
void
-McastHello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+McastHello::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index d0135f3ae55..f1ed7f37cb7 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -21,7 +21,7 @@ public:
virtual void send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return whether all test requests have been received successfully.
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index 10180538dbf..ffcb507da30 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -44,14 +44,12 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/* Do an unchecked narrow since there's no way to do an is_a on
@@ -72,7 +70,6 @@ main (int argc, char *argv[])
}
hello->send_forty_two (42 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test::Octets payload (MAX_MIOP_OCTET_SEQUENCE);
payload.length (MAX_MIOP_OCTET_SEQUENCE);
@@ -83,13 +80,10 @@ main (int argc, char *argv[])
}
hello->send_large_octet_array (payload ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ hello->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index ecf06638ce2..29b8d804f0b 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -56,15 +56,12 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableGroup::GOA_var root_poa =
PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,8 +69,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -84,7 +80,6 @@ main (int argc, char *argv[])
CORBA::Object_var group1 =
orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Output the Group IOR to the <ior_output_file>
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -99,7 +94,6 @@ main (int argc, char *argv[])
PortableServer::ObjectId_var id =
root_poa->create_id_for_reference (group1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create and activate an instance of our servant.
McastHello server_impl (orb.in (), 0);
@@ -107,22 +101,17 @@ main (int argc, char *argv[])
root_poa->activate_object_with_id (id.in (),
&server_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
// Validate that our servants got the right requests.
if (server_impl.get_status () == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index 08309efacca..d4ec6de24c1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -79,7 +79,6 @@ AdminProperties_Task::svc (void)
{
ACE_DEBUG((LM_DEBUG, "+"));
this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
{
@@ -243,7 +242,6 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
@@ -253,40 +251,32 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
this->supplier_admin_ = ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
this->consumer_admin_ = ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
}
void
-AdminProperties::run_test (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::run_test (void)
{
bool reject = true;
this->create_channel(reject ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->ec_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->destroy();
reject = false;
this->create_channel(reject ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->test_max_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->test_max_clients ();
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->ec_->destroy ();
}
void
@@ -296,17 +286,13 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
AdminProperties_StructuredPushConsumer *consumer;
ACE_NEW (consumer, AdminProperties_StructuredPushConsumer (this));
consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the supplier
TAO_Notify_Tests_StructuredPushSupplier *supplier = 0;
ACE_NEW (supplier, TAO_Notify_Tests_StructuredPushSupplier ());
supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
AdminProperties_Task supplier_task;
@@ -322,17 +308,14 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
// received. This relies on our use of -ORBClientConnectionHandler RW.
supplier_task.wait ();
- this->ORB_run(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ORB_run();
// consumer is destroyed by consumer->disconnect()
CORBA::Long received_count = consumer->events_received_.value ();
// disconnect the participants.
- consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->disconnect ();
+ supplier->disconnect ();
// If the reject_new_events setting == true, then the supplier should
// have received an imp_limit exception for each event it tried to push
@@ -367,13 +350,11 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
}
void
-AdminProperties::test_max_clients (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::test_max_clients (void)
{
- this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->create_suppliers ();
- this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->create_consumers ();
// check the results and print the assessment.
if (this->consumers_connected_count_ > this->max_consumers_)
@@ -386,7 +367,7 @@ AdminProperties::test_max_clients (ACE_ENV_SINGLE_ARG_DECL)
}
void
-AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::create_suppliers (void)
{
// Create the requested number of suppliers.
// @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -404,11 +385,9 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW (supplier,
TAO_Notify_Tests_StructuredPushSupplier ());
supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
supplier->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->suppliers_connected_count_++;
}
@@ -427,7 +406,7 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::create_consumers (void)
{
// Create the requested number of suppliers.
// @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -444,10 +423,8 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_NEW (consumer, TAO_Notify_Tests_StructuredPushConsumer ());
consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->consumers_connected_count_++;
}
@@ -475,10 +452,8 @@ main (int argc, char* argv[])
ACE_TRY_NEW_ENV
{
test.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test.run_test ();
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 44abf483bf7..f1a5eb3d8e4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -101,16 +101,16 @@ public:
// Initialization.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
private:
- void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
- void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_suppliers (void);
+ void create_consumers (void);
void create_channel(bool reject ACE_ENV_ARG_DECL);
/// Test MaxSuppliers and MaxConsumers
- void test_max_clients (ACE_ENV_SINGLE_ARG_DECL);
+ void test_max_clients (void);
/// Test MaxQueueLength properties
void test_max_queue_length (bool reject ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index f3087187a05..f1cda8b802c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -84,11 +84,9 @@ ConnectDisconnect::init (int argc,
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);;
// Create all participants.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
@@ -96,7 +94,6 @@ ConnectDisconnect::init (int argc,
ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);;
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -104,7 +101,6 @@ ConnectDisconnect::init (int argc,
ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -188,7 +184,7 @@ ConnectDisconnect::parse_args(int argc, char *argv[])
}
void
-ConnectDisconnect::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -196,13 +192,12 @@ ConnectDisconnect::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::run_test (void)
{
for (int iterations = 0; iterations < count_; ++iterations)
{
@@ -216,10 +211,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
i));
this->any_consumer_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->any_consumer_[i]->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create and connect Structured consumers.
ACE_NEW (this->structured_consumer_[i],
@@ -227,10 +220,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
i));
this->structured_consumer_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->structured_consumer_[i]->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create and connect Sequence consumers.
ACE_NEW (this->sequence_consumer_[i],
@@ -238,7 +229,6 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
i));
this->sequence_consumer_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sequence_consumer_[i]->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
}
@@ -250,10 +240,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
i));
this->any_supplier_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->any_supplier_[i]->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create and connect Structured suppliers.
ACE_NEW (this->structured_supplier_[i],
@@ -261,10 +249,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
i));
this->structured_supplier_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->structured_supplier_[i]->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create and connect Sequence suppliers.
ACE_NEW (this->sequence_supplier_[i],
@@ -272,54 +258,46 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
i));
this->sequence_supplier_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sequence_supplier_[i]->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
for (i = 0; i < this->consumers_; ++i)
{
// Disconnnect Any consumers.
- this->any_consumer_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->any_consumer_[i]->disconnect ();
// Disconnect Structured Consumers.
this->structured_consumer_[i]->disconnect (
ACE_ENV_SINGLE_ARG_PARAMETER
);
- ACE_CHECK;
// Disconnect Sequence Consumers.
this->sequence_consumer_[i]->disconnect (
ACE_ENV_SINGLE_ARG_PARAMETER
);
- ACE_CHECK;
}
for (i = 0; i < this->suppliers_; ++i)
{
// Disconnnect Any suppliers.
- this->any_supplier_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->any_supplier_[i]->disconnect ();
// Disconnect Structured Suppliers.
this->structured_supplier_[i]->disconnect (
ACE_ENV_SINGLE_ARG_PARAMETER
);
- ACE_CHECK;
// Disconnect Sequence Suppliers.
this->sequence_supplier_[i]->disconnect (
ACE_ENV_SINGLE_ARG_PARAMETER
);
- ACE_CHECK;
}
}
}
void
-ConnectDisconnect::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ConnectDisconnect::end_test (void)
{
consumer_done( 0 );
}
@@ -341,8 +319,7 @@ ConnectDisconnect::check_results (void)
// Destroy the channel.
ACE_DECLARE_NEW_CORBA_ENV;
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->destroy ();
return 0;
}
@@ -362,13 +339,10 @@ main (int argc, char* argv[])
ACE_TRY_NEW_ENV
{
client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.run_test ();
- client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.end_test ();
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index a08cd5dd3ad..57e225f4215 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -77,17 +77,17 @@ public:
ACE_ENV_ARG_DECL);
// initialization.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
- void end_test (ACE_ENV_SINGLE_ARG_DECL);
+ void end_test (void);
// End the test.
int check_results (void);
// Check if we got the expected results.
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC.
CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 58d348d5859..8cc5936b06a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -65,19 +65,16 @@ Events::init (int argc,
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create all participents.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
if (use_default_admin_ == 1)
{
this->supplier_admin_ =
- this->ec_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->default_supplier_admin ();
}
else
{
@@ -85,7 +82,6 @@ Events::init (int argc,
this->ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -93,8 +89,7 @@ Events::init (int argc,
if (use_default_admin_ == 1)
{
this->consumer_admin_ =
- this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->default_consumer_admin ();
}
else
{
@@ -102,7 +97,6 @@ Events::init (int argc,
this->ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -112,10 +106,8 @@ Events::init (int argc,
-1);
this->consumer_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->consumer_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
Event_StructuredPushConsumer* consumer2 = 0;
ACE_NEW_RETURN (consumer2,
@@ -123,21 +115,17 @@ Events::init (int argc,
-1);
consumer2->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer2->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_NEW_RETURN (this->supplier_,
Event_StructuredPushSupplier (this),
-1);
this->supplier_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->supplier_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer_start( 0 );
@@ -188,7 +176,7 @@ Events::parse_args (int argc,
}
void
-Events::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Events::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -196,7 +184,6 @@ Events::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
/****************************************************************/
/*
@@ -214,7 +201,7 @@ Events::create_EC (ACE_ENV_SINGLE_ARG_DECL)
admin[1].value <<= (CORBA::Long)2;
ec_->set_admin (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;*/
+/
/****************************************************************/
ACE_ASSERT (!CORBA::is_nil (this->ec_.in ()));
@@ -233,13 +220,12 @@ Events::on_event_received (void)
if (this->result_count_ == 2 * this->event_count_)
{
ACE_DECLARE_NEW_CORBA_ENV;
- this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->end_test ();
}
}
void
-Events::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Events::run_test (void)
{
// operations:
CosNotification::StructuredEvent event;
@@ -287,12 +273,11 @@ Events::run_test (ACE_ENV_SINGLE_ARG_DECL)
this->supplier_->send_event (event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-Events::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Events::end_test (void)
{
consumer_done( 0 );
}
@@ -302,8 +287,7 @@ Events::check_results (void)
{
// Destroy the channel.
ACE_DECLARE_NEW_CORBA_ENV;
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->destroy ();
if (this->result_count_ == 2 * this->event_count_)
{
@@ -336,13 +320,10 @@ main (int argc, char* argv[])
events.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ events.run_test ();
events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index e7493489b67..208b36eef8d 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -81,17 +81,17 @@ public:
void on_event_received (void);
// Called when an event is received.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
- void end_test (ACE_ENV_SINGLE_ARG_DECL);
+ void end_test (void);
// End the test.
int check_results (void);
// check if we got the expected results.
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC
ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 3d54679c307..4d0d9928cd3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -24,11 +24,9 @@ Filter::init (int argc, char* argv []
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create all participents.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
@@ -36,7 +34,6 @@ Filter::init (int argc, char* argv []
this->ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -44,32 +41,27 @@ Filter::init (int argc, char* argv []
this->ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
this->ffact_ =
- ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ ec_->default_filter_factory ();
return 0;
}
void
-Filter::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Filter::run_test (void)
{
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
CosNotifyFilter::FilterAdmin_var ca_filter_admin =
CosNotifyFilter::FilterAdmin::_narrow (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->run_filter_test (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->destroy ();
}
void
@@ -79,35 +71,28 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_A
ACE_DEBUG ((LM_DEBUG, " Calling remove_all_filters\n"));
// Clear all filters.
- filter_admin->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ filter_admin->remove_all_filters ();
this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Adding a filter \n"));
CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Adding another filter \n"));
this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->verify_filter_count (filter_admin, 2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
{
ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (TAO_debug_level)
@@ -115,34 +100,28 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_A
// remove the filter.
filter_admin->remove_filter (id_1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
{
ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Calling remove_all_filters \n"));
- filter_admin->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ filter_admin->remove_all_filters ();
if (TAO_debug_level)
{
ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Make sure all filters are removed -
this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "Filters test has run successfully\n"));
}
@@ -151,8 +130,7 @@ void
Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count ACE_ENV_ARG_DECL)
{
expected_count = expected_count; // if we don;t do this, we get a warning on linux about arg not used.
- CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
ACE_ASSERT (filter_seq->length () == expected_count);
}
@@ -162,7 +140,6 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
// setup a filter at the filter admin
CosNotifyFilter::Filter_var filter =
this->ffact_->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (filter.in ()));
@@ -175,10 +152,8 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
constraint_list[0].constraint_expr = CORBA::string_dup (test_filter_string);
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Print the ID
if (TAO_debug_level)
@@ -190,8 +165,7 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
void
Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
{
- CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
ACE_DEBUG ((LM_DEBUG, "Getting all %d filters...\n ", filter_seq->length ()));
@@ -203,7 +177,7 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG
void
-Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Filter::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -211,7 +185,6 @@ Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
@@ -233,10 +206,8 @@ main (int argc, char* argv[])
events.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ events.run_test ();
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 9bd93156d6d..ac36162682b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -39,11 +39,11 @@ public:
ACE_ENV_ARG_DECL);
// initialization.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC
/// Run some tests to check the filters.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index ebfd98f3df1..89225a9b9be 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -87,12 +87,10 @@ IdAssignment::init (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var rootObj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (rootObj.in ()))
{
@@ -104,7 +102,6 @@ IdAssignment::init (int argc,
CosNaming::NamingContext_var rootNC =
CosNaming::NamingContext::_narrow (rootObj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -112,7 +109,6 @@ IdAssignment::init (int argc,
CORBA::Object_var obj = rootNC->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (obj.in ()))
{
@@ -126,12 +122,11 @@ IdAssignment::init (int argc,
obj.in()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
}
CosNotifyChannelAdmin::ChannelID
-IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+IdAssignment::create_ec (void)
{
CosNotifyChannelAdmin::ChannelID id;
CosNotification::QoSProperties initial_qos;
@@ -141,7 +136,6 @@ IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL)
initial_admin,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return id;
}
@@ -155,7 +149,6 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
this->notify_factory_->get_event_channel (id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (ec.in()))
{
@@ -164,8 +157,7 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
return;
}
- ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->destroy ();
}
CosNotifyChannelAdmin::AdminID
@@ -180,7 +172,6 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
this->notify_factory_->get_event_channel (channel_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (CORBA::is_nil (ec.in ()))
{
@@ -193,7 +184,6 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
ec->new_for_suppliers (ifgop,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (CORBA::is_nil (supplier_admin.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -218,7 +208,6 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
this->notify_factory_->get_event_channel (channel_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (CORBA::is_nil (ec.in ()))
{
@@ -231,7 +220,6 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
ec->new_for_consumers (ifgop,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (CORBA::is_nil (consumer_admin.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -256,7 +244,6 @@ IdAssignment::destroy_consumer_admin (
this->notify_factory_->get_event_channel (channel_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (ec.in ()))
{
@@ -268,7 +255,6 @@ IdAssignment::destroy_consumer_admin (
CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
ec->get_consumeradmin (admin_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (consumer_admin.in()))
{
@@ -276,8 +262,7 @@ IdAssignment::destroy_consumer_admin (
" (%P|%t) Unable to get consumer admin\n"));
}
- consumer_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer_admin->destroy ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG,
@@ -296,7 +281,6 @@ IdAssignment::destroy_supplier_admin (
this->notify_factory_->get_event_channel (channel_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (ec.in ()))
{
@@ -307,14 +291,12 @@ IdAssignment::destroy_supplier_admin (
CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
ec->get_supplieradmin (admin_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (supplier_admin.in ()))
ACE_ERROR ((LM_ERROR,
" (%P|%t) Unable to get supplier admin\n"));
- supplier_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier_admin->destroy ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG,
@@ -322,7 +304,7 @@ IdAssignment::destroy_supplier_admin (
}
void
-IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
+IdAssignment::run_test(void)
{
CosNotifyChannelAdmin::ChannelID* ec_id = 0;
ACE_NEW (ec_id,
@@ -346,8 +328,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
{
- ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_id[ec_count] = this->create_ec ();
// Connect <consumer_admin_count_> number of consumers
// to the current ec.
@@ -358,7 +339,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
consumer_admin_id [cons_count] =
this->create_consumer_admin (ec_id [ec_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Connect <supplier_admin_count_> number of suppliers
@@ -370,7 +350,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
supplier_admin_id [supp_count] =
this->create_supplier_admin (ec_id [ec_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -379,7 +358,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
{
this->destroy_ec (ec_id[ec_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
} // for
@@ -393,8 +371,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
{
- ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec_id[ec_count] = this->create_ec ();
int cons_count, supp_count;
// Connect <consumer_admin_count_> number of consumers
@@ -406,7 +383,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
consumer_admin_id[cons_count] =
this->create_consumer_admin (ec_id[ec_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Connect <supplier_admin_count_> number of suppliers
@@ -416,7 +392,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
supplier_admin_id[supp_count] =
this->create_supplier_admin (ec_id[ec_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Destroy the admins.
@@ -429,7 +404,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
this->destroy_consumer_admin (ec_id[ec_count],
consumer_admin_id[cons_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// Destroy supplier admins
@@ -440,7 +414,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
this->destroy_supplier_admin (ec_id[ec_count],
supplier_admin_id[supp_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -450,7 +423,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
{
this->destroy_ec (ec_id[ec_count]
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
} // for
@@ -471,10 +443,8 @@ int main (int argc, char* argv[])
test.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test.run_test ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 7b4a7e3920f..77506312d60 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -29,10 +29,10 @@ public:
void init (int argc,
char *argv[]
ACE_ENV_ARG_DECL);
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
private:
- CosNotifyChannelAdmin::ChannelID create_ec (ACE_ENV_SINGLE_ARG_DECL);
+ CosNotifyChannelAdmin::ChannelID create_ec (void);
void destroy_ec (CosNotifyChannelAdmin::ChannelID id
ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 0bb420600c7..d6c97bdd122 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -69,12 +69,10 @@ LifeCycle::init (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var rootObj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (rootObj.in ()))
{
@@ -86,7 +84,6 @@ LifeCycle::init (int argc,
CosNaming::NamingContext_var rootNC =
CosNaming::NamingContext::_narrow (rootObj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::Name name (1);
name.length (1);
@@ -94,14 +91,12 @@ LifeCycle::init (int argc,
CORBA::Object_var obj = rootNC->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
notify_factory_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
obj.in()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
if (CORBA::is_nil (notify_factory_.in ()))
{
@@ -113,32 +108,26 @@ LifeCycle::init (int argc,
}
void
-LifeCycle::run_test(ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::run_test(void)
{
for (int i = 0; i < this->count_; ++i)
{
- this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->create_ec ();
- this->create_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->create_supplier_admin ();
- this->create_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->create_consumer_admin ();
- this->destroy_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_consumer_admin ();
- this->destroy_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_supplier_admin ();
- this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->destroy_ec ();
}
}
void
-LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::create_ec (void)
{
CosNotifyChannelAdmin::ChannelID id;
CosNotification::QoSProperties initial_qos;
@@ -148,7 +137,6 @@ LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL)
initial_admin,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (ec_.in ())) {
ACE_ERROR ((LM_ERROR,
@@ -162,7 +150,7 @@ LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL)
}
void
-LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::create_supplier_admin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
@@ -171,7 +159,6 @@ LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
supplier_admin_ = this->ec_->new_for_suppliers (ifgop,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (supplier_admin_.in ()))
{
@@ -186,14 +173,13 @@ LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
}
void
-LifeCycle::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::create_consumer_admin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
CosNotifyChannelAdmin::OR_OP;
consumer_admin_ = ec_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (consumer_admin_.in()))
{
@@ -208,10 +194,9 @@ LifeCycle::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
}
void
-LifeCycle::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::destroy_supplier_admin (void)
{
- this->supplier_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->supplier_admin_->destroy ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG,
@@ -219,10 +204,9 @@ LifeCycle::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
}
void
-LifeCycle::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::destroy_consumer_admin (void)
{
- this->consumer_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->consumer_admin_->destroy ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG,
@@ -230,10 +214,9 @@ LifeCycle::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
}
void
-LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::destroy_ec (void)
{
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->destroy ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG,
@@ -255,10 +238,8 @@ main (int argc, char *argv[])
test.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test.run_test ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
index 94a2869641b..e3c7c60af8c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -25,17 +25,17 @@ public:
void init (int argc,
char *argv[]
ACE_ENV_ARG_DECL);
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
int parse_args (int argc,
char *argv[]);
private:
- void create_ec (ACE_ENV_SINGLE_ARG_DECL);
- void create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
- void create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
- void destroy_ec (ACE_ENV_SINGLE_ARG_DECL);
- void destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
- void destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
+ void create_ec (void);
+ void create_supplier_admin (void);
+ void create_consumer_admin (void);
+ void destroy_ec (void);
+ void destroy_supplier_admin (void);
+ void destroy_consumer_admin (void);
CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index f8bb9dd472a..2e248a84c05 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -99,8 +99,7 @@ MultiTypes::on_received_event (MultiTypes_PushConsumer* consumer)
if (disconnect_on_last_event_ == 1)
{
- consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->disconnect ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "PushConsumer has been disconnected.\n"));
consumer = 0;
@@ -119,8 +118,7 @@ MultiTypes::on_received_event (MultiTypes_StructuredPushConsumer* consumer)
if (disconnect_on_last_event_ == 1)
{
- consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->disconnect ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer has been disconnected.\n"));
consumer = 0;
@@ -139,8 +137,7 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
if (disconnect_on_last_event_ == 1)
{
- consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->disconnect ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer has been disconnected.\n"));
@@ -157,11 +154,9 @@ MultiTypes::init (int argc,
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);;
// Create all participants.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
@@ -169,7 +164,6 @@ MultiTypes::init (int argc,
ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);;
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -177,7 +171,6 @@ MultiTypes::init (int argc,
ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -192,42 +185,30 @@ MultiTypes::init (int argc,
// Init and connect all consumers.
structured_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
structured_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
any_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
any_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
sequence_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
sequence_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Init and connect all suppliers.
any_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
any_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
structured_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
structured_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
sequence_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
sequence_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer_start( 0 );
@@ -242,7 +223,7 @@ MultiTypes::parse_args(int, char **)
}
void
-MultiTypes::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+MultiTypes::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -250,13 +231,12 @@ MultiTypes::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
+MultiTypes::run_test (void)
{
// Send an Any, all consumers should receive it.
CORBA::Any any;
@@ -265,7 +245,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Sending Any Event..\n"));
any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -287,7 +266,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Sending Structured Event..\n"));
structured_supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -315,7 +293,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Sending Sequence Event..\n"));
sequence_supplier_->send_events (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 2 events..\n"));
@@ -333,7 +310,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Sending LAST Any Event, Consumers will attempt disconnect..\n"));
any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -360,7 +336,7 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer)
}
void
-MultiTypes::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MultiTypes::end_test (void)
{
consumer_done( 0 );
}
@@ -370,8 +346,7 @@ MultiTypes::check_results (void)
{
// Destroy the channel.
ACE_DECLARE_NEW_CORBA_ENV;
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->destroy ();
return 0;
}
@@ -393,13 +368,10 @@ main (int argc, char* argv[])
client.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.run_test ();
- client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.end_test ();
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index ac2701e61b8..5ce121020b8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -112,10 +112,10 @@ public:
ACE_ENV_ARG_DECL);
// initialization.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
- void end_test (ACE_ENV_SINGLE_ARG_DECL);
+ void end_test (void);
// End the test.
int check_results (void);
@@ -125,7 +125,7 @@ protected:
// Wait to receive events.
void wait_for_all_consumers (int expected_count_per_consumer);
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC.
CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 7842be55e57..dfd1065d18f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -84,11 +84,9 @@ Sequence::init (int argc,
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create all participents.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
@@ -96,7 +94,6 @@ Sequence::init (int argc,
this->ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -104,7 +101,6 @@ Sequence::init (int argc,
this->ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -113,10 +109,8 @@ Sequence::init (int argc,
-1);
this->consumer_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->consumer_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNotification::QoSProperties properties (3);
properties.length (3);
@@ -135,11 +129,9 @@ Sequence::init (int argc,
-1);
this->supplier_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->supplier_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer_start( 0 );
@@ -212,7 +204,7 @@ Sequence::parse_args (int argc,
}
void
-Sequence::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Sequence::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -220,7 +212,6 @@ Sequence::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->ec_.in ()));
}
@@ -235,13 +226,12 @@ Sequence::on_event_received (void)
if (this->events_received_.value () == this->event_count_)
{
ACE_DECLARE_NEW_CORBA_ENV;
- this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->end_test ();
}
}
void
-Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Sequence::run_test (void)
{
// operations:
CosNotification::StructuredEvent event;
@@ -303,7 +293,6 @@ Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL)
this->supplier_->send_events (batch
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// reset
batch.length (this->supplier_batch_size_);
@@ -318,13 +307,12 @@ Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL)
this->supplier_->send_events (batch
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-Sequence::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Sequence::end_test (void)
{
consumer_done( 0 );
}
@@ -334,8 +322,7 @@ Sequence::check_results (void)
{
// Destroy the channel.
ACE_DECLARE_NEW_CORBA_ENV;
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->destroy ();
if (this->events_received_.value () == this->event_count_)
{
@@ -368,13 +355,10 @@ main (int argc, char* argv[])
events.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ events.run_test ();
events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 5a8e1138f3b..03b4806efa1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -82,17 +82,17 @@ public:
void on_event_received (void);
// Called when an event is received.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
- void end_test (ACE_ENV_SINGLE_ARG_DECL);
+ void end_test (void);
// End the test.
int check_results (void);
// check if we got the expected results.
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC
int event_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index fd0dffb4620..8097219f16c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -62,11 +62,9 @@ Simple_Test::init (int argc,
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create all participents.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
@@ -74,7 +72,6 @@ Simple_Test::init (int argc,
this->ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -82,7 +79,6 @@ Simple_Test::init (int argc,
this->ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -91,10 +87,8 @@ Simple_Test::init (int argc,
-1);
this->consumer_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->consumer_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
Event_AnyPushConsumer* consumer2;
ACE_NEW_RETURN (consumer2,
@@ -102,21 +96,17 @@ Simple_Test::init (int argc,
-1);
consumer2->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer2->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_NEW_RETURN (this->supplier_,
Event_AnyPushSupplier (this),
-1);
this->supplier_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->supplier_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer_start( 0 );
@@ -161,7 +151,7 @@ Simple_Test::parse_args (int argc,
}
void
-Simple_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Test::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -169,7 +159,6 @@ Simple_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
@@ -187,13 +176,12 @@ Simple_Test::on_event_received (void)
if (this->result_count_ == 2 * this->event_count_)
{
ACE_DECLARE_NEW_CORBA_ENV;
- this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->end_test ();
}
}
void
-Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Test::run_test (void)
{
CORBA::Any data;
@@ -203,12 +191,11 @@ Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
this->supplier_->send_event (data
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-Simple_Test::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Test::end_test (void)
{
consumer_done( 0 );
}
@@ -218,8 +205,7 @@ Simple_Test::check_results (void)
{
// Destroy the channel
ACE_DECLARE_NEW_CORBA_ENV;
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->ec_->destroy ();
if (this->result_count_ == 2 * this->event_count_)
{
@@ -252,13 +238,10 @@ main (int argc, char* argv[])
events.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ events.run_test ();
events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index a941fcfb027..b4ce9ede15f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -82,17 +82,17 @@ public:
void on_event_received (void);
// Called when an event is received.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
- void end_test (ACE_ENV_SINGLE_ARG_DECL);
+ void end_test (void);
// End the test.
int check_results (void);
// check if we got the expected results.
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC
ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 3933aaa37a1..90e572856b7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -73,11 +73,9 @@ Updates::init (int argc,
Notify_Test_Client::init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Create all participents.
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
@@ -85,7 +83,6 @@ Updates::init (int argc,
ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -93,7 +90,6 @@ Updates::init (int argc,
ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -102,28 +98,24 @@ Updates::init (int argc,
-1);
consumer_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumer_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_NEW_RETURN (supplier_,
Updates_StructuredPushSupplier (this),
-1);
supplier_->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
supplier_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
void
-Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Updates::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -131,7 +123,6 @@ Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL)
initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
@@ -198,22 +189,20 @@ Updates::reset_counts (void)
}
void
-Updates::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Updates::run_test (void)
{
- this->test_subscription_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->test_subscription_change ();
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "Finished testing subscription_change!\n"));
- this->test_offer_change (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->test_offer_change ();
ACE_DEBUG ((LM_DEBUG, "Updates test has run successfully!\n"));
}
void
-Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
+Updates::test_subscription_change (void)
{
{
// reset counts.
@@ -244,7 +233,6 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
removed
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
this->wait_for_updates (3, 0); // The supplier should receive Added (RED, GREEN, BLUE)
@@ -282,7 +270,6 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
removed
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
this->wait_for_updates (1, 0); // The supplier should receive Added (PURPLE).
@@ -318,7 +305,6 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
removed
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
this->wait_for_updates (0, 4);
// The supplier should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
@@ -337,7 +323,7 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
+Updates::test_offer_change (void)
{
{
// reset counts.
@@ -368,7 +354,6 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
removed
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
this->wait_for_updates (3, 0); // The consumer should receive Added (RED, GREEN, BLUE)
@@ -406,7 +391,6 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
removed
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
this->wait_for_updates (1, 0); // The consumer should receive Added (PURPLE).
@@ -442,7 +426,6 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
removed
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
this->wait_for_updates (0, 4);
// The consumer should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
@@ -472,10 +455,8 @@ main (int argc, char* argv[])
updates.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- updates.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ updates.run_test ();
}
ACE_CATCH (CORBA::SystemException, se)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index e4c7104f9bf..9e6e2d89b84 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -81,7 +81,7 @@ public:
int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
// initialization.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
/// print_event_types
@@ -94,17 +94,17 @@ public:
void wait_for_updates (int expected_added, int expected_removed);
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create EC
/// Helper to add types.
void add_type (CosNotification::EventTypeSeq& type_seq, const char* type);
// test subscription_change
- void test_subscription_change (ACE_ENV_SINGLE_ARG_DECL);
+ void test_subscription_change (void);
// test offer_change
- void test_offer_change (ACE_ENV_SINGLE_ARG_DECL);
+ void test_offer_change (void);
/// Reset the counts.
void reset_counts (void);
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 3e7c1986bb9..a331251bff0 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -31,20 +31,17 @@ Notify_Structured_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties (2);
properties.length (2);
@@ -73,11 +70,9 @@ Notify_Structured_Push_Consumer::_connect (
this->proxy_->set_qos (properties);
this->proxy_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index c1ef387256c..f6ae74bdfe1 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -80,7 +80,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -100,10 +99,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
*client),
CORBA::NO_MEMORY ());
consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// ******************************************************************
@@ -118,49 +115,39 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status != 0)
ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sig.in ()))
ACE_ERROR_RETURN ((LM_ERROR, "Error: Narrow failed.\n"),1);
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (admin.in ()))
ACE_ERROR_RETURN ((LM_ERROR, "Error: nil ConsumerAdmin.\n"),1);
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
-
- client.ORB_run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+ client.ORB_run ();
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_1->disconnect();
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
}
ACE_CATCH (CORBA::Exception, e)
{
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 8097361c468..61dc86833e9 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -40,13 +40,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -120,7 +120,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -142,7 +141,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
ACE_TRY_NEW_ENV
{
supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -162,10 +160,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -181,24 +177,20 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
// Activate the signaler with the POA
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -219,7 +211,6 @@ int main (int argc, char* argv[])
if (!CORBA::is_nil (admin.in ()))
{
create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -228,7 +219,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendEvent (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
@@ -236,11 +226,9 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_1->disconnect();
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index 09944124843..014e77822a6 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -12,7 +12,6 @@ ACE_TMAIN (int argc, char *argv[])
// Initialize the base class.
Notify_Test_Client client;
client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory ();
@@ -20,8 +19,7 @@ ACE_TMAIN (int argc, char *argv[])
ACE_DEBUG((LM_DEBUG, "Destroying ECF...\n"));
- ecf_ext->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ecf_ext->destroy ();
ACE_DEBUG((LM_DEBUG, "ECF destroyed.\n"));
}
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 4a34581b4f4..45fcfbd5e78 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -46,20 +46,17 @@ Notify_Sequence_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::SequencePushConsumer_var consumer =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties (4);
properties.length (4);
@@ -78,11 +75,9 @@ Notify_Sequence_Push_Consumer::_connect (
this->proxy_->set_qos (properties);
this->proxy_->connect_sequence_push_consumer (consumer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index f107177b9d5..e119d4728d0 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -30,20 +30,17 @@ Notify_Structured_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties (2);
properties.length (2);
@@ -55,11 +52,9 @@ Notify_Structured_Push_Consumer::_connect (
this->proxy_->set_qos (properties);
this->proxy_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index d357454f33d..2da610b8bb1 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -106,7 +106,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -123,10 +122,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// ******************************************************************
@@ -141,46 +138,36 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (sig.in ()));
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
-
+
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_1->disconnect();
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
}
ACE_CATCH (CORBA::Exception, e)
{
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 95d08daca21..3bb8d6146fc 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -53,13 +53,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -145,7 +145,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -182,7 +181,6 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL)
events[i] = event;
}
supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
static void
@@ -196,10 +194,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -215,13 +211,11 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (use_deadline_ordering)
{
@@ -233,12 +227,10 @@ int main (int argc, char* argv[])
}
sig_impl.reset( new sig_i( client.orb() ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
client.orb()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -253,7 +245,6 @@ int main (int argc, char* argv[])
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -262,7 +253,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendBatch (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
@@ -270,11 +260,9 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_1->disconnect();
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
ACE_CATCH (CORBA::Exception, e)
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index b457324f6ed..ad1ca25b5d8 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -95,7 +95,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -117,10 +116,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
*client),
CORBA::NO_MEMORY ());
consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// ******************************************************************
@@ -135,21 +132,17 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sig.in ()))
{
@@ -161,27 +154,21 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (admin.in ()))
{
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
-
+
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_1->disconnect();
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 9fee28c5c34..59c61f643f6 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -44,13 +44,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -136,7 +136,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -177,10 +176,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -196,13 +193,11 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (use_deadline_ordering)
{
@@ -214,15 +209,13 @@ int main (int argc, char* argv[])
}
sig_impl.reset( new sig_i( client.orb() ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
{
CORBA::String_var ior =
client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
ACE_ASSERT (output_file != 0);
@@ -233,9 +226,8 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::SupplierAdmin_var admin =
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-
+
create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -244,7 +236,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendEvent (i + 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
@@ -252,11 +243,9 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_1->disconnect();
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
ACE_CATCH (CORBA::Exception, e)
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index 1ad6142c0d4..81ded8db860 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -11,15 +11,13 @@ ACE_TMAIN (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result == -1)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT("Failed to initialize the Notify Testing Driver.\n")),
1);
- driver.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ driver.run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 851210f4877..28a4cc23c25 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -80,7 +80,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -104,20 +103,17 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumers[ i ]->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumers[ i ]->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
static void
-disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+disconnect_consumers (void)
{
for (unsigned int i = 0; i < consumer_count; i++)
{
- consumers[ i ]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumers[ i ]->disconnect ();
}
}
@@ -133,20 +129,16 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var object =
client.orb ()->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sig.in ()))
{
@@ -158,26 +150,20 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (admin.in ()))
{
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
- disconnect_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ disconnect_consumers();
ACE_DEBUG ((LM_DEBUG, "Consumer done.\n"));
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 4612ff106bf..9632f3db7bb 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -41,13 +41,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -130,7 +130,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -151,7 +150,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
for (unsigned int i = 0; i < supplier_count; i++)
{
suppliers[i]->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
ACE_CATCH (CORBA::Exception, e)
@@ -173,20 +171,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
suppliers[i]->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
suppliers[i]->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
static void
-disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+disconnect_suppliers (void)
{
for (unsigned int i = 0; i < supplier_count; ++i)
{
- suppliers[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ suppliers[i]->disconnect ();
}
}
@@ -201,23 +196,19 @@ int main (int argc, char* argv[])
{
Consumer_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ior_output_file != 0)
{
@@ -236,7 +227,6 @@ int main (int argc, char* argv[])
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_suppliers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -245,7 +235,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendEvent (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nEach Supplier sent %d events.\n", event_count));
@@ -253,11 +242,9 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- disconnect_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ disconnect_suppliers();
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index d8cb3fe8a76..a03e57d5a89 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -34,20 +34,17 @@ Notify_Sequence_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::SequencePushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties (3);
properties.length (3);
@@ -67,11 +64,9 @@ Notify_Sequence_Push_Consumer::_connect (
this->proxy_->set_qos (properties);
this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index d8e9f5a6552..59e0dc6c578 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -35,20 +35,17 @@ Notify_Structured_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (use_ordering_)
{
@@ -62,11 +59,9 @@ Notify_Structured_Push_Consumer::_connect (
this->proxy_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
@@ -90,7 +85,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
{
ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: too many events received.\n")));
}
-
+
if (this->count_ >= this->expected_)
{
this->client_.consumer_done (this);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 79f44545167..425c1c17145 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -101,7 +101,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -121,10 +120,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char* argv[])
@@ -134,44 +131,34 @@ int main (int argc, char* argv[])
Consumer_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (sig.in ()));
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_1->disconnect();
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index c1d572de8c2..35cf3d385a5 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -30,13 +30,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -141,7 +141,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -176,7 +175,6 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL)
events[i] = event;
}
supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
static void
@@ -189,10 +187,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -207,30 +203,25 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotification::QoSProperties qos (1);
qos.length (1);
qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
qos[0].value <<= order_policy;
ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ior_output_file != 0)
{
@@ -249,7 +240,6 @@ int main (int argc, char* argv[])
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -258,7 +248,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendBatch (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
@@ -266,11 +255,9 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_1->disconnect();
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index d86df34f06b..73a8b9e7d8c 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -97,7 +97,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -116,10 +115,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
*client),
CORBA::NO_MEMORY ());
consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char* argv[])
@@ -129,45 +126,35 @@ int main (int argc, char* argv[])
Consumer_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (sig.in ()));
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ consumer_1->disconnect();
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index bda45d89f6c..9920f3ca97b 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -29,13 +29,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -143,7 +143,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -171,7 +170,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
ACE_TRY_NEW_ENV
{
supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -191,10 +189,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char* argv[])
@@ -204,30 +200,25 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotification::QoSProperties qos (1);
qos.length (1);
qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
qos[0].value <<= order_policy;
ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (ior_output_file != 0)
{
@@ -246,7 +237,6 @@ int main (int argc, char* argv[])
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
ACE_ASSERT(!CORBA::is_nil (admin.in ()));
create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -255,7 +245,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendEvent (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
@@ -263,11 +252,9 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ supplier_1->disconnect();
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index 7bb9c0d3801..1f1757b255d 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -16,11 +16,10 @@ TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Comman
}
void
-TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Application_Command::handle_init (void)
{
// Call the Base class.
- TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Notify_Tests_Application_Command::handle_init ();
CORBA::ORB_var orb;
@@ -29,7 +28,6 @@ TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
TAO_Notify_Tests_RT_Priority_Mapping* mapping = new TAO_Notify_Tests_RT_Priority_Mapping ();
mapping->init (orb.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
LOOKUP_MANAGER->_register (mapping);
}
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
index 34376e99515..88493add5f7 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
@@ -36,7 +36,7 @@ public:
/// Destructor
~TAO_Notify_Tests_RT_Application_Command ();
- virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void handle_init (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 4d9aa177a6c..e6595fc4225 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -177,7 +177,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
}
void
-TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_POA_Command::execute_i (void)
{
if (this->command_ == CREATE)
{
@@ -190,12 +190,10 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var object =
orb->resolve_initial_references ("RTORB"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::RTORB_var rt_orb =
RTCORBA::RTORB::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve parent poa.
PortableServer::POA_var parent_poa;
@@ -204,7 +202,6 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
// Create the POA.
this->create (rt_orb.in (), parent_poa.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "Created RT POA %s\n", this->POA_name_.c_str ()));
}
@@ -213,10 +210,8 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::POA_var poa;
LOOKUP_MANAGER->resolve (poa, this->POA_name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->destroy (1,0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "Destroyed RT POA %s\n", this->POA_name_.c_str ()));
}
@@ -255,7 +250,6 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
rt_orb->create_priority_model_policy (priority_model_,
server_priority_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (lanes_.length () != 0)
{
@@ -277,14 +271,12 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
max_buffered_requests,
max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create a thread-pool policy.
lanes_policy =
rt_orb->create_threadpool_policy (threadpool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else if (thread_pool_static_threads_ > 0)
@@ -307,12 +299,10 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
max_buffered_requests,
max_request_buffer_size
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
thread_pool_policy =
rt_orb->create_threadpool_policy (threadpool_id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (bands_.length () != 0)
@@ -321,14 +311,12 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
bands_policy =
rt_orb->create_priority_banded_connection_policy (this->bands_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
CORBA::PolicyList poa_policy_list;
CORBA::Policy_var activation_policy =
parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0)
{
@@ -379,12 +367,10 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
// Get the POA Manager.
PortableServer::POAManager_var poa_manager =
- parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ parent_poa->the_POAManager ();
parent_poa->create_POA (POA_name_.c_str (),
poa_manager.in (),
poa_policy_list
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index b5bcb27a825..bdebc7806cc 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -45,7 +45,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Get the command name.
virtual const char* get_name (void);
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index ee30db74bd1..4d81fcdc42f 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -15,12 +15,10 @@ TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
RTCORBA::PriorityMappingManager_var mapping_manager =
RTCORBA::PriorityMappingManager::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->priority_mapping_ = mapping_manager->mapping ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 43acfd70c38..36199f3cbd9 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -159,7 +159,6 @@ StructuredPushConsumer_i::push_structured_event (
static_cast<int>(this->received_)
));
ACE_THROW (CORBA::UNKNOWN());
- ACE_CHECK;
}
if (notification.filterable_data.length () > 0)
{
@@ -393,7 +392,6 @@ SequencePushConsumer_i::push_structured_events (
static_cast<int>(nevent + 1)
));
ACE_THROW (CORBA::UNKNOWN());
- ACE_CHECK;
}
const CosNotification::StructuredEvent & notification = notifications[nevent];
if (notification.filterable_data.length () > 0)
@@ -605,7 +603,6 @@ AnyPushConsumer_i::push (
static_cast<int>(this->received_)
));
ACE_THROW (CORBA::UNKNOWN());
- ACE_CHECK;
}
CORBA::ULong seq = 0;
if (data >>= seq)
@@ -701,11 +698,9 @@ ReconnectionCallback_i::reconnect (
ACE_TEXT ("(%P|%t) Consumer received reconnection request\n")
));
this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (this->ecf_.in ()))
{
this->consumer_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->reconnect_count_ += 1;
}
else
@@ -717,7 +712,7 @@ ReconnectionCallback_i::reconnect (
}
CORBA::Boolean
-ReconnectionCallback_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReconnectionCallback_i::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::Boolean (1);
@@ -733,16 +728,14 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
void
-ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ReconnectionCallback_i::fini (void)
{
if (this->id_is_valid_)
{
NotifyExt::ReconnectionRegistry_var registry =
NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->id_is_valid_ = false;
}
}
@@ -756,22 +749,17 @@ ReconnectionCallback_i::init (
this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf);
PortableServer::ObjectId_var reconnection_callback_id =
poa->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
NotifyExt::ReconnectionCallback_var callback =
NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
NotifyExt::ReconnectionRegistry_var registry =
NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->id_is_valid_ = true;
}
@@ -918,7 +906,6 @@ void Consumer_Main::usage(FILE * out)const
int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
{
this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (0 != this->parse_args(argc, argv))
{
@@ -928,7 +915,6 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object))
{
@@ -939,24 +925,19 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->root_poa_ =
PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
if (this->use_naming_service_ )
{
- this->find_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->find_notify_factory ();
}
else
{
- int ok = resolve_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int ok = resolve_notify_factory ();
if (!ok)
{
return -1;
@@ -965,11 +946,9 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->reconnecting_ = load_ids ();
- init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_event_channel ();
- init_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_consumer_admin ();
switch (this->mode_)
{
@@ -984,8 +963,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
));
}
this->structured_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_);
- init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_structured_proxy_supplier ();
break;
}
case MODE_SEQUENCE:
@@ -999,8 +977,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
));
}
this->sequence_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_);
- init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_sequence_proxy_supplier ();
break;
}
case MODE_ANY:
@@ -1014,8 +991,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
));
}
this->any_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_);
- init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_any_proxy_supplier ();
break;
}
default:
@@ -1031,7 +1007,6 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->root_poa_.in (),
this->ecf_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
save_ids ();
return 0;
@@ -1136,32 +1111,27 @@ Consumer_Main::reconnect (
}
this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory);
this->reconnecting_ = true;
- init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_event_channel ();
- init_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_consumer_admin ();
switch (this->mode_)
{
case MODE_STRUCTURED:
{
- init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_structured_proxy_supplier ();
break;
}
case MODE_SEQUENCE:
{
- init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_sequence_proxy_supplier ();
break;
}
case MODE_ANY :
{
- init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_any_proxy_supplier ();
break;
}
}
@@ -1175,7 +1145,7 @@ Consumer_Main::reconnect (
int
-Consumer_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::resolve_naming_service (void)
{
// ignore redundant calls
if (CORBA::is_nil (this->naming_context_.in ()))
@@ -1183,22 +1153,19 @@ Consumer_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
return !CORBA::is_nil (this->naming_context_.in ());
}
int
-Consumer_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::find_notify_factory (void)
{
- int status = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ int status = this->resolve_naming_service ();
if (status)
{
CosNaming::Name name (1);
@@ -1208,36 +1175,32 @@ Consumer_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->ecf_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
obj.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN(0);
}
return ! CORBA::is_nil (this->ecf_.in ());
}
int
-Consumer_Main::resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::resolve_notify_factory (void)
{
CORBA::Object_var factory_obj =
this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->ecf_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
factory_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
return ! CORBA::is_nil (this->ecf_.in ());
}
void
-Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_event_channel (void)
{
bool ok = false;
if (this->reconnecting_)
@@ -1247,7 +1210,6 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
this->ec_ = this->ecf_->get_event_channel (
this->ec_id_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (this->ec_.in ());
if (ok && this->verbose_)
{
@@ -1345,7 +1307,6 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
adminprops,
this->ec_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (ec_.in ());
if (ok && this->verbose_)
{
@@ -1371,7 +1332,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
void
-Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_consumer_admin (void)
{
bool ok = false;
if (this->reconnecting_)
@@ -1380,7 +1341,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY_EX(TWO)
{
- this->sa_ = this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->sa_ = this->ec_->default_consumer_admin ();
ACE_TRY_CHECK_EX(TWO);
ok = ! CORBA::is_nil (this->sa_.in ());
this->sa_id_ = default_admin_id;
@@ -1429,7 +1390,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY_EX(THREE)
{
- this->sa_ = this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->sa_ = this->ec_->default_consumer_admin ();
ACE_TRY_CHECK_EX(THREE);
ok = ! CORBA::is_nil (this->sa_.in ());
this->sa_id_ = default_admin_id;
@@ -1457,7 +1418,6 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::OR_OP,
this->sa_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (this->sa_.in ());
#ifdef TEST_SET_QOS
@@ -1474,7 +1434,6 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much
qosprops.length(i);
this->sa_->set_qos (qosprops ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#endif
@@ -1496,7 +1455,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
}
}
void
-Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_structured_proxy_supplier (void)
{
bool ok = false;
CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1508,7 +1467,6 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
this->structured_proxy_id_
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -1530,7 +1488,6 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::STRUCTURED_EVENT,
this->structured_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -1542,7 +1499,6 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
}
this->structured_proxy_push_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (this->structured_proxy_push_supplier_.in ()))
{
@@ -1557,15 +1513,12 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var push_consumer_id =
this->root_poa_->activate_object (
&(this->structured_push_consumer_) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->structured_push_consumer_ref_ =
CosNotifyComm::StructuredPushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (this->structured_push_consumer_ref_.in ()))
@@ -1580,12 +1533,11 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
this->structured_proxy_push_supplier_->connect_structured_push_consumer (
this->structured_push_consumer_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->structured_push_consumer_.set_connected(true);
}
void
-Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_sequence_proxy_supplier (void)
{
bool ok = false;
CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1596,7 +1548,6 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
proxy = this->sa_->get_proxy_supplier(
this->sequence_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -1618,14 +1569,12 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::SEQUENCE_EVENT,
this->sequence_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
#ifdef TEST_SET_QOS
// temporary
if (ok)
{
set_proxy_qos (proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#endif // TEST_SET_QOS
if (ok && this->verbose_)
@@ -1638,7 +1587,6 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
}
this->sequence_proxy_push_supplier_ =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (this->sequence_proxy_push_supplier_.in ()))
{
@@ -1655,15 +1603,12 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var push_consumer_id =
this->root_poa_->activate_object (
&(this->sequence_push_consumer_) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sequence_push_consumer_ref_ =
CosNotifyComm::SequencePushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (this->sequence_push_consumer_ref_.in ()))
{
@@ -1677,7 +1622,6 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
this->sequence_proxy_push_supplier_->connect_sequence_push_consumer (
this->sequence_push_consumer_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sequence_push_consumer_.set_connected(true);
}
@@ -1698,11 +1642,10 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy
qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much
qosprops.length(i);
proxy->set_qos (qosprops ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_any_proxy_supplier (void)
{
bool ok = false;
CosNotifyChannelAdmin::ProxySupplier_var proxy;
@@ -1713,7 +1656,6 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
proxy = this->sa_->get_proxy_supplier(
this->any_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -1754,7 +1696,6 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::ANY_EVENT,
this->any_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
@@ -1767,7 +1708,6 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
}
this->any_proxy_push_supplier_ =
CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (this->any_proxy_push_supplier_.in ()))
{
@@ -1782,15 +1722,12 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var push_consumer_id =
this->root_poa_->activate_object (
&(this->any_push_consumer_) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->any_push_consumer_ref_ =
CosNotifyComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (this->any_push_consumer_ref_.in ()))
@@ -1804,33 +1741,28 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
this->any_proxy_push_supplier_->connect_any_push_consumer (
this->any_push_consumer_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->any_push_consumer_.set_connected(true);
}
-int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
+int Consumer_Main::fini (void)
{
- this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
-
+ this->reconnection_callback_.fini ();
+
if (this->disconnect_on_exit_)
{
if (!CORBA::is_nil (this->structured_proxy_push_supplier_.in ()))
{
- this->structured_proxy_push_supplier_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->structured_proxy_push_supplier_->disconnect_structured_push_supplier ();
}
if (!CORBA::is_nil (this->sequence_proxy_push_supplier_.in ()))
{
- this->sequence_proxy_push_supplier_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->sequence_proxy_push_supplier_->disconnect_sequence_push_supplier ();
}
if (!CORBA::is_nil (this->any_proxy_push_supplier_.in ()))
{
- this->any_proxy_push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->any_proxy_push_supplier_->disconnect_push_supplier ();
}
if (!CORBA::is_nil (this->sa_.in ()) && this->sa_id_ != default_admin_id)
{
@@ -1849,7 +1781,7 @@ int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
}
-int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL)
+int Consumer_Main::run (void)
{
int result = 0;
@@ -1860,7 +1792,6 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_Time_Value tv(0, 100 * 1000);
this->orb_->run(tv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
}
// see if consumers detected errors
@@ -1885,13 +1816,11 @@ main (int argc, char *argv[])
if (result == 0)
{
- result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = app.run ();
}
if (result == 0)
{
- app.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ app.fini ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index b6326ac31d7..3db09828745 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -174,7 +174,7 @@ public:
CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_
ACE_ENV_ARG_DECL);
- void fini (ACE_ENV_SINGLE_ARG_DECL);
+ void fini (void);
size_t reconnect_count () const;
@@ -183,7 +183,7 @@ public:
ACE_ENV_ARG_DECL
) ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -204,8 +204,8 @@ class Consumer_Main
int parse_single_arg (int argc, char *argv[]);
int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
- int run (ACE_ENV_SINGLE_ARG_DECL);
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
+ int fini (void);
void usage (FILE * log) const;
void reconnect (
@@ -215,19 +215,19 @@ class Consumer_Main
private:
/// Find naming service.
- int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ int resolve_naming_service (void);
/// Resolve the Notify factory from the Naming service.
- int find_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ int find_notify_factory (void);
/// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
- int resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ int resolve_notify_factory (void);
- void init_event_channel (ACE_ENV_SINGLE_ARG_DECL);
- void init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
- void init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL);
- void init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL);
- void init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL);
+ void init_event_channel (void);
+ void init_consumer_admin (void);
+ void init_structured_proxy_supplier (void);
+ void init_sequence_proxy_supplier (void);
+ void init_any_proxy_supplier (void);
void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 1bd46703440..8bb82aa7548 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -135,11 +135,9 @@ ReconnectionCallback_i::reconnect (
ACE_TEXT ("(%P|%t) Supplier received reconnection request\n")
));
this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (!CORBA::is_nil (this->ecf_.in ()))
{
this->supplier_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->reconnect_count_ += 1;
}
else
@@ -151,7 +149,7 @@ ReconnectionCallback_i::reconnect (
}
CORBA::Boolean
-ReconnectionCallback_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReconnectionCallback_i::is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::Boolean (1);
@@ -166,16 +164,14 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
void
-ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ReconnectionCallback_i::fini (void)
{
if (this->id_is_valid_)
{
NotifyExt::ReconnectionRegistry_var registry =
NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->id_is_valid_ = false;
}
}
@@ -189,22 +185,17 @@ ReconnectionCallback_i::init (
this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf);
PortableServer::ObjectId_var reconnection_callback_id =
poa->activate_object (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
NotifyExt::ReconnectionCallback_var callback =
NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
NotifyExt::ReconnectionRegistry_var registry =
NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->id_is_valid_ = true;
}
@@ -349,7 +340,6 @@ void Supplier_Main::usage(FILE * log)const
int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
{
this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (0 != this->parse_args(argc, argv))
{
@@ -359,7 +349,6 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object))
{
@@ -370,24 +359,19 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->root_poa_ =
PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
if (this->use_naming_service_ )
{
- this->find_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->find_notify_factory ();
}
else
{
- int ok = resolve_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int ok = resolve_notify_factory ();
if (!ok)
{
return -1;
@@ -396,31 +380,26 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->reconnecting_ = load_ids ();
- init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_event_channel ();
- init_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_supplier_admin ();
switch (this->mode_)
{
case MODE_STRUCTURED:
{
- init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_structured_proxy_consumer ();
break;
}
case MODE_SEQUENCE:
{
- init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_sequence_proxy_consumer ();
break;
}
case MODE_ANY:
{
- init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ init_any_proxy_consumer ();
break;
}
default:
@@ -435,7 +414,6 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
this->root_poa_.in (),
this->ecf_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
save_ids ();
return 0;
@@ -534,30 +512,25 @@ Supplier_Main::reconnect (
{
this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory);
this->reconnecting_ = true;
- init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_event_channel ();
- init_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_supplier_admin ();
switch (this->mode_)
{
case MODE_STRUCTURED:
{
- init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_structured_proxy_consumer ();
break;
}
case MODE_SEQUENCE:
{
- init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_sequence_proxy_consumer ();
break;
}
case MODE_ANY:
{
- init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ init_any_proxy_consumer ();
break;
}
}
@@ -565,7 +538,7 @@ Supplier_Main::reconnect (
int
-Supplier_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::resolve_naming_service (void)
{
// ignore redundant calls
if (CORBA::is_nil (this->naming_context_.in ()))
@@ -573,22 +546,19 @@ Supplier_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
}
return !CORBA::is_nil (this->naming_context_.in ());
}
int
-Supplier_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::find_notify_factory (void)
{
- int status = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ int status = this->resolve_naming_service ();
if (status)
{
CosNaming::Name name (1);
@@ -598,36 +568,32 @@ Supplier_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->ecf_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
obj.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN(0);
}
return ! CORBA::is_nil (this->ecf_.in ());
}
int
-Supplier_Main::resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::resolve_notify_factory (void)
{
CORBA::Object_var factory_obj =
this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
this->ecf_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
factory_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(0);
return ! CORBA::is_nil (this->ecf_.in ());
}
void
-Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_event_channel (void)
{
bool ok = false;
if (this->reconnecting_)
@@ -637,7 +603,6 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
this->ec_ = this->ecf_->get_event_channel (
this->ec_id_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (this->ec_.in ());
if (ok && this->verbose_)
{
@@ -735,7 +700,6 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
adminprops,
this->ec_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (ec_.in ());
if (ok && this->verbose_)
{
@@ -761,7 +725,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
void
-Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_supplier_admin (void)
{
bool ok = false;
if (this->reconnecting_ && this->sa_id_ != default_admin_id)
@@ -791,7 +755,7 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY_EX(TWO)
{
- this->sa_ = this->ec_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->sa_ = this->ec_->default_supplier_admin ();
ACE_TRY_CHECK_EX(TWO);
ok = ! CORBA::is_nil (this->sa_.in ());
this->sa_id_ = default_admin_id;
@@ -820,7 +784,6 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::OR_OP,
this->sa_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (this->sa_.in ());
if (ok && this->verbose_)
{
@@ -833,7 +796,7 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_structured_proxy_consumer (void)
{
bool ok = false;
CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -845,7 +808,6 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
this->structured_proxy_id_
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -867,7 +829,6 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::STRUCTURED_EVENT,
this->structured_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -879,7 +840,6 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
}
this->structured_proxy_push_consumer_ =
CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
{
@@ -893,15 +853,12 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var push_supplier_id =
this->root_poa_->activate_object (
&(this->structured_push_supplier_) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->structured_push_supplier_ref_ =
CosNotifyComm::StructuredPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (structured_push_supplier_ref_.in ()))
{
@@ -916,11 +873,10 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
this->structured_proxy_push_consumer_->connect_structured_push_supplier (
structured_push_supplier_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_sequence_proxy_consumer (void)
{
bool ok = false;
CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -931,7 +887,6 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
proxy = this->sa_->get_proxy_consumer(
this->sequence_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -953,7 +908,6 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::SEQUENCE_EVENT,
this->sequence_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -965,7 +919,6 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
}
this->sequence_proxy_push_consumer_ =
CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
{
@@ -981,15 +934,12 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var push_supplier_id =
this->root_poa_->activate_object (
&(this->sequence_push_supplier_) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->sequence_push_supplier_ref_ =
CosNotifyComm::SequencePushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (sequence_push_supplier_ref_.in ()))
{
@@ -1003,11 +953,10 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (
sequence_push_supplier_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_any_proxy_consumer (void)
{
bool ok = false;
CosNotifyChannelAdmin::ProxyConsumer_var proxy;
@@ -1018,7 +967,6 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
proxy = this->sa_->get_proxy_consumer(
this->any_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -1040,7 +988,6 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
CosNotifyChannelAdmin::ANY_EVENT,
this->any_proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ok = ! CORBA::is_nil (proxy.in ());
if (ok && this->verbose_)
{
@@ -1052,7 +999,6 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
}
this->any_proxy_push_consumer_ =
CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (this->any_proxy_push_consumer_.in ()))
{
@@ -1068,15 +1014,12 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::ObjectId_var push_supplier_id =
this->root_poa_->activate_object (
&(this->any_push_supplier_) ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_var obj =
this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->any_push_supplier_ref_ =
CosNotifyComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
if (CORBA::is_nil (any_push_supplier_ref_.in ()))
{
@@ -1090,15 +1033,13 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
this->any_proxy_push_consumer_->connect_any_push_supplier (
any_push_supplier_ref_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
+int Supplier_Main::fini (void)
{
if (this->disconnect_on_exit_)
{
- this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->reconnection_callback_.fini ();
if (!CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
{
if (this->verbose_)
@@ -1107,8 +1048,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("(%P|%t) Disconnecting structured\n")
));
}
- this->structured_proxy_push_consumer_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->structured_proxy_push_consumer_->disconnect_structured_push_consumer ();
}
if (!CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
{
@@ -1118,8 +1058,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("(%P|%t) Disconnecting sequence\n")
));
}
- this->sequence_proxy_push_consumer_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->sequence_proxy_push_consumer_->disconnect_sequence_push_consumer ();
}
if (!CORBA::is_nil (this->any_proxy_push_consumer_.in ()))
{
@@ -1129,8 +1068,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
ACE_TEXT ("(%P|%t) Disconnecting any\n")
));
}
- this->any_proxy_push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-4);
+ this->any_proxy_push_consumer_->disconnect_push_consumer ();
}
if (!CORBA::is_nil (this->sa_.in ()) && this->sa_id_ != default_admin_id)
{
@@ -1148,7 +1086,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
return 0;
}
-void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL)
+void Supplier_Main::send_structured_event (void)
{
CosNotification::StructuredEvent event;
@@ -1193,10 +1131,9 @@ void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL)
this->structured_proxy_push_consumer_->push_structured_event (event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL)
+void Supplier_Main::send_sequence_event (void)
{
CosNotification::EventBatch event_batch(1);
event_batch.length (1);
@@ -1243,10 +1180,9 @@ void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL)
this->sequence_proxy_push_consumer_->push_structured_events (event_batch
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL)
+void Supplier_Main::send_any_event (void)
{
CORBA::Any event;
event <<= CORBA::ULong (this->serial_number_);
@@ -1261,10 +1197,9 @@ void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL)
this->any_proxy_push_consumer_->push (event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
-int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
+int Supplier_Main::run (void)
{
int result = 0;
bool paused = false;
@@ -1316,20 +1251,17 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
{
case MODE_STRUCTURED:
{
- send_structured_event (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ send_structured_event ();
break;
}
case MODE_SEQUENCE:
{
- send_sequence_event (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ send_sequence_event ();
break;
}
case MODE_ANY:
{
- send_any_event (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ send_any_event ();
break;
}
}
@@ -1353,13 +1285,11 @@ main (int argc, char *argv[])
if (result == 0)
{
- result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ result = app.run ();
}
if (result == 0)
{
- app.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ app.fini ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index f429cf7892c..4e7659b35f3 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -86,7 +86,7 @@ public:
CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_
ACE_ENV_ARG_DECL);
- void fini (ACE_ENV_SINGLE_ARG_DECL);
+ void fini (void);
size_t reconnect_count () const;
@@ -95,7 +95,7 @@ public:
ACE_ENV_ARG_DECL
) ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CORBA::Boolean is_alive (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -116,8 +116,8 @@ class Supplier_Main
int parse_single_arg (int argc, char *argv[]);
int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
- int run (ACE_ENV_SINGLE_ARG_DECL);
- int fini (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
+ int fini (void);
void usage (FILE * log) const;
void reconnect (
@@ -127,24 +127,24 @@ class Supplier_Main
private:
/// Find naming service.
- int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ int resolve_naming_service (void);
/// Resolve the Notify factory from the Naming service.
- int find_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ int find_notify_factory (void);
/// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
- int resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ int resolve_notify_factory (void);
- void init_event_channel (ACE_ENV_SINGLE_ARG_DECL);
- void init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
- void init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL);
- void init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL);
- void init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL);
+ void init_event_channel (void);
+ void init_supplier_admin (void);
+ void init_structured_proxy_consumer (void);
+ void init_sequence_proxy_consumer (void);
+ void init_any_proxy_consumer (void);
/// send events.
- void send_structured_event (ACE_ENV_SINGLE_ARG_DECL);
- void send_sequence_event (ACE_ENV_SINGLE_ARG_DECL);
- void send_any_event (ACE_ENV_SINGLE_ARG_DECL);
+ void send_structured_event (void);
+ void send_sequence_event (void);
+ void send_any_event (void);
void save_ids();
bool load_ids();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 9a7df06e215..89e4f24aae5 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -29,20 +29,17 @@ Notify_Sequence_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::SequencePushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties (3);
properties.length (3);
@@ -53,11 +50,9 @@ Notify_Sequence_Push_Consumer::_connect (
this->proxy_->set_qos (properties);
this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index c59a53095fb..5409e3e29c7 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -79,15 +79,12 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CosNotifyFilter::FilterFactory_var ffact =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ec->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter ("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if(CORBA::is_nil(filter.in()))
{
@@ -104,7 +101,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
"$.enum < 0");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// apply filter
admin->add_filter (filter.in ());
@@ -128,10 +124,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// ******************************************************************
@@ -146,21 +140,17 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sig.in ()))
{
@@ -172,23 +162,18 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (admin.in ()))
{
create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+ sig->done ();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 483a7446f92..38a282be7f0 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -40,13 +40,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -121,7 +121,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -173,7 +172,6 @@ SendEvents (int id ACE_ENV_ARG_DECL)
ACE_TRY_NEW_ENV
{
supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -193,10 +191,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -212,23 +208,19 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -249,7 +241,6 @@ int main (int argc, char* argv[])
if (!CORBA::is_nil (admin.in ()))
{
create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -258,7 +249,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendEvents (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer...\n"));
@@ -268,8 +258,7 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index b39323d5890..d2b0eaf5979 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -34,20 +34,17 @@ Notify_Sequence_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::SequencePushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties(3);
properties.length(3);
@@ -59,11 +56,9 @@ Notify_Sequence_Push_Consumer::_connect (
proxy_->set_qos(properties);
proxy_->connect_sequence_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 5ac22e79b8b..190f715ac9b 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -84,7 +84,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
}
@@ -104,10 +103,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
*client),
CORBA::NO_MEMORY ());
consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
// ******************************************************************
@@ -121,38 +118,31 @@ int main (int argc, char* argv[])
Consumer_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(status == 0);
ACE_UNUSED_ARG(status);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (sig.in ()));
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (filter)
{
CosNotifyFilter::FilterFactory_var ffact =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(filter.in()));
@@ -163,25 +153,20 @@ int main (int argc, char* argv[])
constraint_list[0].constraint_expr = CORBA::string_dup(constraintString);
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
admin->add_filter(filter.in());
}
ACE_ASSERT (!CORBA::is_nil (admin.in ()));
create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
return 0;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 30c0a2e2b0d..aa77ad56994 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -42,13 +42,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -122,7 +122,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -174,7 +173,6 @@ SendEvents (int id ACE_ENV_ARG_DECL)
ACE_TRY_NEW_ENV
{
supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -194,10 +192,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -214,24 +210,20 @@ int main (int argc, char* argv[])
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -252,7 +244,6 @@ int main (int argc, char* argv[])
if (!CORBA::is_nil (admin.in ()))
{
create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -261,7 +252,6 @@ int main (int argc, char* argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
SendEvents (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer completion...\n"));
@@ -271,8 +261,7 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 18a1c92a0d2..8d106648c2d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -35,27 +35,22 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
{
ACE_UNUSED_ARG(notify_channel);
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
static void validate_expression(bool expr, const char* msg)
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 7f41538007e..3579b78f725 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -63,10 +63,8 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char * argv[])
@@ -76,7 +74,6 @@ int main (int argc, char * argv[])
Consumer_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
@@ -86,19 +83,16 @@ int main (int argc, char * argv[])
CosNotifyChannelAdmin::AdminID adminid = 0;
CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
ec->new_for_consumers(CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
if (useFilter)
{
CosNotifyFilter::FilterFactory_var ffact =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (filter.in ()))
{
@@ -114,7 +108,6 @@ int main (int argc, char * argv[])
constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1 and group != 0");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer_admin->add_filter (filter.in ());
}
@@ -123,28 +116,22 @@ int main (int argc, char * argv[])
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (sig.in ()));
create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
- sig->done(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 161d3f3e8c4..674f7479170 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -31,13 +31,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -73,7 +73,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -105,7 +104,6 @@ send_event (int id)
ACE_DEBUG((LM_DEBUG, "+"));
supplier->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -125,10 +123,8 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char * argv[])
@@ -138,21 +134,18 @@ int main (int argc, char * argv[])
{
Notify_Test_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(ec.in()));
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CosNotifyChannelAdmin::SupplierAdmin_var admin =
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
@@ -164,7 +157,6 @@ int main (int argc, char * argv[])
{
CORBA::String_var ior =
client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *output_file= ACE_OS::fopen (ior_file, "w");
ACE_ASSERT (output_file != 0);
@@ -181,7 +173,6 @@ int main (int argc, char * argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
send_event (i);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
@@ -189,8 +180,7 @@ int main (int argc, char * argv[])
ACE_OS::unlink (ior_file);
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index 232c98a0f45..7ac0f3014aa 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -81,25 +81,21 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (consumerFilter_ != None)
{
CosNotifyFilter::FilterFactory_var ffact =
- notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ notify_channel->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT(! CORBA::is_nil (filter.in ()));
@@ -110,7 +106,6 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
constraint_list[0].constraint_expr = CORBA::string_dup ("group != 1");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
proxysupplier->add_filter (filter.in ());
}
@@ -119,14 +114,11 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
static void validate_expression(bool expr, const char* msg)
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 352ef42df08..81bdb94275d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -10,25 +10,21 @@ Notify_Push_Supplier::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::StructuredPushSupplier_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
supplier_admin->obtain_notification_push_consumer (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (useFilter)
{
CosNotifyFilter::FilterFactory_var ffact =
- notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ notify_channel->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT(! CORBA::is_nil (filter.in ()));
@@ -39,7 +35,6 @@ Notify_Push_Supplier::_connect (
constraint_list[0].constraint_expr = CORBA::string_dup ("group != 0");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
proxyconsumer->add_filter (filter.in ());
}
@@ -47,12 +42,9 @@ Notify_Push_Supplier::_connect (
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index eb633882bcc..2bb76afe96d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -80,10 +80,8 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char * argv[])
@@ -93,7 +91,6 @@ int main (int argc, char * argv[])
Consumer_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status != 0)
{
ACE_ERROR((LM_ERROR, "Error: Unable to init consumer.\n"));
@@ -108,19 +105,16 @@ int main (int argc, char * argv[])
ec->new_for_consumers ((consumerFilter == OrOp
? CosNotifyChannelAdmin::OR_OP : CosNotifyChannelAdmin::AND_OP),
adminid ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
if (consumerFilter != None)
{
CosNotifyFilter::FilterFactory_var ffact =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (filter.in ()))
{
@@ -136,7 +130,6 @@ int main (int argc, char * argv[])
constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
consumer_admin->add_filter (filter.in ());
}
@@ -145,28 +138,22 @@ int main (int argc, char * argv[])
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (sig.in ()));
create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
- sig->done(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 69463ea273a..92d96729b15 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -32,13 +32,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -115,7 +115,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
CosNotifyChannelAdmin::AND_OP),
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -147,7 +146,6 @@ send_event (int id)
ACE_DEBUG((LM_DEBUG, "+"));
supplier->send_event (event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -168,10 +166,8 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier->_connect (admin, ec, useFilters ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
@@ -179,12 +175,10 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
ACE_ENV_ARG_DECL)
{
CosNotifyFilter::FilterFactory_var ffact =
- notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ notify_channel->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT(!CORBA::is_nil (filter.in ()));
@@ -195,10 +189,8 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
constraint_list[0].constraint_expr = CORBA::string_dup ("type != 0");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
int main (int argc, char * argv[])
@@ -208,21 +200,18 @@ int main (int argc, char * argv[])
{
Supplier_Client client;
int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_UNUSED_ARG(status);
ACE_ASSERT(status == 0);
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("Struct_Multi_Filter", 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil(ec.in()));
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CosNotifyChannelAdmin::SupplierAdmin_var admin =
create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
@@ -241,7 +230,6 @@ int main (int argc, char * argv[])
{
CORBA::String_var ior =
client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
FILE *output_file= ACE_OS::fopen (ior_file, "w");
ACE_ASSERT (output_file != 0);
@@ -258,7 +246,6 @@ int main (int argc, char * argv[])
{
ACE_DEBUG((LM_DEBUG, "+"));
send_event (i);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
@@ -266,8 +253,7 @@ int main (int argc, char * argv[])
ACE_OS::unlink (ior_file);
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
return 0;
}
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 07ba1cbfdd9..1a316c6d55f 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -21,7 +21,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter ()
}
char*
-TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -79,7 +79,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra
ACE_NEW_THROW_EX (infoseq_ptr,
CosNotifyFilter::ConstraintInfoSeq (0),
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return infoseq_ptr;
}
@@ -109,26 +108,25 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra
}
CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
}
void
-TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Test_Filter::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
PortableServer::POA_var my_POA = _default_POA ();
@@ -156,7 +154,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK_RETURN (0);
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this));
@@ -170,12 +167,10 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
CORBA::Object_var object =
orb->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
RTCORBA::Current_var current =
RTCORBA::Current::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// Get the ORB_Core's TSS resources.
TAO_ORB_Core_TSS_Resources *tss =
@@ -284,7 +279,7 @@ TAO_Notify_Tests_RT_Test_Filter::detach_callback (
}
CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 3ca5f7d6445..be8498014d8 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -43,7 +43,7 @@ public:
~TAO_Notify_Tests_RT_Test_Filter ();
protected:
- virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL)
+ virtual char * constraint_grammar (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -70,17 +70,17 @@ protected:
CosNotifyFilter::ConstraintNotFound
));
- virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void remove_all_constraints (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void destroy (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -114,7 +114,7 @@ protected:
CosNotifyFilter::CallbackNotFound
));
- virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index ecd20e34d7a..ac48714aae7 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_
PortableServer::ServantBase_var servant_var (this);
- return _this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return _this ();
}
CosNotifyFilter::Filter_ptr
@@ -55,12 +55,10 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_gr
PortableServer::ObjectId_var oid =
this->filter_poa_->activate_object (filter
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
CORBA::Object_var obj =
this->filter_poa_->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
return CosNotifyFilter::Filter::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index 463a3fc9b8d..65da45fc8b0 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -25,7 +25,7 @@
class TestSupplier
: public POA_CosNotifyComm::StructuredPushSupplier
{
- virtual void disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) {
+ virtual void disconnect_structured_push_supplier(void) throw (CORBA::SystemException) {
}
virtual void subscription_change( const CosNotification::EventTypeSeq&,
@@ -38,7 +38,7 @@ class TestSupplier
class TestConsumer
: public POA_CosNotifyComm::StructuredPushConsumer
{
- virtual void disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) {
+ virtual void disconnect_structured_push_consumer(void) throw (CORBA::SystemException) {
}
virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq& ACE_ENV_ARG_DECL_NOT_USED)
@@ -65,7 +65,6 @@ int main(int ac, char **av)
PortableServer::POA_var poa;
orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (orb.in ()));
if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0)
@@ -108,10 +107,8 @@ int main(int ac, char **av)
}
CORBA::Object_var obj =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (obj.in ()));
poa = PortableServer::POA::_narrow(obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (poa.in ()));
PortableServer::POAManager_var mgr = poa->the_POAManager();
mgr->activate();
@@ -122,27 +119,22 @@ int main(int ac, char **av)
policies[0] =
poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var persistentPOA = poa->create_POA (
"PersistentPOA",
mgr.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[0]->destroy ();
if (pass1)
{
CosNotifyChannelAdmin::EventChannelFactory_var cosecf =
TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
NotifyExt::EventChannelFactory_var ecf =
NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ecf.in ()))
{
@@ -185,21 +177,18 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::ChannelID ecid;
::CosNotifyChannelAdmin::EventChannel_var ec =
ecf->create_channel(qosprops, adminprops, ecid ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::AdminID consumer_admin_id;
CosNotifyChannelAdmin::ConsumerAdmin_var ca =
ec->new_for_consumers(CosNotifyChannelAdmin::OR_OP,
consumer_admin_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::AdminID supplier_admin_id;
CosNotifyChannelAdmin::SupplierAdmin_var sa =
ec->new_for_suppliers(CosNotifyChannelAdmin::OR_OP,
supplier_admin_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::ProxyID proxy_id;
CosNotifyChannelAdmin::ProxySupplier_var ps =
@@ -207,7 +196,6 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::StructuredProxyPushSupplier_var strps =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(ps.in());
@@ -216,7 +204,6 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::SequenceProxyPushSupplier_var seqps =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(ps.in());
@@ -225,7 +212,6 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::ANY_EVENT,
proxy_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::ProxyPushSupplier_var anyps =
CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(ps.in());
@@ -235,7 +221,6 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::StructuredProxyPushConsumer_var strpc = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(pc.in());
@@ -243,7 +228,6 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::SequenceProxyPushConsumer_var seqpc = CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(pc.in());
@@ -252,23 +236,19 @@ int main(int ac, char **av)
CosNotifyChannelAdmin::ANY_EVENT,
proxy_id
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyChannelAdmin::ProxyPushConsumer_var anypc = CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(pc.in());
CosNotifyFilter::FilterFactory_var ff =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->default_filter_factory ();
CosNotifyFilter::Filter_var filter1 =
ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (filter1.in ()));
CosNotifyFilter::Filter_var filter2 =
ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT(! CORBA::is_nil (filter2.in ()));
@@ -278,66 +258,48 @@ int main(int ac, char **av)
constraint_list[0].constraint_expr = CORBA::string_dup("Number == 100");
filter1->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
filter2->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ca->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sa->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
strps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
seqps->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
anyps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
strpc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
seqpc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
anypc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
anypc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotification::EventTypeSeq added1(1), removed1(0);
added1.length(1);
added1[0].domain_name = CORBA::string_dup("nightly_builds");
added1[0].type_name = CORBA::string_dup("*");
ca->subscription_change(added1, removed1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Connect a PushConsumer and PushSupplier
TestSupplier test_supplier_svt;
PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TestConsumer test_consumer_svt;
PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
strpc->connect_structured_push_supplier(push_sup.in());
strps->connect_structured_push_consumer(push_cons.in());
@@ -345,14 +307,11 @@ int main(int ac, char **av)
persistentPOA->deactivate_object (oid1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
persistentPOA->deactivate_object (oid2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- ecf->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ecf->destroy();
////////////////////////////////
// TODO make this not hardcoded
ACE_OS::rename ("abc.xml", "loadtest.xml");
@@ -365,12 +324,9 @@ int main(int ac, char **av)
// Create a new ecf, which should load itself from loadtest.xml
CosNotifyChannelAdmin::EventChannelFactory_var
cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- ACE_TRY_CHECK;
NotifyExt::EventChannelFactory_var
ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ecf.in ()))
{
@@ -378,17 +334,13 @@ int main(int ac, char **av)
}
// Force a change, which should write out a new abc.xml.
- ecf->save_topology (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ecf->save_topology ();
- ecf->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ecf->destroy();
}
poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
+ orb->destroy ();
poa = PortableServer::POA::_nil ();
orb = CORBA::ORB::_nil ();
retval = 0;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 86b477c1bba..028edce2389 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -225,12 +225,11 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
}
void
-TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Activation_Manager::write_ior (void)
{
PortableServer::ServantBase_var servant_var (this);
- Notify_Test::Activation_Manager_var am_object = _this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ Notify_Test::Activation_Manager_var am_object = _this ();
CORBA::ORB_var orb;
LOOKUP_MANAGER->resolve (orb);
@@ -238,7 +237,6 @@ TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
// Write IOR to a file, if asked.
CORBA::String_var str =
orb->object_to_string (am_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (this->ior_output_file_)
{
@@ -251,7 +249,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
{
ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
@@ -260,7 +258,7 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_D
}
void
-TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::start (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -273,17 +271,15 @@ TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Activation_Manager::signal_peer (void)
{
CORBA::ORB_var orb;
LOOKUP_MANAGER->resolve (orb);
CORBA::Object_var object =
orb->string_to_object (this->ior_input_file_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Notify_Test::Activation_Manager_var peer = Notify_Test::Activation_Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (peer.in ()))
{
@@ -292,5 +288,5 @@ TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
this->ior_input_file_.c_str ()));
}
- peer->start (ACE_ENV_SINGLE_ARG_PARAMETER);
+ peer->start ();
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 838516b3d64..d166573d437 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -55,7 +55,7 @@ public:
virtual ~TAO_Notify_Tests_Activation_Manager ();
/// Interface impl.
- virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void start (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -96,9 +96,9 @@ public:
// Returns 1 if the file could be opened for read.
int ior_input_file (const ACE_TCHAR *file_name);
- void write_ior (ACE_ENV_SINGLE_ARG_DECL);
- void wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL);
- void signal_peer (ACE_ENV_SINGLE_ARG_DECL);
+ void write_ior (void);
+ void wait_for_start_signal (void);
+ void signal_peer (void);
protected:
/// Lock to serialize internal state.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 5172ae18620..f3ce3c8d811 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -92,20 +92,17 @@ TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
}
void
-TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_init (void)
{
/// Fetch the root poa.
PortableServer::POA_var root_poa;
LOOKUP_MANAGER->resolve (root_poa);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa->the_POAManager ();
/// Activate the root POA.
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
TAO_Notify_Tests_Priority_Mapping* mapping = new TAO_Notify_Tests_Priority_Mapping ();
@@ -113,7 +110,7 @@ TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void)
{
ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n"));
@@ -124,7 +121,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE
}
void
-TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_shutdown (void)
{
ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n"));
@@ -136,7 +133,7 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_N
}
void
-TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_dump_stats (void)
{
ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n"));
@@ -147,7 +144,7 @@ TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL
}
void
-TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_run (void)
{
// Run the Consumers
@@ -163,62 +160,54 @@ TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_US
}
void
-TAO_Notify_Tests_Application_Command::handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_signal_peer (void)
{
TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
LOOKUP_MANAGER->resolve (act_mgr);
- act_mgr->signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ act_mgr->signal_peer ();
}
void
-TAO_Notify_Tests_Application_Command::handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_wait_to_start (void)
{
TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
LOOKUP_MANAGER->resolve (act_mgr);
- act_mgr->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ act_mgr->write_ior ();
- act_mgr->wait_for_start_signal (ACE_ENV_SINGLE_ARG_PARAMETER);
+ act_mgr->wait_for_start_signal ();
}
void
-TAO_Notify_Tests_Application_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::execute_i (void)
{
if (this->command_ == INIT)
{
- this->handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_init ();
}
else if (this->command_ == RUN)
{
- this->handle_run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_run ();
}
else if (this->command_ == WAIT_FOR_EVENTS)
{
- this->handle_wait_for_completion (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_wait_for_completion ();
}
else if (this->command_ == SHUTDOWN)
{
- this->handle_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_shutdown ();
}
else if (this->command_ == DUMP_STATE)
{
- this->handle_dump_stats (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_dump_stats ();
}
else if (this->command_ == SIGNAL_PEER)
{
- this->handle_signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_signal_peer ();
}
else if (this->command_ == WAIT_TO_START)
{
- this->handle_wait_to_start (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_wait_to_start ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index ff267fc37a3..76481484705 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -43,7 +43,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Get the command name.
virtual const char* get_name (void);
@@ -70,13 +70,13 @@ protected:
int dump_samples_;
///= Handlers
- virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL);
- void handle_run (ACE_ENV_SINGLE_ARG_DECL);
- void handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL);
- void handle_shutdown (ACE_ENV_SINGLE_ARG_DECL);
- void handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL);
- void handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL);
- void handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void handle_init (void);
+ void handle_run (void);
+ void handle_wait_for_completion (void);
+ void handle_shutdown (void);
+ void handle_dump_stats (void);
+ void handle_signal_peer (void);
+ void handle_wait_to_start (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 4e63d4ba284..085a49bbcae 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -31,7 +31,7 @@ TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command)
}
void
-TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Command::execute (void)
{
if (this->command_ == INVALID)
{
@@ -43,8 +43,7 @@ TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->execute_i ();
}
ACE_CATCHANY
{
@@ -55,5 +54,5 @@ TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
}
if (this->next_)
- this->next_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->next_->execute ();
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 41f23995f0b..d4427da065a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -50,7 +50,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Implement command execution.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void execute_i (void) = 0;
/// Return the name of this command.
virtual const char* get_name (void)= 0;
@@ -68,7 +68,7 @@ protected:
private:
/// Execute the command.
- void execute (ACE_ENV_SINGLE_ARG_DECL);
+ void execute (void);
/// Save the next command to exec.
void next (TAO_Notify_Tests_Command* command);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index e95b8ed81b2..6d40e44cef1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -74,10 +74,10 @@ TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, T
}
void
-TAO_Notify_Tests_Command_Builder::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Command_Builder::execute (void)
{
if (this->start_command_)
- this->start_command_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->start_command_->execute ();
}
ACE_STATIC_SVC_DEFINE(TAO_Notify_Tests_Command_Builder,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
index 7ca63765dbe..f18b14e1230 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
@@ -53,7 +53,7 @@ public:
void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory);
/// Execute the <start_command_>.
- void execute (ACE_ENV_SINGLE_ARG_DECL);
+ void execute (void);
protected:
/// The starting command. each command executes the next one when done.
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index 2965bc0094c..af36c757989 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -30,32 +30,28 @@ TAO_Notify_Tests_ConsumerAdmin_Command::name (void)
}
void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
{
CosNotifyChannelAdmin::EventChannel_var ec;
LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// create consumer admin
CosNotifyChannelAdmin::ConsumerAdmin_var sa =
ec->new_for_consumers (this->ifgop_,
this->id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
{
CosNotifyChannelAdmin::ConsumerAdmin_var admin;
LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Let the user see what we're subscribed for,
ACE_DEBUG ((LM_DEBUG, "Calling ConsumerAdmin subscription_change : "));
@@ -74,23 +70,20 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG
ACE_DEBUG ((LM_DEBUG, "\n"));
admin->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
{
CosNotifyChannelAdmin::ConsumerAdmin_var admin;
LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (void)
{
//@@ TODO:
}
@@ -155,26 +148,22 @@ TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
}
void
-TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (void)
{
if (this->command_ == CREATE)
{
- this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create ();
}
else if (this->command_ == SUBSCRIPTION)
{
- this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_subscriptions ();
}
else if (this->command_ == SET_QOS)
{
- this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_set_qos ();
}
else if (this->command_ == DUMP_STATE)
{
- this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_status ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index a94146e47bc..ce8a8c9e785 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -42,7 +42,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Name of object
virtual const char* get_name (void);
@@ -80,10 +80,10 @@ protected:
CosNotification::EventTypeSeq removed_;
/// = Handlers
- void handle_create (ACE_ENV_SINGLE_ARG_DECL);
- void handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL);
- void handle_status (ACE_ENV_SINGLE_ARG_DECL);
- void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_create (void);
+ void handle_subscriptions (void);
+ void handle_status (void);
+ void handle_set_qos (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 9441287f68b..35f62570b7f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -33,7 +33,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
@@ -54,7 +53,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
, this->proxy_id_
, qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
@@ -87,7 +85,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotificati
if (proxy_supplier != 0)
{
proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
ACE_DEBUG ((LM_DEBUG, "Proxy Supplier not available, subscription change not made."));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 502d535a91a..dc9a14014e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -15,23 +15,19 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer ()
}
void
-TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Direct_Consumer::connect (void)
{
// Get the POA
PortableServer::POA_var poa;
LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// set the POA
this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Activate the consumer with the default_POA_.
CosNotifyComm::StructuredPushConsumer_var consumer_ref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Register the activated object.
LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index d27c57924c0..aedcf83e89a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -37,7 +37,7 @@ public:
~TAO_Notify_Tests_Direct_Consumer ();
/// Connect using options parsed and set initial QoS.
- virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a647893b1f7..5fdf0f3424d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -20,29 +20,24 @@ TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier ()
}
void
-TAO_Notify_Tests_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Direct_Supplier::connect (void)
{
// Get the POA
PortableServer::POA_var poa;
LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// set the POA
this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Get hold of the reference.
CosNotifyComm::StructuredPushSupplier_var supplier_ref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
// Register the activated object.
LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the target object.
LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -52,5 +47,4 @@ TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredE
ACE_ASSERT (!CORBA::is_nil (this->target_object_.in ()));
this->target_object_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index 999bf7463ec..ece4265d60a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -37,7 +37,7 @@ public:
~TAO_Notify_Tests_Direct_Supplier ();
/// Connect using options parsed and set initial QoS.
- virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect (void);
// Send one event. Bypass sending to the Notify and send directly to taget consumer.
virtual void send_event (const CosNotification::StructuredEvent& event
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 8985aa6f772..460954ed447 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -95,8 +95,7 @@ TAO_Notify_Tests_Worker::svc (void)
ACE_TRY
{
ACE_DEBUG ((LM_DEBUG, "Running Commands... \n"));
- this->cmd_builder_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->cmd_builder_->execute ();
}
ACE_CATCHANY
{
@@ -137,7 +136,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
// just disabling it altogether. It doesn't provide much value, and
// makes service startup needlessly more verbose. See bugzilla 2477
// for details.
-
+
ACE_hthread_t current;
ACE_Thread::self (current);
@@ -156,8 +155,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
{
ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
@@ -243,7 +241,6 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
command_line.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->parse_args (argc, argv) == -1)
return -1;
@@ -254,7 +251,6 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
check_supported_priorities (this->orb_.in());
LOOKUP_MANAGER->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->cmd_builder_ =
ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>::instance (TAO_Notify_Tests_Name::command_builder);
@@ -272,7 +268,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
}
void
-TAO_Notify_Tests_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Driver::run (void)
{
// Task activation flags.
long flags =
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 610e6b02e79..7e8ff3887cc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -110,7 +110,7 @@ public:
int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
/// Execute the commands.
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
/// Shutdown
virtual void shutdown (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 519fee9fc45..318b857fb67 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -88,7 +88,7 @@ TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
}
void
-TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
{
CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
@@ -120,39 +120,33 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG
LOOKUP_MANAGER->resolve (naming);
notify_service->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Activate the factory
notify_factory =
notify_service->create (poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Register with the Naming Service
CosNaming::Name_var name =
naming->to_name (TAO_Notify_Tests_Name::event_channel_factory
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
naming->rebind (name.in (),
notify_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_create (void)
{
if (this->collocated_ == 1)
{
- this->create_collocated_ecf (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->create_collocated_ecf ();
}
CosNotifyChannelAdmin::EventChannelFactory_var ec_factory;
LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties qos;
CosNotification::AdminProperties admin;
@@ -163,63 +157,53 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
admin,
this->id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
LOOKUP_MANAGER->_register (ec.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_EventChannel_Command::handle_destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
{
ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ()));
CosNotifyChannelAdmin::EventChannel_var ec;
LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->destroy ();
}
void
-TAO_Notify_Tests_EventChannel_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
{
CosNotifyChannelAdmin::EventChannel_var ec;
LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ec->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_EventChannel_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_EventChannel_Command::handle_status (void)
{
//@@ TODO: Implement
}
void
-TAO_Notify_Tests_EventChannel_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::execute_i (void)
{
if (this->command_ == CREATE)
{
- this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create ();
}
else if (this->command_ == DESTROY)
{
- this->handle_destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_destroy ();
}
else if (this->command_ == SET_QOS)
{
- this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_set_qos ();
}
else if (this->command_ == DUMP_STATE)
{
- this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_status ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 35a2baa4bb0..dc8163bb0d1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -47,7 +47,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Name of object
virtual const char* get_name (void);
@@ -82,13 +82,13 @@ protected:
CORBA::Boolean collocated_;
/// Helper method to create a collocated ECF.
- void create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL);
+ void create_collocated_ecf (void);
/// = Handlers
- void handle_create (ACE_ENV_SINGLE_ARG_DECL);
- void handle_destroy (ACE_ENV_SINGLE_ARG_DECL);
- void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
- void handle_status (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_create (void);
+ void handle_destroy (void);
+ void handle_set_qos (void);
+ void handle_status (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 2bb7bb716b4..df44cc76328 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -98,44 +98,37 @@ TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
}
void
-TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
{
CosNotifyChannelAdmin::EventChannel_var ec;
LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotifyFilter::FilterFactory_var ff =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ ec->default_filter_factory ();
LOOKUP_MANAGER->_register (ff.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Filter_Command::handle_create_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
{
CosNotifyFilter::FilterFactory_var ff;
LOOKUP_MANAGER->resolve (ff , this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotifyFilter::Filter_var filter =
ff->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
LOOKUP_MANAGER->_register (filter.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
{
CosNotifyFilter::Filter_var filter;
LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotifyFilter::ConstraintExpSeq constraint_list (1);
constraint_list.length (1);
@@ -145,64 +138,53 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "Adding constraint %s\n", this->constraint_.c_str ()));
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Filter_Command::handle_add_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
{
CosNotifyFilter::Filter_var filter;
LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotifyFilter::FilterAdmin_var filter_admin;
LOOKUP_MANAGER->resolve (filter_admin , this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Filter_Command::handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
{
CosNotifyFilter::Filter_var filter;
LOOKUP_MANAGER->resolve (filter, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- filter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ filter->destroy ();
}
void
-TAO_Notify_Tests_Filter_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::execute_i (void)
{
if (this->command_ == CREATE_FACTORY)
{
- this->handle_create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create_filter_factory ();
}
else if (this->command_ == CREATE_FILTER)
{
- this->handle_create_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create_filter ();
}
else if (this->command_ == ADD_CONSTRAINT)
{
- this->handle_add_constraint (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_add_constraint ();
}
else if (this->command_ == ADD_FILTER)
{
- this->handle_add_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_add_filter ();
}
else if (this->command_ == DESTROY)
{
- this->handle_destroy_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_destroy_filter ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 2678b6c4437..d3acf0efe73 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -42,7 +42,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Name of object
virtual const char* get_name (void);
@@ -72,11 +72,11 @@ protected:
ACE_CString constraint_;
///= Handlers
- void handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
- void handle_create_filter (ACE_ENV_SINGLE_ARG_DECL);
- void handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL);
- void handle_add_filter (ACE_ENV_SINGLE_ARG_DECL);
- void handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_create_filter_factory (void);
+ void handle_create_filter (void);
+ void handle_add_constraint (void);
+ void handle_add_filter (void);
+ void handle_destroy_filter (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 14ebdb482d8..409c493eea1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -24,7 +24,6 @@ TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
orb_ = CORBA::ORB::_duplicate (orb);
this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service ACE_ENV_ARG_PARAMETER);
}
@@ -35,12 +34,10 @@ TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* ob
CosNaming::Name_var name =
this->naming_->to_name (obj_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
//@@ Warning: this is rebind..
this->naming_->rebind (name.in (),
obj
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_DEBUG ((LM_DEBUG, "Registered %s with Naming Service\n", obj_name));
}
@@ -106,7 +103,6 @@ TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const cha
{
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object))
{
@@ -116,14 +112,12 @@ TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const cha
}
poa = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->root_poa_ = poa;
}
else
{
poa = root_poa_->find_POA (poa_name, 0 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -132,7 +126,6 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (naming_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -140,7 +133,6 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming
this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNaming::NamingContextExt::_duplicate (this->naming_.in ());
@@ -157,7 +149,6 @@ TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG
CORBA::Object_var obj =
this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA::Object::_nil ());
return obj._retn ();
}
@@ -165,90 +156,72 @@ void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (factory_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (channel_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ec = CosNotifyChannelAdmin::EventChannel::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
sa = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ca = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (supplier_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (consumer_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (filter_factory_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ff = CosNotifyFilter::FilterFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (filter_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
filter = CosNotifyFilter::Filter::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL)
{
CORBA::Object_var object = this->resolve_object (filter_admin_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index cd6a689acfa..b0e96e70dbd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -22,9 +22,7 @@ Notify_Test_Client::~Notify_Test_Client ()
ACE_TRY_NEW_ENV
{
root_poa_->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb_->destroy();
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -37,13 +35,10 @@ int
Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
{
int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (status == 0)
{
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->resolve_naming_service ();
+ this->resolve_Notify_factory ();
}
return status;
}
@@ -64,7 +59,6 @@ Notify_Test_Client::init_ORB (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (this->parse_args (argc, argv) != 0)
{
@@ -74,7 +68,6 @@ Notify_Test_Client::init_ORB (int argc,
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (poa_object))
{
@@ -84,25 +77,21 @@ Notify_Test_Client::init_ORB (int argc,
}
this->root_poa_ =
PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ poa_manager->activate ();
return 0;
}
void
-Notify_Test_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -111,11 +100,10 @@ Notify_Test_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Notify_Test_Client::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::resolve_Notify_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -124,31 +112,27 @@ Notify_Test_Client::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->notify_factory_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
obj.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
}
int
-Notify_Test_Client::ORB_run (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::ORB_run (void)
{
while (! is_done())
{
ACE_Time_Value tv(0, 10 * 1000);
orb_->run(tv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
}
ACE_DEBUG((LM_DEBUG, "\nWaiting for stray events...\n"));
ACE_Time_Value tv(2);
orb_->run(tv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN(-1);
return 0;
}
@@ -232,7 +216,6 @@ Notify_Test_Client::create_event_channel (const char* cname,
initial_admin,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
naming_context_->rebind(name, ec.in());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 39bbed208fe..83ac9f07880 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -43,7 +43,7 @@ public:
virtual int parse_args (int argc, char* argv[]);
// Allow the user to override this empty method
- int ORB_run (ACE_ENV_SINGLE_ARG_DECL);
+ int ORB_run (void);
// Call ORB::run to accept requests.
void consumer_start (TAO_Notify_Tests_Peer*);
@@ -80,10 +80,10 @@ protected:
ACE_ENV_ARG_DECL);
// Initializes the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Try to get hold of a running naming service.
- void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_Notify_factory (void);
// Try to resolve the Notify factory from the Naming service.
// = Data Members
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 556d11fb0f0..6b6fbe1de6c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -35,9 +35,9 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void)
template <class Peer_Traits>
ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
-TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void)
{
- return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->_this ();
}
template <class Peer_Traits>
@@ -51,11 +51,9 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
PortableServer::ServantBase_var servant_var (this);
ACE_TYPENAME Peer_Traits::VAR peer_var =
- this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->activate ();
this->connect_to_peer (proxy, peer_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// save the proxy
this->proxy_ = Proxy_Traits_INTERFACE::_duplicate (proxy);
@@ -67,7 +65,6 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
LOOKUP_MANAGER->_register (this->proxy_.in (),
this->proxy_name_.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -79,32 +76,28 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr
ACE_TYPENAME Proxy_Traits::VAR proxy_var =
this->obtain_proxy (admin_ptr
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
this->connect (proxy_var.in (),
this->proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
template <class Peer_Traits>
void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void)
{
// Get the POA
PortableServer::POA_var poa;
LOOKUP_MANAGER->resolve (poa,
this->poa_name_.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// set the POA
this->set_poa (poa.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Resolve the admin
ACE_TYPENAME Admin_Traits::VAR admin_var;
@@ -112,18 +105,15 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
LOOKUP_MANAGER->resolve (admin_var,
this->admin_name_.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var =
Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_TYPENAME Proxy_Traits::VAR proxy_var =
this->obtain_proxy (admin_ext_var.in (),
this->qos_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
@@ -132,7 +122,6 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
this->connect (proxy_var.in (),
this->proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
template <class Peer_Traits>
@@ -143,19 +132,17 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
)
{
this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
template <class Peer_Traits>
void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
{
#if (TAO_HAS_MINIMUM_CORBA == 0)
ACE_TRY
{
CORBA::Boolean not_exist =
- this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->get_proxy ()->_non_existent ();
if (not_exist == 1)
{
@@ -192,13 +179,13 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
template <class Peer_Traits>
void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
ACE_TRY_EX(TRY1)
{
- this->disconnect_from_proxy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->disconnect_from_proxy ();
ACE_TRY_CHECK_EX(TRY1);
}
ACE_CATCHANY
@@ -211,7 +198,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY_EX(TRY2)
{
- this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->deactivate ();
ACE_TRY_CHECK_EX(TRY2);
}
ACE_CATCHANY
@@ -234,18 +221,16 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
template <class Peer_Traits>
void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void)
{
PortableServer::POA_var poa = this->_default_POA ();
PortableServer::ObjectId_var id =
poa->servant_to_id (this
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
poa->deactivate_object (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
#endif /* TAO_Notify_Tests_Peer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index eafdc02a172..33bf03cabcf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -60,29 +60,29 @@ public:
void connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
/// Connect using options parsed and set initial QoS.
- virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect (void);
// Disconnect from the Peer.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
/// Set Qos
void set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL);
/// Dump status
- void status (ACE_ENV_SINGLE_ARG_DECL);
+ void status (void);
// Accessor for <proxy_>.
Proxy_Traits_PTR get_proxy (void);
/// Deactivate the object.
- void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+ void deactivate (void);
// = ServantBase operations
- virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual PortableServer::POA_ptr _default_POA (void);
protected:
/// Activate this object in the default POA.
- virtual Peer_Traits_PTR activate (ACE_ENV_SINGLE_ARG_DECL);
+ virtual Peer_Traits_PTR activate (void);
///= To be implemented by specializations.
@@ -98,7 +98,7 @@ protected:
ACE_ENV_ARG_DECL) = 0;
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+ virtual void disconnect_from_proxy (void) = 0;
// = Data Members
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index a718deb73bf..3f8b6083cf4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -178,7 +178,6 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification
{
ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
CORBA::INTERNAL ());
- ACE_CHECK;
const CosNotification::PropertySeq& prop_seq =
notification.header.variable_header;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index cfda2e788f8..32dc958d771 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -88,7 +88,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
{
ACE_DECLARE_NEW_CORBA_ENV;
act_mgr->_register (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
consumer->init_state (arg_shifter);
@@ -162,7 +161,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
{
ACE_DECLARE_NEW_CORBA_ENV;
act_mgr->resolve (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
if (consumer == 0)
@@ -172,102 +170,90 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void)
{
this->consumer ()->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void)
{
TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
if (consumer == 0)
return;
- consumer->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->connect ();
ACE_DEBUG ((LM_DEBUG, "Consumer %s is connected\n", this->name_.c_str ()));
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
{
TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
if (consumer == 0)
return;
consumer->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void)
{
TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
if (consumer == 0)
return;
- consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->disconnect ();
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void)
{
TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
if (consumer == 0)
return;
- consumer->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->deactivate ();
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void)
{
TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
if (consumer == 0)
return;
- consumer->status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ consumer->status ();
}
void
-TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (void)
{
if (this->command_ == CREATE)
{
- this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create ();
}
else if (this->command_ == SUBSCRIPTION)
{
- this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_subscriptions ();
}
else if (this->command_ == DISCONNECT)
{
- this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_disconnect ();
}
else if (this->command_ == DEACTIVATE)
{
- this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_deactivate ();
}
else if (this->command_ == DUMP_STATE)
{
- this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_status ();
}
else if (this->command_ == SET_QOS)
{
- this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_set_qos ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index d258c7e2e8a..6e2c3c5c7f5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -44,7 +44,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Name of object
virtual const char* get_name (void);
@@ -83,12 +83,12 @@ protected:
TAO_Notify_Tests_Periodic_Consumer* consumer (void);
///= Handlers
- void handle_create (ACE_ENV_SINGLE_ARG_DECL);
- void handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL);
- void handle_disconnect (ACE_ENV_SINGLE_ARG_DECL);
- void handle_deactivate (ACE_ENV_SINGLE_ARG_DECL);
- void handle_status (ACE_ENV_SINGLE_ARG_DECL);
- void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_create (void);
+ void handle_subscriptions (void);
+ void handle_disconnect (void);
+ void handle_deactivate (void);
+ void handle_status (void);
+ void handle_set_qos (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index b2aea30f498..4dfd9eee2dc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -178,19 +178,18 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
}
void
-TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
{
int WARMUP_COUNT = 10;
for (int i = 0; i < WARMUP_COUNT ; ++i)
{
this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
void
-TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
{
// populate event.
// send the base time and max count.
@@ -212,14 +211,12 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event 0th event\n"));
this->send_event (zeroth_event.event () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
{
- this->send_prologue (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->send_prologue ();
ACE_hrtime_t before, after;
TimeBase::TimeT time_t;
@@ -254,7 +251,6 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
this->name_.c_str (), i));
this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
after = ACE_OS::gethrtime ();
@@ -309,8 +305,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
ACE_TRY_NEW_ENV
{
// First, send warmup events.
- this->send_warmup_events (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->send_warmup_events ();
// Next, wait for other threads.
this->barrier_->wait ();
@@ -321,8 +316,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
// now wait till the phase_ period expires.
ACE_OS::sleep (ACE_Time_Value (0, phase_));
- this->handle_svc (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->handle_svc ();
}
ACE_CATCH (CORBA::UserException, ue)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 5bcdf57d34c..ffaf7e4eba6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -64,13 +64,13 @@ public:
protected:
/// svc method.
- void handle_svc (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_svc (void);
/// Send a few events before the actual measurements.
- void send_warmup_events (ACE_ENV_SINGLE_ARG_DECL);
+ void send_warmup_events (void);
/// Send Prologue
- void send_prologue (ACE_ENV_SINGLE_ARG_DECL);
+ void send_prologue (void);
/// All tasks synch at this barrier.
ACE_Barrier* barrier_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 9cdfaccbb51..09eda2b3150 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -78,7 +78,6 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
{
ACE_DECLARE_NEW_CORBA_ENV;
act_mgr->_register (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
supplier->init_state (arg_shifter);
@@ -149,7 +148,6 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
ACE_DECLARE_NEW_CORBA_ENV;
act_mgr->resolve (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (supplier == 0)
ACE_DEBUG ((LM_DEBUG, "Supplier %s not found by Lookup Manager\n", this->name_.c_str ()));
@@ -158,64 +156,60 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void)
{
TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
if (supplier == 0)
return;
- supplier->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier->connect ();
ACE_DEBUG ((LM_DEBUG, "Supplier %s is connected\n", this->name_.c_str ()));
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
{
TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
if (supplier == 0)
return;
supplier->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void)
{
TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier ();
if (supplier == 0)
return;
- supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier->disconnect ();
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void)
{
TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
if (supplier == 0)
return;
- supplier->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ supplier->deactivate ();
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void)
{
TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
if (supplier == 0)
return;
- supplier->status (ACE_ENV_SINGLE_ARG_PARAMETER);
+ supplier->status ();
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
{
TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
@@ -226,36 +220,30 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_D
}
void
-TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (void)
{
if (this->command_ == CREATE)
{
- this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create ();
}
else if (this->command_ == OFFER)
{
- this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_offers ();
}
else if (this->command_ == DISCONNECT)
{
- this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_disconnect ();
}
else if (this->command_ == DEACTIVATE)
{
- this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_deactivate ();
}
else if (this->command_ == DUMP_STATE)
{
- this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_status ();
}
else if (this->command_ == SET_QOS)
{
- this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_set_qos ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 726d7cd0ddd..08398e4940d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -44,7 +44,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Name of object
virtual const char* get_name (void);
@@ -83,12 +83,12 @@ protected:
TAO_Notify_Tests_Periodic_Supplier* supplier (void);
///= Handlers
- void handle_create (ACE_ENV_SINGLE_ARG_DECL);
- void handle_offers (ACE_ENV_SINGLE_ARG_DECL);
- void handle_disconnect (ACE_ENV_SINGLE_ARG_DECL);
- void handle_deactivate (ACE_ENV_SINGLE_ARG_DECL);
- void handle_status (ACE_ENV_SINGLE_ARG_DECL);
- void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_create (void);
+ void handle_offers (void);
+ void handle_disconnect (void);
+ void handle_deactivate (void);
+ void handle_status (void);
+ void handle_set_qos (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 4ab288212fb..8c9c1a6cf6c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -30,14 +30,14 @@ TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee
}
void
-TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void)
{
ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
- this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_->disconnect_push_supplier ();
}
void
-TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 5aae9203447..719a1ed3d4c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -77,10 +77,10 @@ protected:
virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_from_proxy (void);
// = PushConsumer methods
- virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index f5c3f4d94bd..d3b0465d9f6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -39,14 +39,14 @@ TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee
}
void
-TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void)
{
ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
- this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_->disconnect_push_consumer ();
}
void
-TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index edf2753e87d..1f60e770930 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -80,10 +80,10 @@ protected:
virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_from_proxy (void);
// = PushSupplier method
- virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 629639070b5..f8ed0f5d93f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -16,14 +16,12 @@ TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer ()
}
void
-TAO_Notify_Tests_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Relay_Consumer::connect (void)
{
- TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ TAO_Notify_Tests_Direct_Consumer::connect ();
// Resolve the destination object.
LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
@@ -34,7 +32,6 @@ TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::S
{
// The Periodic Consumer will record the run statistics.
//TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER);
- //ACE_CHECK;
// Forward the event.
if (CORBA::is_nil (this->destination_object_.in ()))
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 87fe1ecf44a..03892b7c54b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -37,7 +37,7 @@ public:
~TAO_Notify_Tests_Relay_Consumer ();
/// Connect using options parsed and set initial QoS.
- virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void connect (void);
void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index e63d3661671..47b6de9c601 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -31,14 +31,14 @@ TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_
}
void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void)
{
ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
- this->proxy_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_->disconnect_sequence_push_supplier ();
}
void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 7e4a4773b27..521a1020207 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -77,10 +77,10 @@ protected:
virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_from_proxy (void);
// = SequencePushConsumer methods
- virtual void disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_sequence_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 76151253271..512708e0c73 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -41,14 +41,14 @@ TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_
}
void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void)
{
ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
- this->proxy_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_->disconnect_sequence_push_consumer ();
}
void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index dad8bd6d0eb..6cb47dc71be 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -81,10 +81,10 @@ protected:
virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_from_proxy (void);
// = SequencePushSupplier method
- virtual void disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_sequence_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index 2db62342778..e68019136bd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -31,14 +31,14 @@ TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR prox
}
void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void)
{
ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
- this->proxy_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_->disconnect_structured_push_supplier ();
}
void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 43ee9ffec52..426bb654439 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -77,10 +77,10 @@ protected:
virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_from_proxy (void);
// = StructuredPushConsumer methods
- virtual void disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_structured_push_consumer (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index 289058864f1..787437534f4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -42,14 +42,14 @@ TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR prox
}
void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void)
{
ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
- this->proxy_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_->disconnect_structured_push_consumer ();
}
void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index e1c11dc6a54..29df4959471 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -81,10 +81,10 @@ protected:
virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
/// Disconnect from proxy.
- virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect_from_proxy (void);
// = StructuredPushSupplier method
- virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_structured_push_supplier (void)
ACE_THROW_SPEC ((
CORBA::SystemException
));
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 5adaa65c92c..f28b40c477f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -90,31 +90,27 @@ TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
}
void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
{
CosNotifyChannelAdmin::EventChannel_var ec;
LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// create supplier admin
CosNotifyChannelAdmin::SupplierAdmin_var sa =
ec->new_for_suppliers (this->ifgop_,
this->id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
{
CosNotifyChannelAdmin::SupplierAdmin_var admin;
LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Let the user see what we're subscribed for,
ACE_DEBUG ((LM_DEBUG, "Calling SupplierAdmin offer_change : "));
@@ -133,47 +129,40 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "\n"));
admin->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_status (void)
{
}
void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
{
CosNotifyChannelAdmin::SupplierAdmin_var admin;
LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-TAO_Notify_Tests_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::execute_i (void)
{
if (this->command_ == CREATE)
{
- this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_create ();
}
else if (this->command_ == OFFER)
{
- this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_offers ();
}
else if (this->command_ == SET_QOS)
{
- this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_set_qos ();
}
else if (this->command_ == DUMP_STATE)
{
- this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->handle_status ();
}
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index fbed3172551..486e399b201 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -42,7 +42,7 @@ public:
virtual void init (ACE_Arg_Shifter& arg_shifter);
/// Execute the command.
- virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void execute_i (void);
/// Name of object
virtual const char* get_name (void);
@@ -79,10 +79,10 @@ protected:
CosNotification::EventTypeSeq removed_;
/// = Handlers
- void handle_create (ACE_ENV_SINGLE_ARG_DECL);
- void handle_offers (ACE_ENV_SINGLE_ARG_DECL);
- void handle_status (ACE_ENV_SINGLE_ARG_DECL);
- void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+ void handle_create (void);
+ void handle_offers (void);
+ void handle_status (void);
+ void handle_set_qos (void);
};
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 3641ca65f32..01f1ee5d10b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -33,7 +33,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
@@ -54,7 +53,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
, this->proxy_id_
, qos
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
@@ -85,7 +83,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::Eve
ACE_TYPENAME Proxy_Traits::PTR proxy_consumer = this->get_proxy ();
proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
template <class Supplier_Traits> void
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index 4abebdab3f4..8ba1324e1fd 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -30,20 +30,17 @@ Notify_Sequence_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::SequencePushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::SEQUENCE_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosNotification::QoSProperties properties(1);
properties.length(1);
@@ -53,11 +50,9 @@ Notify_Sequence_Push_Consumer::_connect (
proxy_->set_qos(properties);
proxy_->connect_sequence_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// give ownership to POA
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 271bf5fbeeb..980db3ea5f5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -31,27 +31,22 @@ Notify_Structured_Push_Consumer::_connect (
ACE_THROW_SPEC ((CORBA::SystemException))
{
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
CosNotifyChannelAdmin::STRUCTURED_EVENT,
proxy_id_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->proxy_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
proxysupplier.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
proxy_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_remove_ref ();
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 8d284b588a5..6eb34323d53 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -89,19 +89,16 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (filter)
{
ACE_DEBUG((LM_DEBUG, "\nConsumer filter enabled.\n"));
CosNotifyFilter::FilterFactory_var ffact =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ec->default_filter_factory ();
CosNotifyFilter::Filter_var filter =
ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CosNotifyFilter::ConstraintExpSeq constraint_list (1);
constraint_list.length (1);
@@ -111,10 +108,8 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
CORBA::string_dup ("type == 'even'");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
}
return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -140,10 +135,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -159,7 +152,6 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
@@ -173,15 +165,12 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sig.in ()))
{
@@ -193,24 +182,19 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (admin.in ()))
{
create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->go ();
- client.ORB_run(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.ORB_run();
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 7b7df800ca5..f7131315692 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -40,13 +40,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -121,7 +121,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -153,7 +152,6 @@ SendEvents (int id ACE_ENV_ARG_DECL)
ACE_TRY_NEW_ENV
{
supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -173,10 +171,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -193,24 +189,20 @@ int main (int argc, char* argv[])
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -231,7 +223,6 @@ int main (int argc, char* argv[])
if (!CORBA::is_nil (admin.in ()))
{
create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -239,7 +230,6 @@ int main (int argc, char* argv[])
for (int i = 0; i < max_events; ++i)
{
SendEvents (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", (max_events*amount)));
@@ -247,8 +237,7 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index a45be86190f..404a51ced9f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -87,19 +87,16 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
if (filter)
{
// Filter Section
CosNotifyFilter::FilterFactory_var ffact =
- ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ ec->default_filter_factory ();
// One Filter
CosNotifyFilter::Filter_var filter =
ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
CosNotifyFilter::ConstraintExpSeq constraint_list (1);
constraint_list.length (1);
@@ -109,10 +106,8 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
CORBA::string_dup ("type == 'even'");
filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
// End One Filter
}
@@ -139,10 +134,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
CORBA::NO_MEMORY ());
consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer->_connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -158,7 +151,6 @@ int main (int argc, char* argv[])
Consumer_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
@@ -172,15 +164,12 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sig.in ()))
{
@@ -192,23 +181,18 @@ int main (int argc, char* argv[])
CosNotifyChannelAdmin::ConsumerAdmin_var admin =
create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (admin.in ()))
{
create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Tell the supplier to go
- sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+ sig->go ();
+
client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
- ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig->done ();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index f89028a58c1..48dfb565431 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -39,13 +39,13 @@ public:
{
}
- void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void go (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = true;
}
- void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
started_ = false;
@@ -121,7 +121,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
}
@@ -148,7 +147,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
ACE_TRY_NEW_ENV
{
supplier_1->send_event(event ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::Exception, e)
{
@@ -168,10 +166,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
CORBA::NO_MEMORY ());
supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
@@ -187,24 +183,20 @@ int main (int argc, char* argv[])
{
Supplier_Client client;
status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (status == 0)
{
CosNotifyChannelAdmin::EventChannel_var ec =
client.create_event_channel ("MyEventChannel", 0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ORB_ptr orb = client.orb ();
sig_impl.reset( new sig_i( orb ) );
- sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sig_var sig = sig_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -225,7 +217,6 @@ int main (int argc, char* argv[])
if (!CORBA::is_nil (admin.in ()))
{
create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
sig_impl->wait_for_startup();
@@ -233,7 +224,6 @@ int main (int argc, char* argv[])
for (int i = 0; i < max_events; ++i)
{
SendEvent (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
@@ -241,8 +231,7 @@ int main (int argc, char* argv[])
ACE_OS::unlink (ior_output_file);
- ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ec->destroy();
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index b68b1bcbed4..cf6a605897a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -82,8 +82,7 @@ RedGreen_Test::destroy_ec ()
// the EC is still around. So, trap exceptions.
ACE_TRY_NEW_ENV
{
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->ec_->destroy ();
}
ACE_CATCH (CORBA::COMM_FAILURE, ex)
{
@@ -116,40 +115,29 @@ RedGreen_Test::init (int argc,
this->init_ORB (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->resolve_naming_service ();
+ this->resolve_Notify_factory ();
+ this->create_EC ();
+ this->create_supplieradmin ();
+ this->create_consumeradmin ();
+ this->create_consumers ();
+ this->create_suppliers ();
}
void
-RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::run (void)
{
ACE_TRY_NEW_ENV
{
- this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->send_events ();
while (! consumer_is_done)
{
ACE_Time_Value tv(0, 10 * 1000);
this->orb_->run(tv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -157,7 +145,6 @@ RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
worker_.thr_mgr ()->wait ();
}
@@ -178,12 +165,10 @@ RedGreen_Test::init_ORB (int argc,
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::Object_ptr poa_object =
this->orb_->resolve_initial_references("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (poa_object))
{
@@ -194,14 +179,11 @@ RedGreen_Test::init_ORB (int argc,
this->root_poa_ =
PortableServer::POA::_narrow (poa_object
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ root_poa_->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ poa_manager->activate ();
worker_.orb (this->orb_.in ());
@@ -214,12 +196,11 @@ RedGreen_Test::init_ORB (int argc,
}
void
-RedGreen_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
@@ -230,11 +211,10 @@ RedGreen_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RedGreen_Test::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::resolve_Notify_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -243,18 +223,16 @@ RedGreen_Test::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->notify_factory_ =
CosNotifyChannelAdmin::EventChannelFactory::_narrow (
obj.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
}
void
-RedGreen_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -262,13 +240,12 @@ RedGreen_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_supplieradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
@@ -276,13 +253,12 @@ RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
ec_->new_for_suppliers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
}
void
-RedGreen_Test::create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_consumeradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
@@ -290,39 +266,35 @@ RedGreen_Test::create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
ec_->new_for_consumers (this->ifgop_,
adminid
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
}
void
-RedGreen_Test::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_consumers (void)
{
ACE_NEW (this->normal_consumer_,
RedGreen_Test_StructuredPushConsumer (this));
this->normal_consumer_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_NEW (this->slow_consumer_,
SlowConsumer (this));
this->slow_consumer_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RedGreen_Test::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_suppliers (void)
{
ACE_NEW (this->supplier_,
RedGreen_Test_StructuredPushSupplier ());
this->supplier_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::send_events (void)
{
// Setup the Consumer 1 to receive
//event_type : "DOMAIN_GREEN", "DOMAIN_GREEN".
@@ -339,7 +311,6 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
removed_1
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
// Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED"
CosNotification::EventTypeSeq added_2(1);
@@ -355,7 +326,6 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
removed_2
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
// Create the events - one of each type
@@ -388,11 +358,9 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
{
this->supplier_->send_event (red_event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->supplier_->send_event (green_event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -478,8 +446,7 @@ RedGreen_Test_StructuredPushConsumer::connect (
{
// Activate the consumer with the default_POA_.
CosNotifyComm::StructuredPushConsumer_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
consumer_admin->obtain_notification_push_supplier (
@@ -487,7 +454,6 @@ RedGreen_Test_StructuredPushConsumer::connect (
proxy_supplier_id_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -497,21 +463,18 @@ RedGreen_Test_StructuredPushConsumer::connect (
proxysupplier.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
proxy_supplier_->connect_structured_push_consumer (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RedGreen_Test_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test_StructuredPushConsumer::disconnect (void)
{
this->proxy_supplier_->
- disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disconnect_structured_push_supplier ();
}
void
@@ -650,8 +613,7 @@ RedGreen_Test_StructuredPushSupplier::connect (
)
{
CosNotifyComm::StructuredPushSupplier_var objref =
- this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
supplier_admin->obtain_notification_push_consumer (
@@ -659,7 +621,6 @@ RedGreen_Test_StructuredPushSupplier::connect (
proxy_consumer_id_
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
@@ -669,17 +630,15 @@ RedGreen_Test_StructuredPushSupplier::connect (
proxyconsumer.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
proxy_consumer_->connect_structured_push_supplier (objref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-RedGreen_Test_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test_StructuredPushSupplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
@@ -718,13 +677,11 @@ RedGreen_Test_StructuredPushSupplier::send_event (
// any
event.filterable_data[0].value <<= latency_base;
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_hrtime_t end = ACE_OS::gethrtime ();
this->throughput_.sample (end - g_throughput_start_,
end - start);
- ACE_CHECK;
}
void
@@ -759,8 +716,7 @@ Worker::svc (void)
{
ACE_TRY_NEW_ENV
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 480a55ee0b7..3932834dedc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -79,7 +79,7 @@ class RedGreen_Test
ACE_ENV_ARG_DECL);
// Initialize the Client.
- void run (ACE_ENV_SINGLE_ARG_DECL);
+ void run (void);
// Run the demo.
void done (void);
@@ -98,28 +98,28 @@ class RedGreen_Test
ACE_ENV_ARG_DECL);
// Initializes the ORB.
- void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_naming_service (void);
// Try to get hold of a running naming service.
- void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+ void resolve_Notify_factory (void);
// Try to resolve the Notify factory from the Naming service.
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create an EC.
- void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
+ void create_supplieradmin(void);
// Create the Supplier Admin.
- void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
+ void create_consumeradmin (void);
// Create the Consumer Admin.
- void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_consumers (void);
// Create and initialize the consumers.
- void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_suppliers (void);
// create and initialize the suppliers.
- void send_events (ACE_ENV_SINGLE_ARG_DECL);
+ void send_events (void);
// send the events.
// = Data Members.
@@ -180,7 +180,7 @@ class RedGreen_Test_StructuredPushConsumer
// Connect the Consumer to the EventChannel.
// Creates a new proxy supplier and connects to it.
- virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ virtual void disconnect (void);
// Disconnect from the supplier.
CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (
@@ -276,7 +276,7 @@ class RedGreen_Test_StructuredPushSupplier
// Connect the Supplier to the EventChannel.
// Creates a new proxy supplier and connects to it.
- void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+ void disconnect (void);
// Disconnect from the supplier.
virtual void send_event (CosNotification::StructuredEvent& event
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index 25f07f3583e..e5c431eb157 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -16,10 +16,8 @@ main (int argc, char *argv [])
{
client.init (argc, argv
ACE_ENV_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
- client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client.run ();
client.destroy_ec ();
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 020b750ffa5..01b0fbcb6b0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -176,7 +176,6 @@ Throughput_StructuredPushSupplier::svc (void)
this->proxy_->push_structured_event (event
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_hrtime_t end = ACE_OS::gethrtime ();
this->throughput_.sample (end - this->throughput_start_,
@@ -226,18 +225,15 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
Notify_Test_Client::init_ORB (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
#if (TAO_HAS_CORBA_MESSAGING == 1)
CORBA::Object_var manager_object =
orb_->resolve_initial_references ("ORBPolicyManager"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::PolicyManager_var policy_manager =
CORBA::PolicyManager::_narrow (manager_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
CORBA::Any sync_scope;
sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -248,11 +244,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
sync_scope
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
policy_manager->set_policy_overrides (policy_list,
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
#else
ACE_DEBUG ((LM_DEBUG,
"CORBA Messaging disabled in this configuration,"
@@ -269,20 +263,17 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
}
// Create all participents ...
- this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->create_EC ();
CosNotifyChannelAdmin::AdminID adminid;
supplier_admin_ =
ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
consumer_admin_ =
ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -304,11 +295,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
-1);
consumers_[i]->init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
consumers_[i]->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
for (i = 0; i < this->supplier_count_; ++i)
@@ -320,10 +309,8 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
root_poa_.in ()
ACE_ENV_ARG_PARAMETER
);
- ACE_CHECK_RETURN (-1);
suppliers_[i]->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
return 0;
@@ -424,7 +411,7 @@ Notify_Throughput::parse_args(int argc, char *argv[])
}
void
-Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Throughput::create_EC (void)
{
if (this->collocated_ec_ == 1)
{
@@ -440,16 +427,13 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
this->notify_factory_ =
notify_service->create (this->root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
}
else
{
- this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->resolve_naming_service ();
+ this->resolve_Notify_factory ();
}
// A channel name was specified, use that to resolve the service.
@@ -462,12 +446,10 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->naming_context_->resolve (name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
this->ec_ =
CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
else
{
@@ -477,14 +459,13 @@ else
initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Throughput::run_test (void)
{
ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ,"
@@ -509,7 +490,6 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
suppliers_[i]->
TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (suppliers_[i]->ACE_Task_Base::activate (THR_NEW_LWP | THR_JOINABLE) != 0)
{
@@ -532,8 +512,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
if (this->ec_name_.length () == 0) // we are not using a global EC
{
// Destroy the ec.
- this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->ec_->destroy ();
}
// Signal the workers.
@@ -604,10 +583,8 @@ main (int argc, char* argv[])
{
events.init (argc, argv
ACE_ENV_ARG_PARAMETER); //Init the Client
- ACE_TRY_CHECK;
- events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ events.run_test ();
ACE_DEBUG ((LM_DEBUG, "Waiting for threads to exit...\n"));
ACE_Thread_Manager::instance ()->wait ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 802054bd6cf..fe31196fad3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -144,7 +144,7 @@ public:
int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
// initialization.
- void run_test (ACE_ENV_SINGLE_ARG_DECL);
+ void run_test (void);
// Run the test.
void peer_done (void);
@@ -155,7 +155,7 @@ public:
Worker worker_;
protected:
- void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+ void create_EC (void);
// Create participants.
CORBA::Boolean collocated_ec_;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index bfc5efa2dd0..10680104a94 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -34,7 +34,6 @@ Client::init (int argc,
manager_.init (argc,
argv
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Initialize the naming services
if (my_name_client_.init (manager_.orb()) != 0)
@@ -50,11 +49,9 @@ Client::init (int argc,
propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (this->propsetdef_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,63 +64,50 @@ Client::init (int argc,
// Testing the methods of the property service.
int
-Client::property_tester (ACE_ENV_SINGLE_ARG_DECL)
+Client::property_tester (void)
{
// = Testing PropertySet & Iterators.
// Testing define_property () of PropertySet interface.
- this->test_define_property (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_define_property ();
// Test the number of properties.
- this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_number_of_properties ();
// Testing get_all_property_names.
- this->test_get_all_property_names (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_all_property_names ();
// Test get_property_value.
- this->test_get_property_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_property_value ();
// Testing delete property.
this->test_delete_property ("no_property" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Testing get_properties.
- this->test_get_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_properties ();
// Testing delete_properties.
- this->test_delete_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_delete_properties ();
// Test the number of properties.
- this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_number_of_properties ();
// Testing define_properties.
- this->test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_define_properties ();
// Test the number of properties.
- this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_number_of_properties ();
// Testing get_all_property_names.
- this->test_get_all_property_names (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_all_property_names ();
// Testing get_all_properties.
- this->test_get_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_get_all_properties ();
// = Testing PropertySetDef & Iterators.
// Testing define_property_with_mode.
- this->test_define_property_with_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->test_define_property_with_mode ();
return 0;
}
@@ -131,7 +115,7 @@ Client::property_tester (ACE_ENV_SINGLE_ARG_DECL)
// Testing define_property.
int
-Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_define_property (void)
{
CORBA::Any anyval;
@@ -144,7 +128,6 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
this->propsetdef_->define_property ("char_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Prepare a Short and "define" that in the PropertySet.
CORBA::Short s = 3;
@@ -155,7 +138,6 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
propsetdef_->define_property ("short_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Prepare a Long and "define" that in the PropertySet.
CORBA::Long l = 931232;
@@ -166,7 +148,6 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
propsetdef_->define_property ("long_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Prepare a Float and "define" that in the PropertySet.
CORBA::Float f = 3.14F;
@@ -178,7 +159,6 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Prepare a String and "define" that in the PropertySet.
CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
@@ -189,7 +169,6 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -197,12 +176,11 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
// Testing get_all_property_names of the PropertySet.
int
-Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_all_property_names (void)
{
// Get the size.
CORBA::ULong num_of_properties =
- propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ propsetdef_->get_number_of_properties ();
// Get half on the names and half of on the iterator.
CORBA::ULong how_many = num_of_properties / 2;
@@ -221,7 +199,6 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
names_out,
iterator_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Get the values back to var.
names_var = names_out.ptr ();
@@ -250,7 +227,6 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
// Call the function.
CORBA::Boolean next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Get the values back on a _var variable.
CosPropertyService::PropertyName_var name_var = name_out.ptr ();
@@ -261,13 +237,11 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
// Call the function to iterate again.
next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Get the values back on a _var variable.
name_var = name_out.ptr ();
}
- ACE_CHECK_RETURN (-1);
}
}
return 0;
@@ -277,7 +251,7 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
// properties.
int
-Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_properties (void)
{
// Get float_property, string_property and no_property. If return
// value is false and type is tc_void then that name is not there in
@@ -306,7 +280,6 @@ Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
properties_out
ACE_ENV_ARG_PARAMETER);
ACE_UNUSED_ARG (return_val);
- ACE_CHECK_RETURN (-1);
if (TAO_debug_level > 0)
@@ -369,10 +342,9 @@ Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
// Testing, get_number_of_properties.
int
-Client::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_number_of_properties (void)
{
- CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties ();
if (TAO_debug_level > 0)
{
@@ -395,7 +367,6 @@ Client::test_delete_property (const char *property_name
this->propsetdef_->delete_property (property_name_var.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::UserException, ex)
{
@@ -408,7 +379,6 @@ Client::test_delete_property (const char *property_name
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -419,7 +389,7 @@ Client::test_delete_property (const char *property_name
// properties.
int
-Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_delete_properties (void)
{
CosPropertyService::PropertyNames prop_names;
prop_names.length (3);
@@ -429,7 +399,6 @@ Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
// prop_names [3] = CORBA::string_dup ("no_property");
this->propsetdef_->delete_properties (prop_names
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 0);
return 0;
}
@@ -438,7 +407,7 @@ Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
// float in the property set.
int
-Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_define_properties (void)
{
CosPropertyService::Properties nproperties;
nproperties.length (4);
@@ -477,7 +446,6 @@ Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
// Define this sequence of properties now.
this->propsetdef_->define_properties (nproperties ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( -1);
return 0;
}
@@ -485,12 +453,11 @@ Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
// Test get_all_properties.
int
-Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_all_properties (void)
{
// Get the number of current properties.
CORBA::ULong num_of_properties =
- this->propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN ( -1);
+ this->propsetdef_->get_number_of_properties ();
ACE_UNUSED_ARG (num_of_properties);
// Get half on the properties and half of on the iterator.
@@ -506,7 +473,6 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
properties_out,
iterator_out
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( -1);
// Get these values to the _var's.
CosPropertyService::Properties_var properties = properties_out.ptr ();
@@ -569,7 +535,6 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
while (next_one_result != 0)
{
- ACE_CHECK_RETURN ( -1);
ACE_DEBUG ((LM_DEBUG,
"%s : ",
property->property_name.in ()));
@@ -617,7 +582,6 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
// Get the value to the _var variable.
property = property_out.ptr ();
}
- ACE_CHECK_RETURN ( -1);
}
}
return 0;
@@ -626,7 +590,7 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
// Testing define property with mode.
// Defines char, short, long and float properties with different modes.
int
-Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_define_property_with_mode (void)
{
CORBA::Any anyval;
@@ -640,7 +604,6 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
anyval,
CosPropertyService::normal
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Prepare a Short and "define" that in the PropertySet.
CORBA::Short s = 3;
@@ -652,7 +615,6 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
anyval,
CosPropertyService::read_only
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
// Prepare a Long and "define" that in the PropertySet.
CORBA::Long l = 931232;
@@ -664,7 +626,6 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
anyval,
CosPropertyService::fixed_normal
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( -1);
// Prepare a Float and "define" that in the PropertySet.
@@ -676,7 +637,6 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
anyval,
CosPropertyService::fixed_readonly
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( -1);
// Prepare a String and "define" that in the PropertySet.
CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
@@ -687,20 +647,18 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
propsetdef_->define_property ("string_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( -1);
return 0;
}
int
-Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_property_value (void)
{
ACE_TRY
{
// Get the ior property.
CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check whether the IOR is fine.
CORBA::Object_var propsetdef_object;
@@ -709,7 +667,6 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
CosPropertyService::PropertySetDef_var propsetdef =
CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (propsetdef.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -723,7 +680,6 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -740,11 +696,9 @@ main (int argc, char **argv)
argv
ACE_ENV_ARG_PARAMETER) == -1)
return 1;
- ACE_TRY_CHECK;
- // client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- int ret = client.property_tester (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ // client.run ();
+ int ret = client.property_tester ();
if (ret != 0)
ACE_DEBUG ((LM_DEBUG, "Test failed\n"));
else
@@ -757,7 +711,6 @@ main (int argc, char **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 2d0f0760c99..56c94b9de27 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -49,10 +49,10 @@ public:
ACE_ENV_ARG_DECL);
// Initialize the ORB etc, and bind the MMDevices.
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Run the client. This will call StreamCtrl::bind_devs.
- int property_tester (ACE_ENV_SINGLE_ARG_DECL);
+ int property_tester (void);
// Testing the property service methods.
protected:
@@ -63,35 +63,35 @@ protected:
// = Property Testing.
- int test_define_property (ACE_ENV_SINGLE_ARG_DECL);
+ int test_define_property (void);
// Testing the define property method.
- int test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_number_of_properties (void);
// Testing the number of properties, currently in the Property Set.
- int test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_all_property_names (void);
//Testing get_all_property_names.
- int test_get_property_value (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_property_value (void);
// Testing get_property_value.
- int test_get_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_properties (void);
//Testing get_properties. Give the names and get their properties.
- int test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_all_properties (void);
// Testing get_all_properties.
int test_delete_property (const char *property_name
ACE_ENV_ARG_DECL);
// Testing delete_property.
- int test_delete_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_delete_properties (void);
// Testing delete_properties.
- int test_define_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_define_properties (void);
// Defining a sequence of properties.
- int test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL);
+ int test_define_property_with_mode (void);
// Defines properties with various modes.
TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index d9e9a9f2a3e..668cb2909f1 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -40,31 +40,31 @@ public:
~TAO_PropertySet_Tester (void);
// Destructor.
- int test_define_property (ACE_ENV_SINGLE_ARG_DECL);
+ int test_define_property (void);
// Defines a char,a short, a long, a float and a string property.
- int test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_number_of_properties (void);
// Gets the number of properties currently defined in the PropertySet.
int test_delete_property (const char *property_name
ACE_ENV_ARG_DECL);
// Delete a given property.
- int test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL);
+ int test_is_property_defined (void);
// Check the following properties are defined or
// no. "char_property", "short_property" and a "string_property".
- int test_get_property_value (ACE_ENV_SINGLE_ARG_DECL);
+ int test_get_property_value (void);
// Get the "float_property" and "string_property" and print them
// out.
- int test_delete_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_delete_properties (void);
// Delete char, short,long, and string properties.
- int test_delete_all_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_delete_all_properties (void);
// Delete all the properties.
- int test_define_properties (ACE_ENV_SINGLE_ARG_DECL);
+ int test_define_properties (void);
// Define a sequence of properties. a char, a short, a long, a float
// and a string.
@@ -89,11 +89,11 @@ public:
~TAO_PropertyNamesIterator_Tester (void);
// Destructor.
- int test_next_one (ACE_ENV_SINGLE_ARG_DECL);
+ int test_next_one (void);
// Test next one method. Iterate thru all the names in the
// PropertySet and print them out.
- int test_reset (ACE_ENV_SINGLE_ARG_DECL);
+ int test_reset (void);
// Test the reset method.
int test_next_n (size_t n ACE_ENV_ARG_DECL);
@@ -116,7 +116,7 @@ TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
// Defines a char, a short, a long, a float and a string.
int
-TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_define_property (void)
{
ACE_DEBUG ((LM_DEBUG,
"\nChecking define_property\n"));
@@ -134,7 +134,6 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
property_set_.define_property ("char_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
// Prepare a Short and "define" that in the PropertySet.
CORBA::Short s = 3;
@@ -147,7 +146,6 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
property_set_.define_property ("short_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
// Prepare a Long and "define" that in the PropertySet.
@@ -163,7 +161,6 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
property_set_.define_property ("long_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
// Prepare a Float and "define" that in the PropertySet.
CORBA::Float f = 3.14;
@@ -176,7 +173,6 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
property_set_.define_property ("float_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
// Prepare a String and "define" that in the PropertySet.
ACE_DEBUG ((LM_DEBUG,
@@ -192,19 +188,17 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
property_set_.define_property ("string_property",
anyval
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
return 0;
}
// Testing, get_number_of_properties.
int
-TAO_PropertySet_Tester::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_get_number_of_properties (void)
{
ACE_DEBUG ((LM_DEBUG,
"Main : Number of props : %d\n",
- property_set_.get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER)));
- ACE_CHECK_RETURN ( 1);
+ property_set_.get_number_of_properties ()));
return 0;
}
@@ -218,7 +212,6 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name
ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
property_set_.delete_property (property_name
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
return 0;
}
@@ -226,14 +219,13 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name
// Gets the value of "short_property" and "string_property".
int
-TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_get_property_value (void)
{
ACE_DEBUG ((LM_DEBUG,
"\nChecking get_property_value\n"));
CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
// Get the short value.
if (anyptr != 0)
@@ -250,7 +242,6 @@ TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
// Get the string.
anyptr = property_set_.get_property_value ("string_property"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
if (anyptr != 0)
{
CORBA::String str;
@@ -268,7 +259,7 @@ TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
// "string_property" and "char_property".
int
-TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_is_property_defined (void)
{
ACE_DEBUG ((LM_DEBUG,
"\nChecking is_property_defined ()\n"));
@@ -279,7 +270,6 @@ TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
else
ACE_DEBUG ((LM_DEBUG,
"short_property defined\n"));
- ACE_CHECK_RETURN ( 1);
if (property_set_.is_property_defined ("string_property"
ACE_ENV_ARG_PARAMETER) == 0)
ACE_DEBUG ((LM_DEBUG,
@@ -287,7 +277,6 @@ TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
else
ACE_DEBUG ((LM_DEBUG,
"string_property defined\n"));
- ACE_CHECK_RETURN ( 1);
if (property_set_.is_property_defined ("char_property"
ACE_ENV_ARG_PARAMETER) == 0)
ACE_DEBUG ((LM_DEBUG,
@@ -295,7 +284,6 @@ TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
else
ACE_DEBUG ((LM_DEBUG,
"char_property defined\n"));
- ACE_CHECK_RETURN ( 1);
return 0;
}
@@ -304,7 +292,7 @@ TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
// PropertySet. Deleting char, short, long, float and string
// properties.
int
-TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_properties (void)
{
ACE_DEBUG ((LM_DEBUG,
"\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -320,7 +308,6 @@ TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
prop_names.maximum ()));
property_set_.delete_properties (prop_names
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 0);
return 0;
}
@@ -328,7 +315,7 @@ TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
// Defines a sequnce of properties containing, char, short, long,
// float and string property in the property set.
int
-TAO_PropertySet_Tester::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_define_properties (void)
{
ACE_DEBUG ((LM_DEBUG,
"\nChecking define_properties == Defining sequence of properties\n"));
@@ -377,20 +364,18 @@ TAO_PropertySet_Tester::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
// Define this sequence of properties now.
property_set_.define_properties (nproperties ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
return 0;
}
// Delete all the properties.
int
-TAO_PropertySet_Tester::test_delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_all_properties (void)
{
// Deleting all the properties
ACE_DEBUG ((LM_DEBUG,
"\nChecking delete_all_properties\n"));
- int ret = property_set_.delete_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ int ret = property_set_.delete_all_properties ();
if (ret == 1)
ACE_DEBUG ((LM_DEBUG,
"All properties deleted, I guess\n"));
@@ -414,31 +399,28 @@ TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
// Test next one method. Iterate thru all the names in the
// PropertySet and print them out.
int
-TAO_PropertyNamesIterator_Tester::test_next_one (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_next_one (void)
{
CORBA::String_var strvar;
ACE_DEBUG ((LM_DEBUG,
"\nTesting next_one of NamesIterator, Iterating thru names.\n"));
// Let us iterate, now.
int ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
while (ret != 0)
{
ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
}
return 0;
}
// Reset the names iterator.
int
-TAO_PropertyNamesIterator_Tester::test_reset (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_reset (void)
{
ACE_DEBUG ((LM_DEBUG,
"Resetting (reset ()) the NamesIterator."));
- iterator_.reset (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN ( 1);
+ iterator_.reset ();
return 0;
}
@@ -452,7 +434,6 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
"Checking next_n (), next %d\n",
n));
int ret = iterator_.next_n (n, pnames_var.out () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (1);
if (ret == 0)
{
// Return if no more items in the iterator.
@@ -476,7 +457,6 @@ main (int argc, char *argv [])
argv,
"internet"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// = Checking PropertySet interface.
@@ -486,58 +466,45 @@ main (int argc, char *argv [])
// Checking define_property. define a char, a short,a long, a float
// and a string.
- propertyset_tester.test_define_property (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_define_property ();
// Test the number of properties and print it out.
- propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_number_of_properties ();
// Test delete property. Delete "string_property"
propertyset_tester.test_delete_property ("string_property" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Test the number of properties and print it out.
- propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_number_of_properties ();
// Test delete_properties. Delete char, short, long and float.
- propertyset_tester.test_delete_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_delete_properties ();
// Test the number of properties and print it out.
- propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_number_of_properties ();
// Define a sequence of properties. char, short, long, float and
// string.
- propertyset_tester.test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_define_properties ();
// Test the number of properties and print it out.
- propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_number_of_properties ();
// Checking get_property_value. get the value of short and string.
- propertyset_tester.test_get_property_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_property_value ();
// Checking delete_all_properties.
- propertyset_tester.test_delete_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_delete_all_properties ();
// Test the number of properties and print it out.
- propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_number_of_properties ();
// Define a sequence of properties. char, short, long, float and
// string.
- propertyset_tester.test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_define_properties ();
// Test the number of properties and print it out.
- propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propertyset_tester.test_get_number_of_properties ();
// = Checking the PropertyNamesIterator interface.
@@ -548,28 +515,22 @@ main (int argc, char *argv [])
TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester);
// Checking next_one. Iterate thru the property names.
- names_iterator_tester.test_next_one (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ names_iterator_tester.test_next_one ();
// Checking the reset () method.
- names_iterator_tester.test_reset (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ names_iterator_tester.test_reset ();
// Iterating again thru the property names.
- names_iterator_tester.test_next_one (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ names_iterator_tester.test_next_one ();
// Reset again.
- names_iterator_tester.test_reset (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ names_iterator_tester.test_reset ();
// Checking next_n. Prints out all the names it has got.
names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Try next_n without resetting.
names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index bcaeae71a5f..51cea140346 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -36,7 +36,6 @@ main (int argc, char ** argv)
argv,
"child_poa"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Using naming server.
TAO_Naming_Client my_name_client;
@@ -49,8 +48,7 @@ main (int argc, char ** argv)
TAO_PropertySetDef,
-1);
CosPropertyService::PropertySetDef_var propsetdef =
- propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propsetdef_impl->_this ();
CosNaming::Name propsetdef_name (1);
propsetdef_name.length (1);
@@ -58,28 +56,23 @@ main (int argc, char ** argv)
my_name_client->bind (propsetdef_name,
propsetdef.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any any_val;
// Make this IOR as one of the properties in there.
- any_val <<= propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ any_val <<= propsetdef_impl->_this ();
- CORBA::Object_var ior = propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Object_var ior = propsetdef_impl->_this ();
CORBA::Object_ptr ior_ptr = ior.in ();
any_val <<= ior_ptr;
// any_val.replace (CORBA::_tc_Object,
// &ior_ptr,
// 1
// ACE_ENV_ARG_PARAMETER);
- // ACE_TRY_CHECK;
propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
any_val,
CosPropertyService::fixed_readonly
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create PropertySet factory and then register.
TAO_PropertySetFactory *propset_factory_impl;
@@ -87,8 +80,7 @@ main (int argc, char ** argv)
TAO_PropertySetFactory,
-1);
CosPropertyService::PropertySetFactory_var propset_factory =
- propset_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ propset_factory_impl->_this ();
CosNaming::Name propset_factory_name (1);
propset_factory_name.length (1);
@@ -96,11 +88,9 @@ main (int argc, char ** argv)
my_name_client->bind (propset_factory_name,
propset_factory.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run the ORB Event loop.
- m.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ m.run ();
}
ACE_CATCH (CORBA::SystemException, sysex)
{
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index c89d3699c52..00634d96afc 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -160,7 +160,6 @@ int svc(void) {
CORBA::Object_var obj =
orb_->string_to_object ("file://server.ior"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
@@ -173,7 +172,6 @@ int svc(void) {
testSched::Object1_var object1 =
testSched::Object1::_narrow (obj.in ()ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (object1.in ()))
@@ -195,7 +193,6 @@ int svc(void) {
node_,
file_),
CORBA::NO_MEMORY());
- ACE_TRY_CHECK;
// Check to see that the ClientScheduler started correctly
@@ -211,22 +208,18 @@ int svc(void) {
/// Create a Current object so we can check on the priority locally
obj = orb_->resolve_initial_references ("RTCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RTCORBA::Current_var current =
RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Test to make sure the priority model is exposed
CORBA::Policy_var policy =
object1->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RTCORBA::PriorityModelPolicy_var priority_policy =
RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (priority_policy.in ()))
{
@@ -237,8 +230,7 @@ int svc(void) {
/// Test to make sure we are using Server Declared Priority model
RTCORBA::PriorityModel priority_model =
- priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ priority_policy->priority_model ();
if (priority_model != RTCORBA::SERVER_DECLARED)
{
@@ -275,7 +267,6 @@ int svc(void) {
ACE_OS::strcat(client_output_, buf);
do_work(before_);
- ACE_TRY_CHECK;
ACE_OS::sprintf(buf,
@@ -324,7 +315,6 @@ int svc(void) {
"%T\t%s\tClient\tBeginning Activity\n",
activity_));
do_work(before_);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"%T\t%s\tClient\tCalling method1\n",
activity_));
@@ -381,7 +371,6 @@ ACE_TMAIN (int argc, char * argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ORB_Thread ot(orb, argc, argv);
@@ -395,12 +384,10 @@ ACE_TMAIN (int argc, char * argv[])
|| (TAO_MAJOR_VERSION==1 && TAO_MAJOR_VERSION==3 && TAO_MINOR_VERSION > 1)
orb->orb_core ()->orb_params ()->thread_creation_flags ();
- ACE_TRY_CHECK;
#else /* TAO version is 1.3.1 or lower */
orb->orb_core ()->orb_params ()->scope_policy () |
orb->orb_core ()->orb_params ()->sched_policy ();
- ACE_TRY_CHECK;
#endif
ot.activate(flags);
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index dbc60e82c6f..2b29d6cb31b 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -47,8 +47,7 @@ svc(void) {
ACE_TRY
{
- orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb_->run();
}
ACE_CATCHANY
{
@@ -129,23 +128,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
argv,
"testORB"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// get the root poa
CORBA::Object_var object=
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var rootPOA=
PortableServer::POA::_narrow (object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
/// Create a manager for the POA
PortableServer::POAManager_var poa_manager =
- rootPOA->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rootPOA->the_POAManager ();
CORBA::PolicyList poa_policy_list;
poa_policy_list.length (1);
@@ -176,23 +171,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
ACE_NEW_THROW_EX(servant,
Object1_impl(),
CORBA::NO_MEMORY());
- ACE_TRY_CHECK;
PortableServer::ObjectId_var id =
RTPOA->activate_object(servant
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var testObject =
RTPOA->id_to_reference(id.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var testObject_IORString =
orb->object_to_string (testObject.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -223,7 +214,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
}
// Activate the manager and run the event loop
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate ();
// Need to set the main thread pthread scope and pthread policy to
// the values that are specified in svc.conf. This change was
@@ -253,7 +244,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
/// clean up
rootPOA->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 9e767cc7dad..070a8d06e7f 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -48,7 +48,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Sets id.
- CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
+ CORBA::Short id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Gets id.
@@ -66,7 +66,7 @@ My_Test_Object::~My_Test_Object (void)
}
CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return id_;
@@ -197,7 +197,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Create a bunch of objects in one context
// Note: strings to the naming service must be char, not wchar
@@ -215,9 +214,9 @@ main (int argc, ACE_TCHAR **argv)
{
// Instantiate a dummy object and bind it under the new context.
My_Test_Object *impl1 = new My_Test_Object (i+1);
- Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+ Test_Object_var obj1 = impl1->_this ();
ACE_TRY_CHECK_EX(bl_b);
- impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+ impl1->_remove_ref ();
ACE_TRY_CHECK_EX(bl_b);
CosNaming::Name obj_name;
@@ -238,7 +237,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Create a deep context tree
ACE_TRY_EX(bl_c)
@@ -266,7 +264,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Create a wide context tree
ACE_TRY_EX(bl_d)
@@ -292,7 +289,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Delete three selected things, one from each tree
ACE_TRY_EX(bl_e)
@@ -324,7 +320,7 @@ main (int argc, ACE_TCHAR **argv)
ACE_TEXT ("Problems with resolving wide context ")
ACE_TEXT ("- nil object ref.\n")),
-1);
- result_object->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
+ result_object->destroy();
ACE_TRY_CHECK_EX(bl_e);
root_context_1->unbind (wide2 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX(bl_e);
@@ -349,7 +345,7 @@ main (int argc, ACE_TCHAR **argv)
ACE_TEXT ("Problems with resolving deep context ")
ACE_TEXT ("- nil object ref.\n")),
-1);
- result_object->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
+ result_object->destroy();
ACE_TRY_CHECK_EX(bl_e);
root_context_1->unbind (deep ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX(bl_e);
@@ -362,7 +358,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Now use the other name server to access 3 objects next to the
// deleted objects and the 3 deleted objects
@@ -395,7 +390,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_TRY_EX(bl_g)
{
@@ -449,7 +443,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_TRY_EX(bl_i)
{
@@ -532,7 +525,6 @@ main (int argc, ACE_TCHAR **argv)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Redundancy test OK\n")));
return 0;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index a856587a8f7..6dd7b143e86 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -341,11 +341,9 @@ main (int argc, char *argv[])
// Initialize ORB.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -354,14 +352,11 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Initialize the naming services
TAO_Naming_Client my_name_client;
@@ -388,7 +383,6 @@ main (int argc, char *argv[])
config_infos[i].handle =
ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// initialize the RT_Info
ACE_Scheduler_Factory::server ()->
@@ -403,7 +397,6 @@ main (int argc, char *argv[])
config_infos[i].threads,
static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// make operations in second half dependant on
// operations in the first half of the array,
@@ -416,7 +409,6 @@ main (int argc, char *argv[])
2, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
@@ -433,7 +425,6 @@ main (int argc, char *argv[])
infos.out (), deps.out (), configs.out (), anomalies.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::dump_schedule (infos.in (),
deps.in (),
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 23d60c3709c..f23c3b659f6 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -195,11 +195,9 @@ main (int argc, char *argv[])
// Initialize ORB.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -208,11 +206,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Initialize the naming services
TAO_Naming_Client my_name_client;
@@ -239,7 +235,6 @@ main (int argc, char *argv[])
config_infos[i].handle =
ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// initialize the RT_Info
ACE_Scheduler_Factory::server ()->
@@ -254,7 +249,6 @@ main (int argc, char *argv[])
config_infos[i].threads,
static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
@@ -265,7 +259,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// register dependency of consumer that will have unresolved remote
// dependencies on supplier with unresolved remote dependencies
@@ -275,7 +268,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// register dependency of consumer that will have unresolved local
@@ -286,7 +278,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// register dependencies on each supplier of first consumer that will
@@ -297,7 +288,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::server ()->
add_dependency (config_infos[6].handle,
@@ -305,7 +295,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::server ()->
add_dependency (config_infos[6].handle,
@@ -313,7 +302,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Register dependencies on each of the other consumers by second
// consumer that will have both unresolved local and unresolved remote
@@ -324,7 +312,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::server ()->
add_dependency (config_infos[7].handle,
@@ -332,7 +319,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::server ()->
add_dependency (config_infos[7].handle,
@@ -340,7 +326,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::server ()->
add_dependency (config_infos[7].handle,
@@ -348,7 +333,6 @@ main (int argc, char *argv[])
1, // number of calls
RtecBase::ONE_WAY_CALL // type of dependency
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
RtecScheduler::RT_Info_Set_var infos;
RtecScheduler::Dependency_Set_var deps;
@@ -362,7 +346,6 @@ main (int argc, char *argv[])
ACE_SCOPE_THREAD),
infos.out (), deps.out (),
configs.out (), anomalies.out () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_Scheduler_Factory::dump_schedule (infos.in (),
deps.in (),
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 12692c53c26..90b95b32eda 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -26,11 +26,9 @@ main (int argc, char *argv[])
// Initialize ORB.
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil(poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,14 +37,11 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Store a pointer to the local run-time scheduler.
RtecScheduler::Scheduler_ptr runtime_scheduler =
@@ -66,18 +61,15 @@ main (int argc, char *argv[])
ACE_ASSERT (infos [i].handle ==
runtime_scheduler->create (infos [i].entry_point
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
ACE_ASSERT (infos [i].handle ==
runtime_scheduler->lookup (infos [i].entry_point
ACE_ENV_ARG_PARAMETER));
- ACE_TRY_CHECK;
// Make sure the values in the RT_Info returned by get are OK.
delete rt_info;
rt_info = runtime_scheduler->get (infos [i].handle
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (rt_info != 0);
ACE_ASSERT (ACE_OS::strcmp (rt_info->entry_point,
@@ -122,7 +114,6 @@ main (int argc, char *argv[])
infos [i].threads,
static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Make sure the correct priority values are returned.
runtime_scheduler->priority (infos [i].handle,
@@ -130,7 +121,6 @@ main (int argc, char *argv[])
subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (priority == infos [i].priority);
ACE_ASSERT (subpriority == infos [i].static_subpriority);
@@ -140,7 +130,6 @@ main (int argc, char *argv[])
subpriority,
p_priority
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (priority == infos [i].priority);
ACE_ASSERT (subpriority == infos [i].static_subpriority);
@@ -158,7 +147,6 @@ main (int argc, char *argv[])
priority,
dispatching_type
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_ASSERT (priority == configs [j].thread_priority);
ACE_ASSERT (dispatching_type == configs [j].dispatching_type);
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index fb15517f37e..196d9a21348 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -50,11 +50,9 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,11 +61,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Policies for the childPOA to be created.
CORBA::PolicyList policies (1);
@@ -79,7 +75,6 @@ main (int argc, char *argv[])
orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
pol
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create POA as child of RootPOA with the above policies. This POA
// will receive request in the same connection in which it sent
@@ -89,30 +84,25 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of childPOA is over. Destroy the Policy objects.
for (CORBA::ULong i = 0;
i < policies.length ();
++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Server_var server =
Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -131,28 +121,23 @@ main (int argc, char *argv[])
child_poa->activate_object_with_id (id.in (),
&callback_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var callback_object =
child_poa->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Callback_var callback =
Callback::_narrow (callback_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (callback.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client callback activated as <%s>\n", ior.in ()));
// Send the calback object to the server
server->callback_object (callback.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This is a non-portable, but the only currently available way of
// determining the number of currently open connections.
@@ -162,7 +147,6 @@ main (int argc, char *argv[])
// A method to kickstart callbacks from the server
CORBA::Long r =
server->test_method (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (r != 0)
{
@@ -171,8 +155,7 @@ main (int argc, char *argv[])
r));
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// This is a non-portable, but the only currently available way of
// determining the number of currently open connections.
@@ -192,7 +175,6 @@ main (int argc, char *argv[])
}
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 44ddec21390..aaa2535f686 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -47,11 +47,9 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,11 +58,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
// Policies for the childPOA to be created.
CORBA::PolicyList policies (1);
@@ -76,7 +72,6 @@ main (int argc, char *argv[])
orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
pol
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create POA as child of RootPOA with the above policies. This POA
// will receive request in the same connection in which it sent
@@ -86,19 +81,16 @@ main (int argc, char *argv[])
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Creation of childPOA is over. Destroy the Policy objects.
for (CORBA::ULong i = 0;
i < policies.length ();
++i)
{
- policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ policies[i]->destroy ();
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -112,16 +104,13 @@ main (int argc, char *argv[])
child_poa->activate_object_with_id (id.in (),
&server_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj =
child_poa->id_to_reference (id.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server activated as <%s>\n", ior.in ()));
@@ -144,24 +133,20 @@ main (int argc, char *argv[])
// Just process one upcall. We know that we would get the
// clients IOR in that call.
CORBA::Boolean pending =
- orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->work_pending();
if (pending)
{
- orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->perform_work();
}
// Now that hopefully we have the clients IOR, just start
// making remote calls to the client.
- retval = server_impl.call_client (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ retval = server_impl.call_client ();
}
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index af19f459239..806c839695c 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -14,7 +14,7 @@
ACE_RCSID(BiDirectional, test_i, "$Id$")
void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
@@ -55,7 +55,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
}
int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (void)
{
size_t pre_call_connections =
this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
@@ -64,8 +64,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
{
for (int times = 0; times < this->no_iterations_; ++times)
{
- this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->callback_->callback_method ();
size_t cur_connections =
this->orb_->orb_core()->lane_resources().transport_cache().current_size ();
@@ -83,8 +82,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
}
}
- this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ this->callback_->shutdown ();
this->flag_ = 0;
return 1;
@@ -95,7 +93,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index 9cf3cb4977c..7958d4fb10f 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
Callback_i (CORBA::ORB_ptr orb);
// ctor
- void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Safe way to shutdown
- void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+ void callback_method (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// The callback method
@@ -66,10 +66,10 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ int call_client (void);
private:
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index b3910364baf..bfd8c262d0d 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -38,7 +38,6 @@ TX_Object_i::recv (DataSeq_out data
ACE_NEW_THROW_EX (data,
DataSeq,
CORBA::NO_MEMORY ());
- ACE_CHECK;
(*data) = this->data_;
@@ -48,7 +47,7 @@ TX_Object_i::recv (DataSeq_out data
}
void
-TX_Object_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TX_Object_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index 53bc2e447c9..6a998c432c1 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -41,7 +41,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 44eeca19e7d..cd70b917849 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -52,14 +52,12 @@ main (int argc, char *argv[])
argv,
""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (::parse_args (argc, argv) != 0)
return 1;
CORBA::Object_var obj =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -68,7 +66,6 @@ main (int argc, char *argv[])
TX_Object_var txObject =
TX_Object::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DataSeq data_input;
@@ -85,19 +82,16 @@ main (int argc, char *argv[])
data_input.length ()));
txObject->send (data_input ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DataSeq_var data_output;
txObject->recv (data_output.out () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Received octet sequence of length:\t%u\n",
data_output->length ()));
- txObject->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ txObject->shutdown ();
// Sanity check
if (data_output->length () != len
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index a2a09539439..ae3e8436cc3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -50,34 +50,27 @@ main (int argc, char * argv[])
ACE_OS::putenv (env.c_str ());
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poaObj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var rootPoa =
PortableServer::POA::_narrow (poaObj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- rootPoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ rootPoa->the_POAManager ();
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
if (::parse_args (argc, argv) != 0)
return 1;
TX_Object_i implObject (orb.in ());
- TX_Object_var txObject = implObject._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ TX_Object_var txObject = implObject._this ();
CORBA::String_var ior =
orb->object_to_string (txObject.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -94,18 +87,15 @@ main (int argc, char * argv[])
ACE_OS::fclose (output_file);
}
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG,
"\n"
"Event loop finished.\n"));
rootPoa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 2ddfbc0be3d..7d8d96bc98f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -25,7 +25,6 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Get the Root POA.
@@ -33,19 +32,16 @@ main (int argc, char *argv[])
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Get a reference to the server.
//
obj = orb->string_to_object ("file://server.ior"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
{
@@ -61,7 +57,6 @@ main (int argc, char *argv[])
server_var server_obj =
server::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_obj.in ()))
{
@@ -79,48 +74,38 @@ main (int argc, char *argv[])
-1);
PortableServer::ServantBase_var theClient = servant;
- client_var client_ref = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ client_var client_ref = servant->_this ();
//
// Activate the POA manager.
//
PortableServer::POAManager_var mgr =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ mgr->activate ();
//
// Set the server's callback and invoke the test request.
//
server_obj->set_client (client_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
server_obj->test_request ("first secure callback to client"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Repeat the callback test.
//
server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
server_obj->test_request ("second secure callback to client"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- server_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_obj->shutdown ();
poa->destroy (1, 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 881d7d2ca58..ce444768711 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -25,7 +25,6 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, ""
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Get the Root POA.
@@ -33,12 +32,10 @@ main (int argc, char *argv[])
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var poa =
PortableServer::POA::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Create the server, get object reference,
@@ -53,15 +50,12 @@ main (int argc, char *argv[])
PortableServer::ObjectId_var oid =
poa->activate_object (theServer.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var server_obj =
poa->id_to_reference (oid.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var server_IORString =
orb->object_to_string (server_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
//
// Write the IOR to a file.
@@ -79,23 +73,18 @@ main (int argc, char *argv[])
// Activate the POA manager.
//
PortableServer::POAManager_var mgr =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
+ mgr->activate ();
ACE_DEBUG ((LM_INFO,
ACE_TEXT ("(%P) calling orb->run () ...\n")));
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
poa->destroy (1, 1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index f4a66db526f..8b465287492 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -31,7 +31,7 @@ server_i::test_request (const char *msg
}
void
-server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 443bd091a04..262925a1de1 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -38,7 +38,7 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index dd70e280f98..e0f4d7f5d42 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -6,8 +6,8 @@
#include "ace/SString.h"
#include "testC.h"
-ACE_RCSID (Send_File,
- client,
+ACE_RCSID (Send_File,
+ client,
"$Id$")
const char *ior = "file://test.ior";
@@ -60,18 +60,15 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Simple_Server_var server =
Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -111,7 +108,6 @@ main (int argc, char *argv[])
ACE_OS::sleep (wait_time);
}
ACE_ENDTRY;
- ACE_TRY_CHECK;
}
if (call_shutdown)
@@ -123,13 +119,11 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG,
"CLIENT (%P): Calling shutdown...\n"));
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
}
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
ACE_DEBUG ((LM_DEBUG,
"CLIENT (%P): Done.\n"));
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index c880f1e4858..1b7a35667d1 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -6,8 +6,8 @@
#include "ace/SString.h"
#include "test_i.h"
-ACE_RCSID (Send_File,
- server,
+ACE_RCSID (Send_File,
+ server,
"$Id$")
const char *ior_output_file = 0;
@@ -51,11 +51,9 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -64,11 +62,9 @@ main (int argc, char *argv[])
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -81,39 +77,32 @@ main (int argc, char *argv[])
policies[0] =
root_poa->create_id_assignment_policy (PortableServer::USER_ID
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
policies[1] =
root_poa->create_lifespan_policy (PortableServer::PERSISTENT
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var persistent_poa =
root_poa->create_POA ("PersistentPOA",
poa_manager.in (),
policies
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::ObjectId_var oid =
PortableServer::string_to_ObjectId ("object1");
- ACE_TRY_CHECK;
persistent_poa->activate_object_with_id (oid.in (),
&server_impl
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var server =
persistent_poa->create_reference_with_id (oid.in (),
"IDL:Simple_Server:1.0"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
@@ -140,19 +129,15 @@ main (int argc, char *argv[])
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "SERVER (%P): Event loop finished.\n"));
persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::sleep (1);
}
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 22b1fd18f1e..560668426b3 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -6,8 +6,8 @@
#include "test_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Send_File,
- test_i,
+ACE_RCSID (Send_File,
+ test_i,
"$Id$")
void
@@ -33,7 +33,7 @@ Simple_Server_i::send_line (const char *
}
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index f0c4aa7be58..76894de600f 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -35,7 +35,7 @@ public:
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index ea6e49c399d..601cc34cbfa 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
}
void
-Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Worker::validate_connection (void)
{
// Ping the object 100 times, ignoring all exceptions.
// It would be better to use validate_connection() but the test must
@@ -21,8 +21,7 @@ Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
- this->server_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->server_->ping ();
if(TAO_debug_level > 0)
ACE_DEBUG (( LM_DEBUG,
@@ -43,16 +42,13 @@ Client_Worker::svc (void)
ACE_TRY
{
// Validate connections befire doing any actual work..
- this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->validate_connection ();
- this->server_->validate_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->server_->validate_protocol ();
for (int i = 0; i < this->niterations_; ++i)
{
this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index c1f1015fb1b..85099621dfa 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -43,7 +43,7 @@ public:
// thread entry point
private:
- void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void validate_connection (void);
// Validate the connection
private:
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index cad95255acd..1bf51007b38 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -12,8 +12,7 @@ Server_Worker::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 5da628db89d..7266e19efd8 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -59,7 +59,6 @@ main (int argc, char *argv[])
// Initialize the ORB
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -67,12 +66,10 @@ main (int argc, char *argv[])
// Get Object Reference using IOR file
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Cast to Appropriate Type
Simple_Server_var server =
Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -97,13 +94,11 @@ main (int argc, char *argv[])
// Shut down the server if -x option given in command line
if (do_shutdown)
{
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
}
// Destroying the ORB..
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index 29c53ecb7b8..b53457045e5 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -47,11 +47,9 @@ main (int argc, char *argv[])
// Initialize the ORB
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,11 +59,9 @@ main (int argc, char *argv[])
// Get a Root POA reference
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
Simple_Server_i server_impl (orb.in ());
Simple_Server_var server =
- server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_impl._this ();
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -95,8 +89,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
Server_Worker worker (orb.in ());
if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 731adae0864..9df35c7e625 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -17,14 +17,14 @@ ACE_RCSID (MT_IIOP_SSL,
"$Id$")
void
-Simple_Server_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::ping (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return;
}
void
-Simple_Server_i::validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::validate_protocol (void)
ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
CORBA::SystemException))
{
@@ -84,7 +84,7 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
}
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index 55a89d5ebf9..61e2dab7631 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -31,17 +31,17 @@ public:
// ctor
// = The Simple_Server methods.
- void ping (ACE_ENV_SINGLE_ARG_DECL)
+ void ping (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- void validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
+ void validate_protocol (void)
ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
CORBA::SystemException));
CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 82fe2335212..3c3da5a345f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -13,7 +13,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
}
void
-Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Worker::validate_connection (void)
{
// Ping the object 100 times, ignoring all exceptions.
// It would be better to use validate_connection() but the test must
@@ -25,7 +25,6 @@ Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
{
this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
this->another_->test_method (j ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if(TAO_debug_level > 0)
ACE_DEBUG (( LM_DEBUG,
"******** VALIDATED ******* \n"));
@@ -45,14 +44,12 @@ Client_Worker::svc (void)
ACE_TRY
{
// Validate connections befire doing any actual work..
- this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->validate_connection ();
for (int i = 0; i < this->niterations_; ++i)
{
this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
this->another_->test_method (i ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index daae1a99760..1d56173a596 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -45,7 +45,7 @@ public:
// thread entry point
private:
- void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+ void validate_connection (void);
// Validate the connection
private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index cad95255acd..1bf51007b38 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -12,8 +12,7 @@ Server_Worker::svc (void)
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orb_->run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 8ef6242213a..e00d7011f09 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -61,7 +61,6 @@ main (int argc, char *argv[])
// Initialize the ORB
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -75,12 +74,10 @@ main (int argc, char *argv[])
// Get Object Reference using IOR file
CORBA::Object_var object =
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Cast to Appropriate Type
Simple_Server_var server =
Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -92,12 +89,10 @@ main (int argc, char *argv[])
object =
orb->string_to_object (another_ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Cast to Appropriate Type
Another_One_var another =
Another_One::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Client_Worker client (server.in (),
@@ -117,13 +112,11 @@ main (int argc, char *argv[])
// Shut down the server if -x option given in command line
if (do_shutdown)
{
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->shutdown ();
}
// Destroying the ORB..
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index b05e356507c..32d72ed2c6f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -68,11 +68,9 @@ main (int argc, char *argv[])
// Initialize the ORB
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,11 +80,9 @@ main (int argc, char *argv[])
// Get a Root POA reference
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -95,20 +91,16 @@ main (int argc, char *argv[])
Another_One_i another_one_impl (orb.in());
Simple_Server_var server =
- server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_impl._this ();
Another_One_var another_one =
- another_one_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ another_one_impl._this ();
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::String_var another_ior =
orb->object_to_string (another_one.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -118,11 +110,9 @@ main (int argc, char *argv[])
{
CORBA::Object_var table_object =
orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
IORTable::Table_var adapter =
IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
if (CORBA::is_nil (adapter.in ()))
{
@@ -132,7 +122,6 @@ main (int argc, char *argv[])
adapter->bind ( ior_table_name, ior.in () ACE_ENV_ARG_PARAMETER);
adapter->bind ( another_table_name, another_ior.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
}
@@ -161,8 +150,7 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
Server_Worker worker (orb.in ());
if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index 5c589569d8d..8d988a4ea52 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -23,7 +23,7 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
}
void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 8982498679c..58f4a15a2fb 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -34,7 +34,7 @@ public:
CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index e7fb1763591..97c36d401e3 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -18,17 +18,15 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
}
void
-Foo_i::baz (ACE_ENV_SINGLE_ARG_DECL)
+Foo_i::baz (void)
ACE_THROW_SPEC ((CORBA::SystemException,
Foo::Bar::NoSecurityAttributes))
{
SecurityLevel3::ClientCredentials_var credentials =
- this->current_->client_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->current_->client_credentials ();
CORBA::String_var id =
- credentials->creds_id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ credentials->creds_id ();
ACE_DEBUG ((LM_DEBUG,
"\n"
@@ -39,7 +37,7 @@ Foo_i::baz (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Foo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Foo_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index c6acd255e3e..4fc3d00a03d 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -27,11 +27,11 @@ public:
SecurityLevel3::SecurityCurrent_ptr current);
/// Test method.
- virtual void baz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void baz (void)
ACE_THROW_SPEC ((CORBA::SystemException,
Foo::Bar::NoSecurityAttributes));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 40877b8871f..175ab0e5f35 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -30,7 +30,6 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
orb->create_policy (Security::SecQOPPolicy,
no_protection
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CORBA::PolicyList policy_list (1);
policy_list.length (1);
@@ -42,11 +41,9 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
obj->_set_policy_overrides (policy_list,
CORBA::SET_OVERRIDE
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
Foo::Bar_var server =
Foo::Bar::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -62,8 +59,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
{
// This invocation should result in a CORBA::NO_PERMISSION
// exception.
- server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server->baz ();
}
ACE_CATCH (CORBA::NO_PERMISSION, exc)
{
@@ -74,7 +70,6 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
return;
}
ACE_ENDTRY;
- ACE_CHECK;
ACE_ERROR ((LM_ERROR,
"(%P|%t) ERROR: CORBA::NO_PERMISSION was not thrown.\n"
@@ -89,7 +84,6 @@ secure_invocation_test (CORBA::Object_ptr object
{
Foo::Bar_var server =
Foo::Bar::_narrow (object ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (CORBA::is_nil (server.in ()))
{
@@ -102,11 +96,9 @@ secure_invocation_test (CORBA::Object_ptr object
}
// This invocation should return successfully.
- server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ server->baz ();
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ server->shutdown ();
}
int
@@ -145,14 +137,12 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
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 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This test sets creates a Security::QOPPolicy with the
// Quality-of-Protection set to "no protection." It then
@@ -161,17 +151,14 @@ main (int argc, char *argv[])
//
// The server is not shutdown by this test.
insecure_invocation_test (orb.in (), object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// This test uses the default secure SSLIOP settings to securely
// invoke a method on the server. No exception should occur.
//
// The server *is* shutdown by this test.
secure_invocation_test (object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 8b7ff656577..26c16044238 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -48,11 +48,9 @@ main (int argc, char *argv[])
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var obj =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -62,11 +60,9 @@ main (int argc, char *argv[])
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 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -74,12 +70,10 @@ main (int argc, char *argv[])
obj =
orb->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
SecurityLevel3::SecurityCurrent_var security_current =
SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (security_current.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -97,21 +91,18 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer (server_impl);
Foo::Bar_var server =
- server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_impl->_this ();
// Sanity check on SSLIOP profile equivalence.
// Since the POA is reference counting the servants, this
// implementation must still exist when the POA is destroyed.
Foo_i server_impl2 (orb.in (), security_current.in ());
Foo::Bar_var server2 =
- server_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ server_impl2._this ();
const CORBA::Boolean equivalent =
server->_is_equivalent (server2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (equivalent)
{
@@ -122,7 +113,6 @@ main (int argc, char *argv[])
CORBA::String_var ior =
orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -139,21 +129,17 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG,
"\n"
"Event loop finished.\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index 904a68a489b..c6c1677e504 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -45,7 +45,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Sets id.
- CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
+ CORBA::Short id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Gets id.
@@ -63,7 +63,7 @@ My_Test_Object::~My_Test_Object (void)
}
CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return id_;
@@ -212,10 +212,8 @@ CosNaming_Client::init (int argc, char **argv)
this->orbmgr_.init (this->argc_,
this->argv_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orbmgr_.activate_poa_manager ();
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -267,7 +265,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
if (name_service.in () == 0)
return -1;
@@ -298,7 +295,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Resolve the object from the Naming Context.
ACE_TRY_EX (RESOLVE)
@@ -315,7 +311,7 @@ MT_Test::svc (void)
if (!CORBA::is_nil (result_object.in ()))
{
- CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Short id = result_object->id ();
ACE_TRY_CHECK_EX (RESOLVE);
if (id == CosNaming_Client::OBJ1_ID)
@@ -334,7 +330,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Unbind the object from the Naming Context.
ACE_TRY_EX (UNBIND)
@@ -356,7 +351,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -377,11 +371,9 @@ MT_Test::execute (TAO_Naming_Client &root_context)
ACE_TRY
{
test_ref_ =
- test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_this ();
- test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_remove_ref ();
// Get the IOR for the Naming Service. Each thread can use it
// in <string_to_object> to create its own stub for the Naming
@@ -395,7 +387,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
name_service_ior_ =
orb_->object_to_string (context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -404,7 +395,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Create a name for dummy.
test_name_.length (1);
@@ -430,12 +420,10 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
// Dummy object instantiation.
My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
Test_Object_var test_obj_ref =
- test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_this ();
// Give ownership of this object to POA.
- test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_remove_ref ();
// Bind an object to the Naming Context.
CosNaming::Name test_name;
@@ -444,7 +432,6 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
root_context->bind (test_name,
test_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Bound name OK\n"));
@@ -452,15 +439,12 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
CORBA::Object_var result_obj_ref =
root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_Object_var result_object =
Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (result_object.in ()))
{
- CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short id = result_object->id ();
if (id == CosNaming_Client::OBJ1_ID)
ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
}
@@ -468,7 +452,6 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
// Unbind the object from the Naming Context.
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Unbound name OK\n"));
}
@@ -478,7 +461,6 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -499,27 +481,22 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
CosNaming::NamingContext_var level1_context;
level1_context = root_context->bind_new_context (level1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create a new context.
CosNaming::NamingContext_var level2_context;
- level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ level2_context = root_context->new_context ();
// Instantiate a dummy object and bind it under the new context.
My_Test_Object *impl1 =
new My_Test_Object (CosNaming_Client::OBJ1_ID);
- Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj1 = impl1->_this ();
+ impl1->_remove_ref ();
CosNaming::Name obj_name;
obj_name.length (1);
obj_name[0].id = CORBA::string_dup ("foo");
level2_context->bind (obj_name, obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind the context we just created under level1.
CosNaming::Name level2 (level1);
@@ -528,7 +505,6 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
root_context->bind_context (level2,
level2_context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Resolve and unbind level1/level2/foo, and bind it back.
CosNaming::Name test_name (level2);
@@ -537,19 +513,16 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
CORBA::Object_var result_obj_ref =
root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_Object_var result_object =
Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (result_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
"Problems with resolving foo in Tree Test - nil object ref.\n"),
-1);
- CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short id = result_object->id ();
if (id != CosNaming_Client::OBJ1_ID)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -560,36 +533,28 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
// in.
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (test_name,
obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create new context and rebind under the name level1/level2.
CosNaming::NamingContext_var new_level2_context;
new_level2_context =
- root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_context->new_context ();
root_context->rebind_context (level2,
new_level2_context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind, resolve, rebind, and resolve foo under level1/level2.
root_context->bind (test_name,
obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_obj_ref = root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_object = Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short obj_id = result_object->id ();
if (CORBA::is_nil (result_object.in ())
|| !(obj_id == CosNaming_Client::OBJ1_ID))
@@ -599,25 +564,19 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
My_Test_Object *impl2 =
new My_Test_Object (CosNaming_Client::OBJ2_ID);
- Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj2 = impl2->_this ();
- impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl2->_remove_ref ();
root_context->rebind (test_name,
obj2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_obj_ref = root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_object = Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ obj_id = result_object->id ();
if (CORBA::is_nil (result_object.in ())
|| !( obj_id == CosNaming_Client::OBJ2_ID))
@@ -633,7 +592,6 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"All functions work properly \n"));
@@ -655,19 +613,15 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
CosNaming::NamingContext_var level1_context;
level1_context = root_context->bind_new_context (context_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
context_name[0].id = CORBA::string_dup ("level2_context");
CosNaming::NamingContext_var level2_context;
level2_context = level1_context->bind_new_context (context_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind a dummy object foo under each context.
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
CosNaming::Name object_name;
object_name.length (1);
@@ -675,35 +629,26 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
root_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
level1_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
level2_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run exceptions tests.
invalid_name_test (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
already_bound_test (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
already_bound_test2 (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
not_found_test (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
not_found_test2 (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
not_found_test3 (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -711,7 +656,6 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -727,7 +671,6 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
@@ -741,7 +684,6 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -754,15 +696,12 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
test_name.length (1);
test_name[0].id = CORBA::string_dup ("foo");
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
root_context->bind (test_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
@@ -777,7 +716,6 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -791,15 +729,12 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
test_name[0].id = CORBA::string_dup ("level1_context");
test_name[1].id = CORBA::string_dup ("foo");
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
root_context->bind (test_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
@@ -813,7 +748,6 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -830,7 +764,6 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -852,7 +785,6 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -869,7 +801,6 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -894,7 +825,6 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -910,7 +840,6 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
test_name[2].id = CORBA::string_dup ("foo");
root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -934,7 +863,6 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
@@ -945,10 +873,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
{
// Instantiate four dummy objects.
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
// Bind objects to the naming context.
CosNaming::Name name1;
@@ -966,19 +892,15 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
root_context->bind (name1,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (name2,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (name3,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (name4,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// List the content of the Naming Context.
CosNaming::BindingIterator_var iter;
@@ -987,7 +909,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
bindings_list.out (),
iter.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (iter.in ())
|| bindings_list->length () != 1
|| bindings_list[0u].binding_type != CosNaming::nobject)
@@ -1002,7 +923,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
CosNaming::Binding_var binding;
iter->next_one (binding.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (binding->binding_type != CosNaming::nobject)
ACE_ERROR_RETURN ((LM_ERROR,
"CosNaming::next_one does not function properly\n"),
@@ -1012,7 +932,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
binding->binding_name[0].id.in ()));
iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (bindings_list->length () != 2
|| bindings_list[0u].binding_type != CosNaming::nobject
|| bindings_list[1u].binding_type != CosNaming::nobject)
@@ -1029,13 +948,11 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
// should return false.
CORBA::Boolean result = iter->next_one (binding.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result)
ACE_ERROR_RETURN ((LM_ERROR,
"CosNaming::BindingIterator does not function properly\n"),
-1);
- iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ iter->destroy ();
}
ACE_CATCHANY
{
@@ -1043,7 +960,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -1057,15 +973,12 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
// Create a context and bind an object under it.
CosNaming::NamingContext_var my_context;
- my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ my_context = root_context->new_context ();
// Bind a dummy object foo under my_context.
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
CosNaming::Name object_name;
object_name.length (1);
@@ -1073,21 +986,16 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
my_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Do the testing.
not_empty_test (my_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ my_context->destroy ();
not_exist_test (my_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -1096,7 +1004,6 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -1107,8 +1014,7 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
{
ACE_TRY
{
- ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ref->destroy ();
}
ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
@@ -1117,7 +1023,6 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
"NotEmpty exception works properly\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -1126,8 +1031,7 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
{
ACE_TRY
{
- ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ref->destroy ();
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -1136,7 +1040,6 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
"Destroy works properly\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
}
Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
@@ -1165,19 +1068,16 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
CosNaming::NamingContext_var level1_context =
root_context->bind_new_context (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create and bind a naming context under <level1> context.
test_name[0].id = CORBA::string_dup ("level2");
CosNaming::NamingContext_var level2_context =
level1_context->bind_new_context (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Log the ior of <level1_context> for use by <Persistent_Test_End>.
CORBA::String_var ior =
orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::fprintf (this->file_,
"%s",
@@ -1193,7 +1093,6 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -1224,11 +1123,9 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
// for <level1> Naming Context to Naming Context reference.
CORBA::Object_var obj =
orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var level1_context =
CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (level1_context.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -1238,7 +1135,6 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
// Resolve for <level2> context through the persistent ior we
// got from part 1 of this test.
obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now, resolve for <level2> context using the <root> context
// reference which we obtained through <resolve_initial_references>.
@@ -1247,7 +1143,6 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
test_name[1].id = CORBA::string_dup ("level2");
CORBA::Object_var obj2 =
root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Make sure we got the same answer through both methods.
if (obj2->_is_equivalent (obj.in ()))
@@ -1260,7 +1155,6 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 904a68a489b..c6c1677e504 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -45,7 +45,7 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException));
// Sets id.
- CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
+ CORBA::Short id (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// Gets id.
@@ -63,7 +63,7 @@ My_Test_Object::~My_Test_Object (void)
}
CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return id_;
@@ -212,10 +212,8 @@ CosNaming_Client::init (int argc, char **argv)
this->orbmgr_.init (this->argc_,
this->argv_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ this->orbmgr_.activate_poa_manager ();
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -267,7 +265,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
if (name_service.in () == 0)
return -1;
@@ -298,7 +295,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Resolve the object from the Naming Context.
ACE_TRY_EX (RESOLVE)
@@ -315,7 +311,7 @@ MT_Test::svc (void)
if (!CORBA::is_nil (result_object.in ()))
{
- CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Short id = result_object->id ();
ACE_TRY_CHECK_EX (RESOLVE);
if (id == CosNaming_Client::OBJ1_ID)
@@ -334,7 +330,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Unbind the object from the Naming Context.
ACE_TRY_EX (UNBIND)
@@ -356,7 +351,6 @@ MT_Test::svc (void)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -377,11 +371,9 @@ MT_Test::execute (TAO_Naming_Client &root_context)
ACE_TRY
{
test_ref_ =
- test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_this ();
- test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_remove_ref ();
// Get the IOR for the Naming Service. Each thread can use it
// in <string_to_object> to create its own stub for the Naming
@@ -395,7 +387,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
name_service_ior_ =
orb_->object_to_string (context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -404,7 +395,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
// Create a name for dummy.
test_name_.length (1);
@@ -430,12 +420,10 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
// Dummy object instantiation.
My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
Test_Object_var test_obj_ref =
- test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_this ();
// Give ownership of this object to POA.
- test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_obj_impl->_remove_ref ();
// Bind an object to the Naming Context.
CosNaming::Name test_name;
@@ -444,7 +432,6 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
root_context->bind (test_name,
test_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Bound name OK\n"));
@@ -452,15 +439,12 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
CORBA::Object_var result_obj_ref =
root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_Object_var result_object =
Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (!CORBA::is_nil (result_object.in ()))
{
- CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short id = result_object->id ();
if (id == CosNaming_Client::OBJ1_ID)
ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
}
@@ -468,7 +452,6 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
// Unbind the object from the Naming Context.
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"Unbound name OK\n"));
}
@@ -478,7 +461,6 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -499,27 +481,22 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
CosNaming::NamingContext_var level1_context;
level1_context = root_context->bind_new_context (level1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create a new context.
CosNaming::NamingContext_var level2_context;
- level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ level2_context = root_context->new_context ();
// Instantiate a dummy object and bind it under the new context.
My_Test_Object *impl1 =
new My_Test_Object (CosNaming_Client::OBJ1_ID);
- Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj1 = impl1->_this ();
+ impl1->_remove_ref ();
CosNaming::Name obj_name;
obj_name.length (1);
obj_name[0].id = CORBA::string_dup ("foo");
level2_context->bind (obj_name, obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind the context we just created under level1.
CosNaming::Name level2 (level1);
@@ -528,7 +505,6 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
root_context->bind_context (level2,
level2_context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Resolve and unbind level1/level2/foo, and bind it back.
CosNaming::Name test_name (level2);
@@ -537,19 +513,16 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
CORBA::Object_var result_obj_ref =
root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
Test_Object_var result_object =
Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (result_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
"Problems with resolving foo in Tree Test - nil object ref.\n"),
-1);
- CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short id = result_object->id ();
if (id != CosNaming_Client::OBJ1_ID)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -560,36 +533,28 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
// in.
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (test_name,
obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create new context and rebind under the name level1/level2.
CosNaming::NamingContext_var new_level2_context;
new_level2_context =
- root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_context->new_context ();
root_context->rebind_context (level2,
new_level2_context.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind, resolve, rebind, and resolve foo under level1/level2.
root_context->bind (test_name,
obj1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_obj_ref = root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_object = Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short obj_id = result_object->id ();
if (CORBA::is_nil (result_object.in ())
|| !(obj_id == CosNaming_Client::OBJ1_ID))
@@ -599,25 +564,19 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
My_Test_Object *impl2 =
new My_Test_Object (CosNaming_Client::OBJ2_ID);
- Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj2 = impl2->_this ();
- impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ impl2->_remove_ref ();
root_context->rebind (test_name,
obj2.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_obj_ref = root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
result_object = Test_Object::_narrow (result_obj_ref.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ obj_id = result_object->id ();
if (CORBA::is_nil (result_object.in ())
|| !( obj_id == CosNaming_Client::OBJ2_ID))
@@ -633,7 +592,6 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
ACE_DEBUG ((LM_DEBUG,
"All functions work properly \n"));
@@ -655,19 +613,15 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
CosNaming::NamingContext_var level1_context;
level1_context = root_context->bind_new_context (context_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
context_name[0].id = CORBA::string_dup ("level2_context");
CosNaming::NamingContext_var level2_context;
level2_context = level1_context->bind_new_context (context_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind a dummy object foo under each context.
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
CosNaming::Name object_name;
object_name.length (1);
@@ -675,35 +629,26 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
root_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
level1_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
level2_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run exceptions tests.
invalid_name_test (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
already_bound_test (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
already_bound_test2 (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
not_found_test (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
not_found_test2 (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
not_found_test3 (root_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -711,7 +656,6 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -727,7 +671,6 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
root_context->resolve (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
@@ -741,7 +684,6 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -754,15 +696,12 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
test_name.length (1);
test_name[0].id = CORBA::string_dup ("foo");
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
root_context->bind (test_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
@@ -777,7 +716,6 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -791,15 +729,12 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
test_name[0].id = CORBA::string_dup ("level1_context");
test_name[1].id = CORBA::string_dup ("foo");
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
root_context->bind (test_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
@@ -813,7 +748,6 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -830,7 +764,6 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -852,7 +785,6 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -869,7 +801,6 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
root_context->unbind (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -894,7 +825,6 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -910,7 +840,6 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
test_name[2].id = CORBA::string_dup ("foo");
root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
}
ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -934,7 +863,6 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
int
@@ -945,10 +873,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
{
// Instantiate four dummy objects.
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
// Bind objects to the naming context.
CosNaming::Name name1;
@@ -966,19 +892,15 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
root_context->bind (name1,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (name2,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (name3,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
root_context->bind (name4,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// List the content of the Naming Context.
CosNaming::BindingIterator_var iter;
@@ -987,7 +909,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
bindings_list.out (),
iter.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (iter.in ())
|| bindings_list->length () != 1
|| bindings_list[0u].binding_type != CosNaming::nobject)
@@ -1002,7 +923,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
CosNaming::Binding_var binding;
iter->next_one (binding.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (binding->binding_type != CosNaming::nobject)
ACE_ERROR_RETURN ((LM_ERROR,
"CosNaming::next_one does not function properly\n"),
@@ -1012,7 +932,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
binding->binding_name[0].id.in ()));
iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (bindings_list->length () != 2
|| bindings_list[0u].binding_type != CosNaming::nobject
|| bindings_list[1u].binding_type != CosNaming::nobject)
@@ -1029,13 +948,11 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
// should return false.
CORBA::Boolean result = iter->next_one (binding.out ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (result)
ACE_ERROR_RETURN ((LM_ERROR,
"CosNaming::BindingIterator does not function properly\n"),
-1);
- iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ iter->destroy ();
}
ACE_CATCHANY
{
@@ -1043,7 +960,6 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -1057,15 +973,12 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
// Create a context and bind an object under it.
CosNaming::NamingContext_var my_context;
- my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ my_context = root_context->new_context ();
// Bind a dummy object foo under my_context.
My_Test_Object *impl = new My_Test_Object;
- Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ Test_Object_var obj = impl->_this ();
+ impl->_remove_ref ();
CosNaming::Name object_name;
object_name.length (1);
@@ -1073,21 +986,16 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
my_context->bind (object_name,
obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Do the testing.
not_empty_test (my_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ my_context->destroy ();
not_exist_test (my_context
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -1096,7 +1004,6 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -1107,8 +1014,7 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
{
ACE_TRY
{
- ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ref->destroy ();
}
ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
@@ -1117,7 +1023,6 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
"NotEmpty exception works properly\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
}
void
@@ -1126,8 +1031,7 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
{
ACE_TRY
{
- ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ref->destroy ();
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -1136,7 +1040,6 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
"Destroy works properly\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
}
Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
@@ -1165,19 +1068,16 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
CosNaming::NamingContext_var level1_context =
root_context->bind_new_context (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Create and bind a naming context under <level1> context.
test_name[0].id = CORBA::string_dup ("level2");
CosNaming::NamingContext_var level2_context =
level1_context->bind_new_context (test_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Log the ior of <level1_context> for use by <Persistent_Test_End>.
CORBA::String_var ior =
orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_OS::fprintf (this->file_,
"%s",
@@ -1193,7 +1093,6 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -1224,11 +1123,9 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
// for <level1> Naming Context to Naming Context reference.
CORBA::Object_var obj =
orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosNaming::NamingContext_var level1_context =
CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (level1_context.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -1238,7 +1135,6 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
// Resolve for <level2> context through the persistent ior we
// got from part 1 of this test.
obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Now, resolve for <level2> context using the <root> context
// reference which we obtained through <resolve_initial_references>.
@@ -1247,7 +1143,6 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
test_name[1].id = CORBA::string_dup ("level2");
CORBA::Object_var obj2 =
root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Make sure we got the same answer through both methods.
if (obj2->_is_equivalent (obj.in ()))
@@ -1260,7 +1155,6 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 9a8d23a4996..a0cab560b86 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -37,9 +37,8 @@ Client_i::test_for_secure_universal_time (void)
ACE_TRY
{
CosTime::UTO_var UTO_server =
- this->clerk_->secure_universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->clerk_->secure_universal_time ();
- ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -62,9 +61,8 @@ Client_i::test_for_universal_time (void)
ACE_TRY
{
CosTime::UTO_var UTO_server =
- this->clerk_->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->clerk_->universal_time ();
- ACE_TRY_CHECK;
#ifndef ACE_LACKS_LONGLONG_T
ACE_DEBUG ((LM_DEBUG,
@@ -90,7 +88,6 @@ Client_i::test_for_universal_time (void)
(UTO_server->utc_time ()).tdf));
#endif
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -119,15 +116,14 @@ Client_i::test_for_new_universal_time (void)
tdf
ACE_ENV_ARG_PARAMETER);
- ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
- ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == 9999);
- ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+ ACE_ASSERT (UTO_server->time () == 999999999);
+ ACE_ASSERT (UTO_server->inaccuracy () == 9999);
+ ACE_ASSERT (UTO_server->tdf () == 99);
+ ACE_ASSERT ((UTO_server->utc_time ()).time == 999999999);
+ ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 0);
+ ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 9999);
+ ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -156,21 +152,19 @@ Client_i::test_for_uto_from_utc (void)
{
CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
inaccuracy <<= 32;
inaccuracy |= utc_struct.inacclo;
- ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
- ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
- ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
- ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+ ACE_ASSERT (UTO_server->time () == 999999999);
+ ACE_ASSERT (UTO_server->inaccuracy () == inaccuracy);
+ ACE_ASSERT (UTO_server->tdf () == 99);
+ ACE_ASSERT ((UTO_server->utc_time ()).time == 999999999);
+ ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 50);
+ ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 50);
+ ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -197,10 +191,9 @@ Client_i::test_for_new_interval (void)
upper
ACE_ENV_ARG_PARAMETER);
- ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
- ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
+ ACE_ASSERT ((TIO_server->time_interval ()).lower_bound == 666666666);
+ ACE_ASSERT ((TIO_server->time_interval ()).upper_bound == 999999999);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -361,11 +354,9 @@ Client_i::obtain_initial_references (void)
CORBA::Object_var temp_object =
my_name_client_->resolve (clerk_name
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
clerk_ = CosTime::TimeService::_narrow (temp_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (clerk_.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -401,7 +392,6 @@ Client_i::init (int argc, char **argv)
this->argv_,
0
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Parse command line and verify parameters.
if (this->parse_args () == -1)
@@ -415,7 +405,6 @@ Client_i::init (int argc, char **argv)
CORBA::Object_var server_object =
this->orb_->string_to_object (this->ior_
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -425,11 +414,9 @@ Client_i::init (int argc, char **argv)
this->clerk_ =
CosTime::TimeService::_narrow (server_object.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
- ACE_TRY_CHECK;
}
else
{ // No IOR specified. Use the Naming Service
@@ -439,7 +426,6 @@ Client_i::init (int argc, char **argv)
if (this->obtain_initial_references () == -1)
return -1;
- ACE_TRY_CHECK;
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 7245e7ddcdf..3d2963be284 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -14,13 +14,11 @@ TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
: verbose_ (verbose)
{
// Initialize the offer sequences and structures.
- this->create_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->create_offers ();
// Obtain the necessary trading service interfaces.
- this->register_ = lookup_if->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- this->admin_ = lookup_if->admin_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- // ACE_CHECK;
+ this->register_ = lookup_if->register_if ();
+ this->admin_ = lookup_if->admin_if ();
}
TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
@@ -34,7 +32,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
}
void
-TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::Register::InvalidObjectRef,
CosTrading::IllegalServiceType,
@@ -56,7 +54,6 @@ TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
}
this->export_to (this->register_.in () ACE_ENV_ARG_PARAMETER);
- // ACE_CHECK;
}
void
@@ -77,37 +74,32 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
{
for (int i = 0; i < NUM_OFFERS; i++)
{
- CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Object_ptr offer_obj= this->plotter_[i]._this ();
CosTrading::OfferId_var offer_id =
reg->_cxx_export (offer_obj,
TT_Info::INTERFACE_NAMES[1],
this->props_plotters_[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
}
- offer_obj = this->printer_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_obj = this->printer_[i]._this ();
offer_id = reg->_cxx_export (offer_obj,
TT_Info::INTERFACE_NAMES[2],
this->props_printers_[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
}
- offer_obj = this->fs_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_obj = this->fs_[i]._this ();
offer_id = reg->_cxx_export (offer_obj,
TT_Info::INTERFACE_NAMES[3],
@@ -127,11 +119,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
ACE_RE_THROW;
}
ACE_ENDTRY;
- // ACE_CHECK;
}
void
-TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers_to_all (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::Register::InvalidObjectRef,
CosTrading::IllegalServiceType,
@@ -150,8 +141,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
}
- CosTrading::Link_var link_if = this->register_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::Link_var link_if = this->register_->link_if ();
if (this->verbose_)
{
@@ -159,8 +149,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
" linked to the root trader.\n"));
}
- CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
if (this->verbose_)
{
@@ -180,7 +169,6 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::Link::LinkInfo_var link_info =
link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
for (int j = 0; j < NUM_OFFERS; j++)
{
@@ -196,7 +184,6 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
}
this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -208,7 +195,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
void
-TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::withdraw_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalOfferId,
CosTrading::UnknownOfferId,
@@ -220,8 +207,7 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::ULong length;
- CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
if (offer_id_seq.ptr () != 0)
{
@@ -229,7 +215,6 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
for (CORBA::ULong i = 0; i < length; i++)
{
this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -242,7 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::describe_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalOfferId,
CosTrading::UnknownOfferId,
@@ -253,8 +238,7 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
CORBA::ULong length;
- CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
if (offer_id_seq.ptr () != 0)
{
@@ -267,14 +251,12 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
{
CosTrading::Register::OfferInfo_var offer_info =
this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
TT_Info::dump_properties (offer_info->properties, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
}
}
@@ -289,7 +271,7 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::modify_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::NotImplemented,
CosTrading::IllegalOfferId,
@@ -307,8 +289,7 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
if (offer_id_seq.ptr () != 0)
{
@@ -330,7 +311,6 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
del_list,
modify_list
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
}
}
@@ -344,7 +324,7 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
void
TAO_Offer_Exporter::
-withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
+withdraw_offers_using_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -365,19 +345,16 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->register_->
withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
this->register_->
withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
constraint
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
{
@@ -389,7 +366,7 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
}
CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::grab_offerids (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::NotImplemented))
{
@@ -406,7 +383,6 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::OfferIdSeq_out (offer_id_seq),
CosTrading::OfferIdIterator_out (offer_id_iter)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
{
@@ -420,7 +396,6 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
offer_id_iter->next_n (length,
CosTrading::OfferIdSeq_out (id_seq)
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
int offers = id_seq->length ();
int old_length = offer_id_seq->length ();
@@ -433,8 +408,7 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
}
while (any_left);
- offer_id_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_id_iter->destroy ();
}
if (this->verbose_)
@@ -452,13 +426,12 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
// @@ redundant.
- // ACE_CHECK_RETURN (offer_id_seq);
return offer_id_seq;
}
void
-TAO_Offer_Exporter::create_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Exporter::create_offers (void)
{
const int QUEUE_SIZE = 4;
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 63389ae3a79..e3cb09ccded 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -31,7 +31,7 @@ public:
~TAO_Offer_Exporter (void);
- void export_offers (ACE_ENV_SINGLE_ARG_DECL)
+ void export_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::Register::InvalidObjectRef,
CosTrading::IllegalServiceType,
@@ -44,7 +44,7 @@ public:
CosTrading::DuplicatePropertyName));
// Export a number of offers to the Trading Service.
- void export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
+ void export_offers_to_all (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::Register::InvalidObjectRef,
CosTrading::IllegalServiceType,
@@ -58,21 +58,21 @@ public:
// Export a number of offers to all traders accessible by the
// bootstrapped trader.
- void withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
+ void withdraw_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalOfferId,
CosTrading::UnknownOfferId,
CosTrading::Register::ProxyOfferId));
// Withdraw all exported offers.
- void describe_offers (ACE_ENV_SINGLE_ARG_DECL)
+ void describe_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalOfferId,
CosTrading::UnknownOfferId,
CosTrading::Register::ProxyOfferId));
// Describe all the offers registered with the bootstrapped trader.
- void modify_offers (ACE_ENV_SINGLE_ARG_DECL)
+ void modify_offers (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::NotImplemented,
CosTrading::IllegalOfferId,
@@ -87,7 +87,7 @@ public:
CosTrading::DuplicatePropertyName));
// Remove some properties and change some properties in each offer.
- void withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
+ void withdraw_offers_using_constraints (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -97,11 +97,11 @@ public:
private:
- CosTrading::OfferIdSeq* grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
+ CosTrading::OfferIdSeq* grab_offerids (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::NotImplemented));
- void create_offers (ACE_ENV_SINGLE_ARG_DECL);
+ void create_offers (void);
// Fill in each of the offer structures.
void export_to (CosTrading::Register_ptr reg
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 13f5084d1f6..a3fe6454fe1 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
}
void
-TAO_Offer_Importer::perform_queries (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Importer::perform_queries (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -35,11 +35,10 @@ TAO_Offer_Importer::perform_queries (ACE_ENV_SINGLE_ARG_DECL)
policies.link_follow_rule (CosTrading::always);
this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
- // ACE_CHECK;
}
void
-TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Importer::perform_directed_queries (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -63,16 +62,14 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
if (this->verbose_)
ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
- CosTrading::Link_var link_if = this->lookup_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::Link_var link_if = this->lookup_->link_if ();
if (this->verbose_)
{
ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
" linked to the root trader.\n"));
}
- CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
if (link_name_seq->length () > 0)
{
@@ -84,14 +81,11 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
CosTrading::Link::LinkInfo_var link_info =
link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
- CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::Link_var link_if2 = lookup_if->link_if ();
- CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links ();
if (link_name_seq2->length () > 0)
{
@@ -118,7 +112,6 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
(2, 2, trader_name, 1));
this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
else
@@ -191,7 +184,6 @@ TAO_Offer_Importer::perform_queries_with_policies (
offer_iterator_out,
limits_applied_out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr);
@@ -203,7 +195,6 @@ TAO_Offer_Importer::perform_queries_with_policies (
this->display_results (*offer_seq_ptr,
offer_iterator_ptr
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (limits_applied_out->length () > 0)
ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n"));
@@ -243,13 +234,10 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
TAO_Trader_Test::Remote_Output_var remote_output =
TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- remote_output->confirm (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ remote_output->confirm ();
TT_Info::dump_properties (offer_seq[i].properties, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
}
@@ -268,7 +256,6 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
any_left = offer_iterator->next_n (length,
iter_offers_out
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
for (length = iter_offers->length (), i = 0; i < length; i++)
@@ -277,22 +264,18 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
TAO_Trader_Test::Remote_Output_var remote_output =
TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- remote_output->confirm (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ remote_output->confirm ();
CosTrading::PropertySeq& props = iter_offers[i].properties;
TT_Info::dump_properties (props, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
}
} while (any_left);
- offer_iterator->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_iterator->destroy ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 2a5e78885b3..5ef28dd3419 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -33,7 +33,7 @@ public:
TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
CORBA::Boolean verbose = 1);
- void perform_queries (ACE_ENV_SINGLE_ARG_DECL)
+ void perform_queries (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -47,7 +47,7 @@ public:
CosTrading::DuplicatePolicyName));
// Barrage the bootstrapped-to trader with queries.
- void perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
+ void perform_directed_queries (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 282c96ae920..e62a03e8657 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -13,20 +13,18 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
lookup_ (lookup_if)
{
// Obtain the Service Type Repository.
- CosTrading::TypeRepository_var obj = lookup_if->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::TypeRepository_var obj = lookup_if->type_repos ();
// Narrow the Service Type Repository.
this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Build the service type descriptions.
this->create_types ();
}
void
-TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::remove_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
@@ -40,7 +38,6 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosTrading::UnknownServiceType, excp)
{
@@ -57,12 +54,11 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
"TAO_Service_Type_Exporter::remove_all_types");
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
void
-TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::add_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -77,11 +73,10 @@ TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
"adding all types to the Repository.\n"));
this->add_all_types_to (this->repos_.in () ACE_ENV_ARG_PARAMETER);
- // ACE_CHECK;
}
void
-TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::add_all_types_to_all (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -96,13 +91,11 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
"add all types to all repositories.\n"));
ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
- CosTrading::Link_var link_if = this->lookup_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::Link_var link_if = this->lookup_->link_if ();
ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
" linked to the root trader.\n"));
- CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked"
" traders.\n"));
@@ -115,19 +108,16 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
static_cast<const char*> (link_name_seq[i])));
CosTrading::Link::LinkInfo_var link_info =
link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
static_cast<const char*> (link_name_seq[i])));
CosTrading::TypeRepository_var remote_repos =
- link_info->target->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ link_info->target->type_repos ();
str =
CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -135,11 +125,9 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
// @@ Seth, Ignore all these exceptions?
}
ACE_ENDTRY;
- ACE_CHECK;
// @@ Seth, But this one?
this->add_all_types_to (str ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -166,7 +154,6 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
this->type_structs_[i].props,
this->type_structs_[i].super_types
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
}
ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
{
@@ -198,12 +185,11 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
ACE_RE_THROW;
}
ACE_ENDTRY;
- ACE_CHECK;
}
}
void
-TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::list_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -215,7 +201,6 @@ TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
sst.all_ (1);
CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names =
this->repos_->list_types (sst ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::ULong l = type_names->length ();
for (CORBA::ULong i = 0; i != l; ++i)
@@ -235,11 +220,10 @@ TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
ACE_RE_THROW;
}
ACE_ENDTRY;
- // ACE_CHECK;
}
void
-TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::describe_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType))
@@ -254,7 +238,6 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
@@ -273,7 +256,7 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
}
void
-TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::fully_describe_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType))
@@ -288,7 +271,6 @@ TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (this->verbose_)
{
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index a4a0e011e77..ce9134fd85c 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -28,14 +28,14 @@ public:
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- void remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
+ void remove_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType,
CosTradingRepos::ServiceTypeRepository::HasSubTypes));
// Remove all service types from the trading service instance.
- void add_all_types (ACE_ENV_SINGLE_ARG_DECL)
+ void add_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -47,7 +47,7 @@ public:
CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
// Add all the generated service types to the trading service instance.
- void add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
+ void add_all_types_to_all (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -60,19 +60,19 @@ public:
// Add all the generated service types to all the trading service
// instances linked to the trading service we bootstrapped to.
- void list_all_types (ACE_ENV_SINGLE_ARG_DECL)
+ void list_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException));
// List all the service types registered with the trading service
// instance.
- void describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+ void describe_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType));
// Describe all the service types registered with the trading
// service instance.
- void fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+ void fully_describe_all_types (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::IllegalServiceType,
CosTrading::UnknownServiceType));
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 8c353be3664..5864a3aae44 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -157,12 +157,10 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
ACE_TRY
{
CORBA::Boolean is_dynamic = prop_eval.is_dynamic_property (k);
- ACE_TRY_CHECK;
if (print_dynamic || ! is_dynamic)
{
value = prop_eval.property_value(k ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
tc = value->type ();
}
@@ -177,12 +175,10 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
ACE_DEBUG ((LM_DEBUG, "Error retrieving property value.\n"));
}
ACE_ENDTRY;
- ACE_CHECK;
if (tc == 0)
continue;
int check = tc->equal (TAO_Trader_Test::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (check)
{
@@ -197,7 +193,6 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
else
{
check = tc->equal (TAO_Trader_Test::_tc_ULongSeq ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
if (check)
{
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index de4935df75c..7146a4a1e86 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -38,7 +38,7 @@ public:
Remote_Output (void) {}
- virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void confirm (void)
ACE_THROW_SPEC ((CORBA::SystemException)) {}
// Method to test that the importer received a valid reference to
// the exported object.
@@ -51,7 +51,7 @@ public:
Printer (void) {}
- virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void confirm (void)
ACE_THROW_SPEC ((CORBA::SystemException)) {}
// Method to test that the importer received a valid reference to
// the exported object.
@@ -63,7 +63,7 @@ public:
public:
Plotter (void) {}
- virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void confirm (void)
ACE_THROW_SPEC ((CORBA::SystemException)) {}
// Method to test that the importer received a valid reference to
// the exported object.
@@ -75,7 +75,7 @@ public:
public:
File_System (void) {}
- virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void confirm (void)
ACE_THROW_SPEC ((CORBA::SystemException)) {}
// Method to test that the importer received a valid reference to
// the exported object.
@@ -87,7 +87,7 @@ public:
public:
PostScript_Printer (void) {}
- virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void confirm (void)
ACE_THROW_SPEC ((CORBA::SystemException)) {}
// Method to test that the importer received a valid reference to
// the exported object.
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 67d9232a315..aaacba20d2c 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -35,7 +35,6 @@ main (int argc, char** argv)
{
TAO_ORB_Manager orb_manager;
orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Command line argument interpretation.
CORBA::Boolean verbose = 0;
@@ -51,8 +50,7 @@ main (int argc, char** argv)
TAO_Trading_Components_i& trd_comp = trader->trading_components ();
// Set the service type repository
- sup_attr.type_repos (type_repos._this (ACE_ENV_SINGLE_ARG_PARAMETER));
- ACE_TRY_CHECK;
+ sup_attr.type_repos (type_repos._this ());
// Run the Service Type Exporter tests
ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
@@ -60,22 +58,16 @@ main (int argc, char** argv)
(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
verbose
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.remove_all_types ();
- type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.add_all_types ();
- type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.list_all_types ();
- type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.describe_all_types ();
- type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.fully_describe_all_types ();
// Run the Offer Exporter tests
ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
@@ -83,45 +75,33 @@ main (int argc, char** argv)
(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
verbose
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.withdraw_offers ();
- offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.export_offers ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
- offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.modify_offers ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
- offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.withdraw_offers_using_constraints ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
- offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.withdraw_offers ();
- offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.export_offers ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
// Run the Offer Importer tests
ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
TAO_Offer_Importer offer_importer
(CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose);
- offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_importer.perform_queries ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 9078aa74b23..0b57ae4128f 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -19,7 +19,6 @@ main (int argc, char** argv)
{
TAO_ORB_Manager orb_manager;
orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Command line argument interpretation.
TT_Parse_Args parse_args (argc, argv);
@@ -32,7 +31,6 @@ main (int argc, char** argv)
CORBA::Object_var trading_obj = (ior == 0) ?
orb->resolve_initial_references ("TradingService") :
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (trading_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -43,86 +41,64 @@ main (int argc, char** argv)
ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
CosTrading::Lookup_var lookup_if =
CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run the Service Type Exporter tests
ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
! parse_args.quiet ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.remove_all_types ();
- type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.add_all_types ();
- type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.remove_all_types ();
- type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.add_all_types ();
if (parse_args.federated ())
{
- type_exporter.add_all_types_to_all (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.add_all_types_to_all ();
}
- type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.list_all_types ();
- type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.describe_all_types ();
- type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ type_exporter.fully_describe_all_types ();
ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n"));
// Run the Offer Exporter tests
ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// = Test series.
- offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.withdraw_offers ();
- offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.export_offers ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
- offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.modify_offers ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
- offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.withdraw_offers_using_constraints ();
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
- offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.withdraw_offers ();
- offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.export_offers ();
if (parse_args.federated ())
{
- offer_exporter.export_offers_to_all (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.export_offers_to_all ();
}
- offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_exporter.describe_offers ();
ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n"));
ACE_DEBUG ((LM_DEBUG, "*** Now serving dynamic properties.\n"));
@@ -145,8 +121,7 @@ main (int argc, char** argv)
ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file));
}
- orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb_manager.run ();
}
ACE_CATCHANY
{
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index f303d292998..b0bd73e7fb1 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -12,7 +12,6 @@ main (int argc, char** argv)
{
TAO_ORB_Manager orb_manager;
orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Command line argument interpretation.
TT_Parse_Args parse_args (argc, argv);
@@ -24,7 +23,6 @@ main (int argc, char** argv)
CORBA::Object_var trading_obj = (ior == 0) ?
orb->resolve_initial_references ("TradingService") :
orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (trading_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -35,19 +33,16 @@ main (int argc, char** argv)
ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
CosTrading::Lookup_var lookup_if =
CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run the Offer Importer tests
ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ());
- offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_importer.perform_queries ();
if (parse_args.federated ())
{
- offer_importer.perform_directed_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ offer_importer.perform_directed_queries ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 54eb5f996f4..b33efd88c51 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -33,8 +33,7 @@ int main (int argc, char *argv [])
return 1;
else
{
- return client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ return client.run ();
}
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index d183b4ff8a9..bc6109a41b7 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -35,7 +35,7 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void)
}
int
-IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
+IOR_corbaname_Client_i::run (void)
{
ACE_TRY
@@ -65,12 +65,10 @@ IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
CORBA::Object_var factory_object =
this->orb_->string_to_object (corbaname_url.c_str ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow
corbaname::Status_var factory =
corbaname::Status::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (factory.in ()))
{
@@ -82,8 +80,7 @@ IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
// Invoke a request on the server
CORBA::Boolean ret_value =
- factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ factory->print_status ();
if (ret_value == 0)
{
@@ -107,7 +104,6 @@ IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
return -1;
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
@@ -128,7 +124,6 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
this->argv_,
"" /* the ORB name, it can be anything! */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// There must be at least one argument, the file that has to be
// retrieved
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 96fbbdd52d9..08e4b556666 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -39,7 +39,7 @@ class IOR_corbaname_Client_i
IOR_corbaname_Client_i (void);
~IOR_corbaname_Client_i (void);
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
// Execute the client example code.
int init (int argc, char **argv);
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 4582f0445a0..b4668dbcc34 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -14,26 +14,21 @@ int main (int argc, char* argv[])
CORBA::ORB_init (argc, argv,
"" /* the ORB name, it can be anything! */
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Get a reference to the RootPOA
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down to the correct reference
PortableServer::POA_var poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Set a POA Manager
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->the_POAManager ();
// Activate the POA Manager
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
// Create the servant
corbaname_Status_i status_i;
@@ -45,13 +40,11 @@ int main (int argc, char* argv[])
// Get a reference to Naming Context
CORBA::Object_var naming_context_object =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Narrow down the reference
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_context_object.in()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Bind Status to the Naming Context
CosNaming::Name name (1);
@@ -61,11 +54,9 @@ int main (int argc, char* argv[])
naming_context->bind (name,
status.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Run the orb
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
// Destroy the POA, waiting until the destruction terminates
poa->destroy (1, 1);
@@ -77,7 +68,6 @@ int main (int argc, char* argv[])
ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!");
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index db6078e18c5..10ee6f6d41b 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -4,13 +4,13 @@
#include "status_i.h"
-corbaname_Status_i::corbaname_Status_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaname_Status_i::corbaname_Status_i (void)
{
// Constructor
}
CORBA::Boolean
-corbaname_Status_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaname_Status_i::print_status (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// If the client makes a succesful request, return a true value
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 9154aacc09e..be0aa750b56 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -9,9 +9,9 @@
class corbaname_Status_i : public POA_corbaname::Status {
public:
- corbaname_Status_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ corbaname_Status_i (void);
- CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ CORBA::Boolean print_status (void)
ACE_THROW_SPEC ((CORBA::SystemException));
};
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index f4f3d3311c2..4dddd2dff48 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -45,7 +45,6 @@ int main (int argc, char *argv [])
// First initialize the ORB, that will remove some arguments...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// There must be at least one argument, the file that has to be
// retrieved
@@ -61,12 +60,10 @@ int main (int argc, char *argv [])
// Use the first argument to create the object reference.
CORBA::Object_var object =
orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// Check if this object reference is a valid one..
CORBA::Boolean not_exists =
- object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ object->_non_existent ();
if (not_exists)
{
@@ -88,7 +85,6 @@ int main (int argc, char *argv [])
"CORBA System Exception Raised!\n"));
}
ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
return 0;
}