diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-26 21:17:43 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-26 21:17:43 +0000 |
| commit | 91a94f0f3fa63a897d5556805a23dee7a8bba7fb (patch) | |
| tree | 45ba6b108dacafa164126292b98532c4879439c3 | |
| parent | bd9eec7001ede42cec297487841203891b8fdb27 (diff) | |
| download | ATCD-91a94f0f3fa63a897d5556805a23dee7a8bba7fb.tar.gz | |
ChangeLogTag:Mon Mar 26 13:06:10 2001 Carlos O'Ryan <coryan@uci.edu>
274 files changed, 7980 insertions, 6178 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b59f68d7186..0fd7250cbdd 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,27 +1,313 @@ +Mon Mar 26 13:06:10 2001 Carlos O'Ryan <coryan@uci.edu> + + * tao/corba.h: + * tao/corbafwd.h: + Do not include "tao/ORB_Core.h", "tao/Stub.h" nor "tao/debug.h" + from corba.h, this eliminates coupling between the library and + the application, and improves compilation time by, according to + my local tests, a good 10-20%. + + * TAO/TAO_IDL/be/be_codegen.cpp: + * TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * TAO_IDL/include/ast_structure.h: + Generate more #includes in the FooC.cpp and FooS.cpp files, so + the application does not get a bunch of ACE code just for + #including TAO. + + * tao/Acceptor_Impl.cpp: + * tao/BiDir_Policy_i.cpp: + * tao/Cleanup_Func_Registry.h: + * tao/ClientRequestInfo.cpp: + * tao/ClientRequestInfo.h: + * tao/ClientRequestInfo.inl: + * tao/GIOP_Message_Base.cpp: + * tao/Interceptor_List.h: + * tao/Leader_Follower.h: + * tao/LocalObject.cpp: + * tao/NVList.h: + * tao/ORBInitializer_Registry.h: + * tao/ORB_Core.cpp: + * tao/ORB_Core.h: + * tao/Object.h: + * tao/Pluggable_Messaging.cpp: + * tao/Protocols_Hooks.h: + * tao/RT_ORB_Loader.cpp: + * tao/RT_ORB_Loader.h: + * tao/Resource_Factory.h: + * tao/debug.cpp: + * tao/default_resource.cpp: + * tao/params.h: + * tao/DynamicInterface/Context.h: + * tao/DynamicInterface/DII_Invocation.cpp: + * tao/DynamicInterface/ExceptionList.h: + * tao/IORTable/Table_Adapter.cpp: + * tao/PortableServer/MessagingS.cpp: + * tao/PortableServer/MessagingS.h: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/Strategized_Object_Proxy_Broker.cpp: + * tao/PortableServer/Strategized_Object_Proxy_Broker.h: + * tao/SmartProxies/Smart_Proxies.h: + * tao/Strategies/Direct_Priority_Mapping.cpp: + * tao/Strategies/UIOP_Endpoint.cpp: + * tao/Strategies/advanced_resource.cpp: + * examples/AMI/FL_Callback/Makefile: + * examples/Buffered_Oneways/client.cpp: + * examples/Callback_Quoter/Consumer_Handler.cpp: + * examples/Callback_Quoter/Notifier_Input_Handler.cpp: + * examples/Callback_Quoter/Notifier_i.h: + * examples/Callback_Quoter/Supplier_i.cpp: + * examples/Event_Comm/Consumer_Handler.cpp: + * examples/Event_Comm/Consumer_Input_Handler.cpp: + * examples/Event_Comm/Notifier_Handler.cpp: + * examples/Event_Comm/Notifier_Server.cpp: + * examples/Event_Comm/Supplier_Input_Handler.cpp: + * examples/Load_Balancing/Identity_Client.cpp: + * examples/Load_Balancing/Identity_Server.cpp: + * examples/Load_Balancing/Load_Balancing_Service.cpp: + * examples/Load_Balancing_persistent/Identity_Client.cpp: + * examples/Load_Balancing_persistent/Identity_Server.cpp: + * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp: + * examples/Logging/Logger_i.cpp: + * examples/Logging/Logger_i.h: + * examples/Logging/Logging_Service.cpp: + * examples/Logging/Logging_Service_i.cpp: + * examples/Logging/Logging_Test_i.cpp: + * examples/OBV/Typed_Events/Client_i.cpp: + * examples/OBV/Typed_Events/Server_i.cpp: + * examples/POA/DSI/Database_i.h: + * examples/POA/Default_Servant/client.cpp: + * examples/POA/Default_Servant/server.cpp: + * examples/POA/On_Demand_Loading/Servant_Manager.cpp: + * examples/PluggableUDP/tests/UDP_i.h: + * examples/PluggableUDP/tests/client.cpp: + * examples/PluggableUDP/tests/server.cpp: + * examples/Quoter/Factory_Finder_i.cpp: + * examples/Quoter/Generic_Factory_i.cpp: + * examples/Quoter/Quoter_i.cpp: + * examples/Quoter/server.cpp: + * examples/Simple/Simple_util.cpp: + * examples/Simple/bank/AccountManager_i.cpp: + * examples/Simple/bank/AccountManager_i.h: + * examples/Simple/chat/Client_i.cpp: + * examples/Simple/time-date/Time_Date.cpp: + * examples/Simulator/Event_Supplier/DOVE_Supplier.cpp: + * examples/Simulator/Event_Supplier/DualEC_Sup.cpp: + * examples/Simulator/Event_Supplier/Event_Con.cpp: + * examples/Simulator/Event_Supplier/Event_Con.h: + * orbsvcs/Concurrency_Service/Concurrency_Service.cpp: + * orbsvcs/IFR_Service/InterfaceS.cpp: + * orbsvcs/IFR_Service/InterfaceS.h: + * orbsvcs/IFR_Service/be_global.h: + * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + * orbsvcs/Time_Service/Clerk_i.cpp: + * orbsvcs/Time_Service/Server_i.cpp: + * orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp: + * orbsvcs/examples/Log/test/BasicLog_Test.cpp: + * orbsvcs/examples/RtEC/MCast/MCast.cpp: + * orbsvcs/examples/Security/Send_File/test_i.cpp: + * orbsvcs/orbsvcs/IOR_Multicast.cpp: + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * orbsvcs/orbsvcs/AV/AV_Core.cpp: + * orbsvcs/orbsvcs/AV/AV_Core.h: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h: + * orbsvcs/orbsvcs/AV/Flows_T.cpp: + * orbsvcs/orbsvcs/AV/MCast.cpp: + * orbsvcs/orbsvcs/AV/Policy.cpp: + * orbsvcs/orbsvcs/AV/Policy.h: + * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp: + * orbsvcs/orbsvcs/AV/RTCP.cpp: + * orbsvcs/orbsvcs/AV/TCP.cpp: + * orbsvcs/orbsvcs/AV/Transport.cpp: + * orbsvcs/orbsvcs/AV/UDP.cpp: + * orbsvcs/orbsvcs/AV/sfp.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h: + * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp: + * orbsvcs/orbsvcs/Event/Module_Factory.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp: + * orbsvcs/orbsvcs/Log/Log_i.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h: + * orbsvcs/orbsvcs/Notify/Notify_Event.cpp: + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Event_Map.h: + * orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp: + * orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp: + * orbsvcs/orbsvcs/Property/CosPropertyService_i.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h: + * orbsvcs/orbsvcs/Sched/SchedEntry.h: + * orbsvcs/orbsvcs/Security/Security_Current.cpp: + * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp: + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: + * orbsvcs/tests/AVStreams/Latency/control.cpp: + * orbsvcs/tests/AVStreams/Latency/pong.cpp: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: + * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp: + * orbsvcs/tests/AVStreams/Simple/ftp.cpp: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp: + * orbsvcs/tests/AVStreams/benchmark/client.cpp: + * orbsvcs/tests/AVStreams/benchmark/server.cpp: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp: + * orbsvcs/tests/Concurrency/CC_client.cpp: + * orbsvcs/tests/Concurrency/NS_client.cpp: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp: + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + * orbsvcs/tests/EC_Multiple/EC_Multiple.h: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.h: + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h: + * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: + * orbsvcs/tests/Event/Basic/BCast.cpp: + * orbsvcs/tests/Event/lib/Consumer.cpp: + * orbsvcs/tests/Event/lib/Driver.h: + * orbsvcs/tests/Event/lib/Supplier.cpp: + * orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp: + * orbsvcs/tests/ImplRepo/airplane_client_i.cpp: + * orbsvcs/tests/ImplRepo/airplane_i.cpp: + * orbsvcs/tests/ImplRepo/airplane_server_i.cpp: + * orbsvcs/tests/ImplRepo/nestea_client_i.cpp: + * orbsvcs/tests/ImplRepo/nestea_i.cpp: + * orbsvcs/tests/ImplRepo/nestea_server_i.cpp: + * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp: + * orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp: + * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp: + * orbsvcs/tests/Simple_Naming/client.cpp: + * orbsvcs/tests/Time/Client_i.cpp: + * performance-tests/Cubit/TAO/DII_Cubit/client.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp: + * performance-tests/Latency/ami-latency-client.cpp: + * performance-tests/Latency/ami-throughput-client.cpp: + * performance-tests/Latency/client.cpp: + * performance-tests/Latency/st_client.cpp: + * performance-tests/POA/Demux/client.cpp: + * performance-tests/POA/Demux/demux_test_client.cpp: + * performance-tests/POA/Demux/demux_test_i.cpp: + * performance-tests/POA/Demux/demux_test_server.cpp: + * performance-tests/POA/Demux/server.cpp: + * performance-tests/POA/Object_Creation_And_Registration/registration.cpp: + * performance-tests/Pluggable/PP_Test_Client.cpp: + * performance-tests/Pluggable/PP_Test_Server.cpp: + * performance-tests/RTCorba/Oneways/Reliable/client.cpp: + * performance-tests/RTCorba/Oneways/Reliable/test_i.cpp: + * performance-tests/Thruput/TAO/client.cpp: + * performance-tests/Thruput/TAO/server.cpp: + * tests/AMI/server.cpp: + * tests/AMI_Timeouts/client.cpp: + * tests/AMI_Timeouts/server.cpp: + * tests/BiDirectional/test_i.cpp: + * tests/BiDirectional_NestedUpcall/test_i.cpp: + * tests/CDR/allocator.cpp: + * tests/CDR/basic_types.cpp: + * tests/CDR/tc.cpp: + * tests/DSI_Gateway/client.cpp: + * tests/DSI_Gateway/test_dsi.cpp: + * tests/DSI_Gateway/test_i.cpp: + * tests/Endpoint_Per_Priority/client.cpp: + * tests/Faults/pong.cpp: + * tests/InterOp-Naming/Server_i.cpp: + * tests/MProfile/test_i.cpp: + * tests/MProfile_Forwarding/test_i.cpp: + * tests/MT_Client/client.cpp: + * tests/MT_Client/orb_creation.cpp: + * tests/MT_Server/test_i.cpp: + * tests/Native_Exceptions/test_i.cpp: + * tests/NestedUpcall/MT_Client_Test/client.cpp: + * tests/NestedUpcall/MT_Client_Test/local_server.cpp: + * tests/NestedUpcall/MT_Client_Test/server.cpp: + * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp: + * tests/NestedUpcall/Triangle_Test/initiator.cpp: + * tests/NestedUpcall/Triangle_Test/server_A.cpp: + * tests/NestedUpcall/Triangle_Test/server_B.cpp: + * tests/OctetSeq/OctetSeq.cpp: + * tests/POA/Identity/Identity.cpp: + * tests/Param_Test/any.cpp: + * tests/Param_Test/anyop.cpp: + * tests/Param_Test/complex_any.cpp: + * tests/Param_Test/except.cpp: + * tests/Param_Test/helper.h: + * tests/Param_Test/options.cpp: + * tests/Param_Test/param_test_i.cpp: + * tests/Param_Test/results.cpp: + * tests/Param_Test/server.cpp: + * tests/Param_Test/ub_any_seq.cpp: + * tests/Policies/Manipulation.cpp: + * tests/Portable_Interceptors/Benchmark/client.cpp: + * tests/QtTests/client.cpp: + * tests/QtTests/client.h: + * tests/QtTests/server.cpp: + * tests/QtTests/test_i.h: + * tests/RTCORBA/Client_Propagated/client.cpp: + * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp: + * tests/RTCORBA/Private_Connection/client.cpp: + * tests/Smart_Proxies/Benchmark/client.cpp: + * tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h: + * tests/Timed_Buffered_Oneways/client.cpp: + Add include for "tao/ORB_Core.h" or "tao/debug.h" when needed. + Mon Mar 26 14:32:41 2001 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/be/be_structure.cpp: - * TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp: - * TAO_IDL/be/be_visitor_interface_fwd/interfaceFwd_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/interfaceFwd_ch.cpp: - Cosmetic changes to source code. + Cosmetic changes to source code. - * TAO_IDL/be/be_visitor_operations/interceptors_arglist.cpp: - * TAO_IDL/be/be_visitor_operation/interceptors_sh.cpp: + * TAO_IDL/be/be_visitor_operations/interceptors_arglist.cpp: + * TAO_IDL/be/be_visitor_operation/interceptors_sh.cpp: - Cosmetic changes to generated code, mostly fixes to - indentation problems. + Cosmetic changes to generated code, mostly fixes to + indentation problems. - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: - Changed generated code for the - static const CORBA::Long _oc_*[] array to put each member - on a new line, eliminating the extremely long line lengths - that were generated previously. This will also enable the - generated comments that describe the various typecode - components (name, repo id, member count, etc.) to be - easily visible and readable in the text editor of your - choice. + Changed generated code for the + static const CORBA::Long _oc_*[] array to put each member + on a new line, eliminating the extremely long line lengths + that were generated previously. This will also enable the + generated comments that describe the various typecode + components (name, repo id, member count, etc.) to be + easily visible and readable in the text editor of your + choice. Mon Mar 26 14:01:36 2001 Jeff Parsons <parsons@cs.wustl.edu> @@ -38,60 +324,60 @@ Mon Mar 26 11:05:40 2001 Balachandran <bala@cs.wustl.edu> Mon Mar 26 09:10:09 2001 Balachandran Natarajan <bala@cs.wustl.edu> - * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp: - * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h: - * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: Fixed - compilation problem with VXWORKS GCC. + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h: + * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: Fixed + compilation problem with VXWORKS GCC. Mon Mar 26 07:56:56 2001 Balachandran Natarajan <bala@cs.wustl.edu> - * orbsvcs/examples/RtEC/Schedule/Service.cpp: Removed redundant - guards for g++ 2.7. This should fix problems in LYNX_I386. + * orbsvcs/examples/RtEC/Schedule/Service.cpp: Removed redundant + guards for g++ 2.7. This should fix problems in LYNX_I386. Mon Mar 26 06:38:34 2001 Balachandran Natarajan <bala@cs.wustl.edu> - * tao/IIOP_Connection_Handler.cpp: - * tao/Strategies/SHMIOP_Connection_Handler.cpp: - * tao/Strategies/UIOP_Connection_Handler.cpp: - * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: - * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp: Fixed a - compilation error in Borland C++. Converting a void * to in with - a static cast does not go well in Borland. Changed all the - static_cast to reinterpret_cast. Thanks to Chris K for - reporting this problem and suggesting a fix. + * tao/IIOP_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp: Fixed a + compilation error in Borland C++. Converting a void * to in with + a static cast does not go well in Borland. Changed all the + static_cast to reinterpret_cast. Thanks to Chris K for + reporting this problem and suggesting a fix. Sun Mar 25 20:18:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> - * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp: - Fixed a warning with KCC builds. The ACE_ASSERTs dissappear in - non-debug builds. Added ACE_UNUSED_ARG to prevent the compiler - from complaining about unused variables. + * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp: + Fixed a warning with KCC builds. The ACE_ASSERTs dissappear in + non-debug builds. Added ACE_UNUSED_ARG to prevent the compiler + from complaining about unused variables. Sun Mar 25 18:15:39 2001 Angelo Corsaro <corsaro@danzon.cs.wustl.edu> - * tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl: - Modified confition in the script that was leading to a false - detected error. See comment in the script. + * tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl: + Modified confition in the script that was leading to a false + detected error. See comment in the script. Sun Mar 25 17:14:31 2001 Angelo Corsaro <corsaro@danzon.cs.wustl.edu> - * tao/orbconf.h: - Updated the number associated to the RTCORBA macros to reflect - the changes made by Frank in: - Sun Mar 4 13:29:09 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - This fix remove the inconsistencies that were currently present - in the constant associated to RTCORBA policies. - - * tao/Stub.cpp (relative_roundtrip_timeout): - Removed a line of code that was erroneously, setting - the policies holded by the stub to zero. This subtle bug - a very weird behavior in certain cases because a call to this - method would have wiped out totally the policies associated to - the Stub. - - * tests/RTCORBA/Banded_Connections/run_test.pl: - Changed some of paramether passed by the script to the - tests. + * tao/orbconf.h: + Updated the number associated to the RTCORBA macros to reflect + the changes made by Frank in: + Sun Mar 4 13:29:09 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + This fix remove the inconsistencies that were currently present + in the constant associated to RTCORBA policies. + + * tao/Stub.cpp (relative_roundtrip_timeout): + Removed a line of code that was erroneously, setting + the policies holded by the stub to zero. This subtle bug + a very weird behavior in certain cases because a call to this + method would have wiped out totally the policies associated to + the Stub. + + * tests/RTCORBA/Banded_Connections/run_test.pl: + Changed some of paramether passed by the script to the + tests. Sun Mar 25 09:55:38 2001 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 12dbaf90b3e..cdd8a0e76d6 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -83,8 +83,8 @@ TAO_CodeGen::upcase (const char *str) { static char upcase_str [NAMEBUFSIZE]; - ACE_OS::memset (upcase_str, - '\0', + ACE_OS::memset (upcase_str, + '\0', NAMEBUFSIZE); // Convert letters in str to upper case. @@ -290,7 +290,7 @@ TAO_CodeGen::start_client_header (const char *fname) // Get the clnt header from the IDL file name. const char* client_hdr = - BE_GlobalData::be_get_client_hdr (&idl_name_str, + BE_GlobalData::be_get_client_hdr (&idl_name_str, 1); // Sanity check and then print. @@ -340,7 +340,7 @@ TAO_CodeGen::start_client_header (const char *fname) *this->client_header_ << "#endif /* _MSC_VER */\n\n"; - *this->client_header_ + *this->client_header_ << "#if defined (__BORLANDC__)\n" << "#pragma option push -w-rvl -w-rch -w-ccc -w-inl\n" << "#endif /* __BORLANDC__ */\n\n"; @@ -393,6 +393,10 @@ TAO_CodeGen::start_client_stubs (const char *fname) << be_global->be_get_client_hdr_fname (1) << "\"\n\n"; + *this->client_stubs_ << "#include \"tao/Stub.h\"\n" + << "#include \"tao/Invocation.h\"\n" + << "\n"; + // Include the RequestInfo_Util utility header. Used by the // PortableInterceptor::RequestInfo subclasses. *this->client_stubs_ << "#if TAO_HAS_INTERCEPTORS == 1\n" @@ -625,7 +629,7 @@ TAO_CodeGen::start_server_header (const char *fname) *this->server_header_ << "#endif /* _MSC_VER */\n\n"; - *this->server_header_ + *this->server_header_ << "#if defined (__BORLANDC__)\n" << "#pragma option push -w-rvl -w-rch -w-ccc -w-inl\n" << "#endif /* __BORLANDC__ */\n\n"; @@ -745,8 +749,8 @@ TAO_CodeGen::start_server_skeletons (const char *fname) return -1; } - if (this->server_skeletons_->open (fname, - TAO_OutStream::TAO_SVR_IMPL) + if (this->server_skeletons_->open (fname, + TAO_OutStream::TAO_SVR_IMPL) == -1) { return -1; @@ -776,6 +780,9 @@ TAO_CodeGen::start_server_skeletons (const char *fname) << "\"\n" << "#include \"tao/PortableServer/Object_Adapter.h\"\n" << "#include \"tao/PortableServer/Operation_Table.h\"\n" + << "#include \"tao/TAO_Server_Request.h\"\n" + << "#include \"tao/ORB_Core.h\"\n" + << "#include \"tao/Stub.h\"\n" << "\n"; // Include the RequestInfo_Util utility header. Used by the @@ -934,7 +941,7 @@ TAO_CodeGen::start_server_template_inline (const char *fname) return -1; } - if (this->server_template_inline_->open (fname, + if (this->server_template_inline_->open (fname, TAO_OutStream::TAO_SVR_INL) == -1) { @@ -1048,7 +1055,7 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname) const char* impl_hdr = BE_GlobalData::be_get_implementation_hdr_fname (); - this->implementation_skeleton_->print ("#include \"%s\"\n\n", + this->implementation_skeleton_->print ("#include \"%s\"\n\n", impl_hdr); return 0; @@ -1143,8 +1150,8 @@ TAO_CodeGen::end_implementation_header (const char *fname) { static char macro_name [NAMEBUFSIZE]; - ACE_OS::memset (macro_name, - '\0', + ACE_OS::memset (macro_name, + '\0', NAMEBUFSIZE); const char *suffix = ACE_OS::strrchr (fname, '.'); @@ -1181,11 +1188,11 @@ TAO_CodeGen::end_implementation_header (const char *fname) } } - ACE_OS::strcat (macro_name, + ACE_OS::strcat (macro_name, "_H_"); // Code to put the last #endif. - this->implementation_header_->print ("\n#endif /* %s */\n", + this->implementation_header_->print ("\n#endif /* %s */\n", macro_name); return 0; } @@ -1340,8 +1347,8 @@ TAO_CodeGen::gen_ifndef_string (const char *fname, { static char macro_name [NAMEBUFSIZE]; - ACE_OS::memset (macro_name, - '\0', + ACE_OS::memset (macro_name, + '\0', NAMEBUFSIZE); const char *extension = ACE_OS::strrchr (fname, '.'); @@ -1377,9 +1384,9 @@ TAO_CodeGen::gen_ifndef_string (const char *fname, ACE_OS::strcat (macro_name, suffix); // Generate the #ifndef ... #define statements. - stream->print ("#ifndef %s\n", + stream->print ("#ifndef %s\n", macro_name); - stream->print ("#define %s\n\n", + stream->print ("#define %s\n\n", macro_name); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp index 944d34e8428..cd133ec1bad 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp @@ -56,7 +56,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface << "// Helper methods that takes care to create the proxy" << be_nl << "// as soon as their use is necessary." << be_idt_nl - << "void create_proxy (" << be_idt_nl << "TAO_ORB_Core::TAO_Collocation_Strategies strategy," + << "void create_proxy (" << be_idt_nl << "int collocation_strategy," << be_nl << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl << ");" << be_uidt_nl << be_nl @@ -65,7 +65,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface << "// are totally stateless, and those can be shared by all the" << be_nl << "// instances of a given IDL interface type." << be_nl << "::" << node->full_base_proxy_impl_name () << be_nl - <<" *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];" + <<" *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];" << be_nl << be_nl << "TAO_SYNCH_MUTEX mutex_;" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp index ace471ec940..d28d73c1de8 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp @@ -46,7 +46,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface *os << node->full_strategized_proxy_broker_name () << "::" << node->strategized_proxy_broker_name () << " (void)" << be_nl << "{" << be_idt_nl // idt = 1 - << "for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)" + << "for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)" << be_idt_nl // idt = 2 << "this->proxy_cache_[i] = 0;" << be_uidt_nl // idt = 1 @@ -57,7 +57,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface *os << node->full_strategized_proxy_broker_name () << "::~" << node->strategized_proxy_broker_name () << " (void)" << be_nl << "{" << be_idt_nl // idt = 1 - << "for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)" + << "for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)" << be_idt_nl // idt = 2 << "delete this->proxy_cache_[i];" << be_uidt_nl // idt = 1 @@ -76,7 +76,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_uidt_nl // idt = 0 << "{" << be_idt_nl // idt = 1 - << "TAO_ORB_Core::TAO_Collocation_Strategies strategy =" + << "int strategy =" << be_idt_nl // idt = 2 << "TAO_ORB_Core::collocation_strategy (object);" << be_uidt_nl << be_nl // idt = 1 @@ -97,7 +97,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface <<node->full_strategized_proxy_broker_name () << "::" << "create_proxy (" << be_idt << be_idt_nl // idt = 2 - << "TAO_ORB_Core::TAO_Collocation_Strategies strategy," + << "int strategy," << be_nl << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl // idt = 1 @@ -116,7 +116,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << "{" << be_nl; if (be_global->gen_thru_poa_collocation ()) { - *os << "case TAO_ORB_Core::THRU_POA_STRATEGY:" + *os << "case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:" << be_idt_nl // idt = 5 << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl //idt = 7 @@ -132,7 +132,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface if (be_global->gen_direct_collocation ()) { - *os << "case TAO_ORB_Core::DIRECT_STRATEGY:" + *os << "case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:" << be_idt_nl // idt = 5 << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl //idt = 7 @@ -146,7 +146,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_nl << be_uidt_nl; // idt = 4 } - *os << "case TAO_ORB_Core::REMOTE_STRATEGY:" << be_nl + *os << "case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:" << be_nl << "default:" << be_idt_nl // idt = 5 << "ACE_NEW_THROW_EX (" diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index c633a9fd19b..fc8a875f91b 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -67,6 +67,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #ifndef _AST_STRUCTURE_AST_STRUCTURE_HH #define _AST_STRUCTURE_AST_STRUCTURE_HH +#include "ace/Unbounded_Queue.h" + // Representation of structure: // // NOTE: add (AST_ConcreteType *) is defined here because a structure diff --git a/TAO/examples/AMI/FL_Callback/Makefile b/TAO/examples/AMI/FL_Callback/Makefile index 212641d838f..f8a5fbc700e 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile +++ b/TAO/examples/AMI/FL_Callback/Makefile @@ -69,26 +69,33 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Peer_i.o .obj/Peer_i.so .shobj/Peer_i.o .shobj/Peer_i.so: Peer_i.cpp Peer_i.h testS.h \ +.obj/progress.o .obj/progress.so .shobj/progress.o .shobj/progress.so: progress.cpp Progress_i.h testS.h \ $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -111,144 +118,218 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ - $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ $(TAO_ROOT)/tao/Asynch_Invocation.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ @@ -256,84 +337,114 @@ realclean: clean $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - testC.h $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - testS_T.h testS_T.cpp testS_T.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Task_T.i Peer_i.i + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i Progress_i.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i -.obj/Progress_i.o .obj/Progress_i.so .shobj/Progress_i.o .shobj/Progress_i.so: Progress_i.cpp Progress_i.h testS.h \ +.obj/peer.o .obj/peer.so .shobj/peer.o .shobj/peer.so: peer.cpp Peer_i.h testS.h \ $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -356,144 +467,218 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ - $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ $(TAO_ROOT)/tao/Asynch_Invocation.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ @@ -501,78 +686,132 @@ realclean: clean $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - testC.h $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - testS_T.h testS_T.cpp testS_T.i + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + Peer_i.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Sched_Params.h \ + $(ACE_ROOT)/ace/Sched_Params.i -.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ - $(TAO_ROOT)/tao/corba.h \ +.obj/Peer_i.o .obj/Peer_i.so .shobj/Peer_i.o .shobj/Peer_i.so: Peer_i.cpp Peer_i.h testS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -590,206 +829,1011 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + testC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + Peer_i.i + +.obj/Progress_i.o .obj/Progress_i.so .shobj/Progress_i.o .shobj/Progress_i.so: Progress_i.cpp Progress_i.h testS.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Transport.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + testC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i Progress_i.i + +.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - testC.i + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.i \ + $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h \ $(TAO_ROOT)/tao/PortableServer/MessagingS.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -812,144 +1856,218 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \ - $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \ + $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/MessagingS.i \ $(TAO_ROOT)/tao/Asynch_Invocation.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ @@ -957,72 +2075,112 @@ realclean: clean $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ - testC.h $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + testC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - testS_T.h testS_T.cpp testS_T.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + testS_T.h testS_T.i testS_T.cpp testS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.cpp \ $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - testS.i + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/RequestInfo_Util.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index 2bdf6317cee..81d2026acca 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -14,7 +14,7 @@ // ================================================================ #include "testC.h" -#include "tao/debug.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 3e4a5a74359..6e6883be1db 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -18,8 +18,12 @@ // =========================================================== #include "Consumer_Handler.h" -#include "ace/Read_Buffer.h" + #include "tao/ORB.h" +#include "tao/ORB_Core.h" +#include "tao/debug.h" + +#include "ace/Read_Buffer.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS.h" diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index 82c2c122464..f1596792020 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -18,6 +18,8 @@ // =========================================================== #include "Notifier_Input_Handler.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" #include "ace/Get_Opt.h" // Constructor. diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h index d5e9511945e..a0e8e18c2bc 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.h +++ b/TAO/examples/Callback_Quoter/Notifier_i.h @@ -21,14 +21,15 @@ #define NOTIFIER_I_H #include "NotifierS.h" -#include "ConsumerC.h" -#include "tao/PortableServer/ORB_Manager.h" -#include "ace/Containers.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ConsumerC.h" +#include "tao/PortableServer/ORB_Manager.h" +#include "ace/Hash_Map_Manager.h" +#include "ace/Containers.h" #include "ace/SString.h" class Notifier_i : public POA_Notifier diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index f2c5ab1f9ba..d27bbd722ff 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -16,10 +16,11 @@ // // =========================================================== +#include "Supplier_i.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS.h" -#include "Supplier_i.h" #include "ace/Reactor.h" // Constructor. diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp index 9004347a4c4..33d3f352fa9 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Consumer_Handler.h" +#include "tao/ORB_Core.h" ACE_RCSID(Consumer, Consumer_Handler, "$Id$") diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp index 919726162e0..fd80f244231 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp @@ -3,6 +3,8 @@ #include "Consumer_Input_Handler.h" #include "Consumer_Handler.h" +#include "tao/ORB_Core.h" + ACE_RCSID(Consumer, Consumer_Input_Handler, "$Id$") Consumer_Input_Handler::Consumer_Input_Handler (void) diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp index 349432a2d43..795c52b6e43 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.cpp +++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Notifier_Handler.h" +#include "tao/ORB_Core.h" ACE_RCSID(Supplier, Notifier_Handler, "$Id$") diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp index f7113ba2393..f696d6e78a3 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.cpp +++ b/TAO/examples/Event_Comm/Notifier_Server.cpp @@ -1,5 +1,9 @@ +// $Id$ + #include "Notifier_Server.h" #include "Event_CommC.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" ACE_RCSID(Echo, Server_i, "$Id$") diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp index b6322eccd73..e88962f7049 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp @@ -3,6 +3,7 @@ #include "Event_Comm_i.h" #include "Notifier_Handler.h" #include "Supplier_Input_Handler.h" +#include "tao/ORB_Core.h" ACE_RCSID(Supplier, Supplier_Input_Handler, "$Id$") diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 32a70c41aae..4c7b91e4828 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -12,11 +12,14 @@ // // ============================================================================ -#include "ace/Get_Opt.h" #include "Identity_Client.h" #include "IdentityC.h" #include "Load_BalancerC.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" + Identity_Client::Identity_Client (void) : group_factory_ior_ (0), number_of_invocations_ (5), diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 941739c8918..719562ade9e 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -13,8 +13,9 @@ // ============================================================================ #include "Identity_Server.h" -#include "ace/Get_Opt.h" #include "Identity_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" Identity_Server::Identity_Server (void) : group_factory_ior_ (0), diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index 7dfb93a5adb..04a4cca0a98 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -13,8 +13,9 @@ // ============================================================================ #include "Load_Balancing_Service.h" -#include "ace/Get_Opt.h" #include "Load_Balancer_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 28393e21375..14f9b340346 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -12,10 +12,11 @@ // // ============================================================================ -#include "ace/Get_Opt.h" #include "Identity_Client.h" #include "IdentityC.h" #include "Load_BalancerC.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index d9a79dee60b..84a3e90ef0d 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -1,7 +1,9 @@ // $Id$ + #include "Identity_Server.h" -#include "ace/Get_Opt.h" #include "Identity_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" Identity_Server::Identity_Server (void) : group_factory_ior_ (0), diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index 3bfdce3b8e0..9fc27d3795b 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -13,8 +13,9 @@ // ============================================================================ #include "Load_Balancing_Service.h" -#include "ace/Get_Opt.h" #include "Load_Balancer_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) @@ -79,10 +80,10 @@ Load_Balancing_Service::init (int argc, if (result < 0) return result; - + CORBA::PolicyList policies (2); policies.length (2); - + // Lifespan policy policies[0] = this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT, @@ -94,13 +95,13 @@ Load_Balancing_Service::init (int argc, ACE_TRY_ENV); ACE_TRY_CHECK; - PortableServer::POA_var persistent_POA = + PortableServer::POA_var persistent_POA = this->orb_manager_.root_poa()->create_POA ("persistent", this->orb_manager_.poa_manager (), policies, ACE_TRY_ENV); ACE_TRY_CHECK; - + // Destroy policy objects for (CORBA::ULong i = 0; @@ -121,7 +122,7 @@ Load_Balancing_Service::init (int argc, // Activate the POA manager //PortableServer::ServantBase_var s = factory_servant; this->orb_manager_.activate_poa_manager (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK; CORBA::Object_var objref = factory_servant->_this (); diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 1456c0626e9..e5f9e45d5d5 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -2,6 +2,7 @@ #include "LoggerC.h" #include "Logger_i.h" +#include "tao/debug.h" #include "ace/ACE.h" #include "ace/INET_Addr.h" #include "ace/Log_Record.h" diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h index c23a0659134..05797a50e0d 100644 --- a/TAO/examples/Logging/Logger_i.h +++ b/TAO/examples/Logging/Logger_i.h @@ -21,6 +21,7 @@ #define TAO_ORBSVCS_LOGGER_I_H #include "LoggerS.h" +#include "ace/Hash_Map_Manager.h" class Logger_i : public virtual POA_Logger { @@ -52,7 +53,7 @@ public: TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output. - + virtual void logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, CORBA::Environment & ACE_TRY_ENV= @@ -61,7 +62,7 @@ public: // Writes the <log_rec> to the standard output with the given // verbosity level - void verbosity (Logger::Verbosity_Level level, + void verbosity (Logger::Verbosity_Level level, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC (()); @@ -104,7 +105,7 @@ public: // This function returns a logger with name <name>. If <name> is // unique, a new logger is created; else, a previously created // logger of name <name> is returned - + private: ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> hash_map_; // Calls to <make_logger> will create a new instance of <Logger> and diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp index 31e512ea1b2..1062798aaba 100644 --- a/TAO/examples/Logging/Logging_Service.cpp +++ b/TAO/examples/Logging/Logging_Service.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Logging_Service_i.h" +#include "tao/debug.h" ACE_RCSID(Logging_Service, Logging_Service, "$Id$") diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index de5610eb901..e5443166622 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -1,13 +1,14 @@ // $Id$ #include "Logging_Service_i.h" +#include "tao/debug.h" ACE_RCSID(Logging_Service, Logging_Service_i, "$Id$") Logger_Server::Logger_Server (void) :service_name_ (ACE_const_cast (char *,"LoggingService")) { - // Do nothing + // Do nothing } int @@ -58,7 +59,7 @@ Logger_Server::init (int argc, "%p\n", "init_child_poa"), -1); - + ACE_CHECK_RETURN (-1); this->orb_manager_.activate_poa_manager (ACE_TRY_ENV); @@ -119,7 +120,7 @@ Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV) factory.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - + return 0; } diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 986106475aa..ac213bbde10 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -1,11 +1,12 @@ // $Id$ +#include "LoggerC.h" +#include "Logging_Test_i.h" +#include "orbsvcs/CosNamingC.h" +#include "tao/debug.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/OS.h" -#include "orbsvcs/CosNamingC.h" -#include "LoggerC.h" -#include "Logging_Test_i.h" ACE_RCSID(Logger, Logging_Test_i, "$Id$") diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index dfbb351025f..fa7d17b334e 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -2,9 +2,9 @@ #include "Client_i.h" #include "Event_Types_impl.h" +#include "tao/ORB_Core.h" #include "ace/Get_Opt.h" - int Checkpoint_Client_i::run (const char *name, int argc, diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 5f32780d899..3715d0f4743 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -2,7 +2,7 @@ #include "Server_i.h" #include "Event_Types_impl.h" - +#include "tao/ORB_Core.h" Event_List_var alarms; // The list of events which caused an alarm. ('Singleton') diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index 8145242ca0c..b6f9ba7146a 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -7,6 +7,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/DynamicInterface/Dynamic_Implementation.h" +#include "ace/Singleton.h" #include "ace/Malloc.h" class DatabaseImpl diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp index 5332f16d54c..3d0a86cc098 100644 --- a/TAO/examples/POA/Default_Servant/client.cpp +++ b/TAO/examples/POA/Default_Servant/client.cpp @@ -15,11 +15,12 @@ // //==================================================================== +#include "FileC.h" +#include "tao/debug.h" #include "ace/streams.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS.h" -#include "FileC.h" ACE_RCSID(Default_Servant, client, "$Id$") diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp index 534d4e4c43b..1ff174593e0 100644 --- a/TAO/examples/POA/Default_Servant/server.cpp +++ b/TAO/examples/POA/Default_Servant/server.cpp @@ -15,10 +15,10 @@ // //==================================================================== - +#include "File_i.h" +#include "tao/debug.h" #include "ace/streams.h" #include "ace/Get_Opt.h" -#include "File_i.h" ACE_RCSID(Default_Servant, server, "$Id$") diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index 91d595fa7a3..45cc8344baf 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "Servant_Manager.h" +#include "tao/debug.h" ACE_RCSID(On_Demand_Activation, Servant_Manager, "$Id$") diff --git a/TAO/examples/PluggableUDP/tests/UDP_i.h b/TAO/examples/PluggableUDP/tests/UDP_i.h index 9249e17fa38..f64e27f3b22 100644 --- a/TAO/examples/PluggableUDP/tests/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/UDP_i.h @@ -22,9 +22,9 @@ #ifndef UDP_I_H #define UDP_I_H -#include "ace/Synch.h" - #include "UDPS.h" +#include "ace/Hash_Map_Manager.h" +#include "ace/Synch.h" class UDP_i: public POA_UDP { @@ -70,5 +70,3 @@ private: }; #endif /* UDP_I_H */ - - diff --git a/TAO/examples/PluggableUDP/tests/client.cpp b/TAO/examples/PluggableUDP/tests/client.cpp index 3c7428694b2..c21d31b1346 100644 --- a/TAO/examples/PluggableUDP/tests/client.cpp +++ b/TAO/examples/PluggableUDP/tests/client.cpp @@ -16,14 +16,16 @@ // // ============================================================================ -#include "ace/Get_Opt.h" -#include "ace/Task.h" - #include "UDPC.h" #include "UDP_i.h" #include "UDP_Client_i.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" +#include "ace/Task.h" + ACE_RCSID(AMI, client, "$Id$") const char *ior = "file://test.ior"; @@ -136,7 +138,7 @@ main (int argc, char *argv[]) client->activate (); // ORB loop, will be shut down by our client thread - + orb->run (ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/examples/PluggableUDP/tests/server.cpp b/TAO/examples/PluggableUDP/tests/server.cpp index be921b617b6..f4549fc7b80 100644 --- a/TAO/examples/PluggableUDP/tests/server.cpp +++ b/TAO/examples/PluggableUDP/tests/server.cpp @@ -16,10 +16,13 @@ // // ============================================================================ -#include "ace/Get_Opt.h" -#include "tao/corba.h" #include "UDP_i.h" +#include "tao/corba.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" + ACE_RCSID(AMI, server, "$Id$") const char *ior_output_file = 0; @@ -173,7 +176,7 @@ main (int argc, char *argv[]) client->activate (); */ - + orb->run (ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 9f01843fddd..08544d72b94 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -15,9 +15,10 @@ // ============================================================================ #include "ace/Get_Opt.h" -#include "tao/corba.h" #include "Factory_Finder_i.h" #include "QuoterC.h" +#include "tao/corba.h" +#include "tao/ORB_Core.h" ACE_RCSID(Quoter, Factory_Finder_i, "$Id$") @@ -44,7 +45,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key, const char *exception_message = "Null Message"; CosLifeCycle::Factories *factories_ptr = 0; - + ACE_TRY { // Get a reference to the ORB. diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index b39ab5af983..59851056278 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -13,10 +13,11 @@ // Michael Kircher (mk1@cs.wustl.edu) // ============================================================================ -#include "ace/Get_Opt.h" -#include "tao/corba.h" #include "Generic_Factory_i.h" #include "QuoterC.h" +#include "tao/corba.h" +#include "tao/ORB_Core.h" +#include "ace/Get_Opt.h" ACE_RCSID(Quoter, Generic_Factory_i, "$Id$") @@ -51,7 +52,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // @@ FIXME Get a reference to the ORB. CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance ()->orb (); - + // Get the Naming Service object reference. CORBA::Object_var namingObj_var = orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV); diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index 7ee6209844f..388116bfee3 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -16,6 +16,8 @@ #include "Quoter_i.h" #include "tao/PortableServer/POA.h" #include "tao/corba.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" ACE_RCSID(Quoter, Quoter_i, "$Id$") diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index d8ea0180d4d..fe6c3545344 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -14,6 +14,7 @@ // ============================================================================ #include "server.h" +#include "tao/ORB_Core.h" ACE_RCSID(Quoter, server, "$Id$") @@ -89,7 +90,7 @@ Quoter_Server::init (int argc, this->parse_args (); // Obtain the RootPOA. - CORBA::Object_var obj = + CORBA::Object_var obj = this->orb_manager_.orb()->resolve_initial_references ("RootPOA", ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index dad0b35f293..6bf017d1cfe 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -5,6 +5,7 @@ #include "Simple_util.h" #include "tao/IORTable/IORTable.h" +#include "tao/debug.h" // Constructor. diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 079e5f88d10..d8164c3a611 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -2,6 +2,7 @@ #include "AccountManager_i.h" #include "Account_i.h" +#include "tao/debug.h" ACE_RCSID(AccountManager, AccountManager_i, "$Id$") diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index 297f16fb14b..4548856102a 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -20,16 +20,18 @@ #ifndef ACCOUNTMANAGER_I_H #define ACCOUNTMANAGER_I_H -#include "ace/ACE.h" +#include "BankS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" -#include "tao/PortableServer/ORB_Manager.h" -#include "BankS.h" #include "Account_i.h" +#include "tao/PortableServer/ORB_Manager.h" + +#include "ace/Hash_Map_Manager.h" +#include "ace/OS.h" +#include "ace/ACE.h" class AccountManager_i : public POA_Bank::AccountManager { diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 5283f6b1b29..36544540a0d 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -18,8 +18,9 @@ // =========================================================== #include "Client_i.h" -#include "ace/Read_Buffer.h" #include "tao/ORB.h" +#include "tao/ORB_Core.h" +#include "ace/Read_Buffer.h" #include "ace/Get_Opt.h" Client_i::Client_i () diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index 7b198e51e93..b62575ebd3b 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -2,9 +2,12 @@ #define ACE_BUILD_SVC_DLL #define Alt_Resource_Factory_BUILD_DLL + +#include "Time_Date.h" +#include "tao/TAO_Singleton.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Dynamic_Service.h" -#include "Time_Date.h" ACE_Reactor * My_Resource_Factory::get_reactor (void) diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index a37a13b0388..afdcab88add 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -15,6 +15,7 @@ // ============================================================================ #include "DOVE_Supplier.h" +#include "tao/ORB_Core.h" ACE_RCSID(Event_Supplier, DOVE_Supplier, "$Id$") diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index aea34f9bdd3..2cbc8ef362e 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -21,8 +21,13 @@ // // ============================================================================ -#include "tao/corba.h" +#include "DualEC_Sup.h" +#include "NavWeapC.h" + #include "tao/PortableServer/ORB_Manager.h" +#include "tao/corba.h" +#include "tao/ORB_Core.h" + #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" //#include "ace/Profile_Timer.h" @@ -32,8 +37,6 @@ #include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" #include "orbsvcs/orbsvcs/Runtime_Scheduler.h" #include "orbsvcs/RtecEventChannelAdminC.h" -#include "DualEC_Sup.h" -#include "NavWeapC.h" #include <limits.h> diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index 0d56c1a5aaf..54d7ac3efbe 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -22,15 +22,17 @@ // // ============================================================================ -#include "ace/Get_Opt.h" -#include "ace/Sched_Params.h" -#include "ace/Profile_Timer.h" +#include "Event_Con.h" +#include "NavWeapC.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "Event_Con.h" -#include "NavWeapC.h" + +#include "tao/ORB_Core.h" + +#include "ace/Get_Opt.h" +#include "ace/Sched_Params.h" +#include "ace/Profile_Timer.h" #include <limits.h> diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h index 0679187b25a..056fa15c4b3 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h @@ -25,6 +25,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecSchedulerC.h" class Demo_Consumer : public POA_RtecEventComm::PushConsumer { diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 88e40aba19c..93114b7f64f 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -18,6 +18,8 @@ #include "Concurrency_Service.h" +#include "tao/debug.h" + ACE_RCSID(Concurrency_Service, Concurrency_Service, "$Id$") // Default Constructor. diff --git a/TAO/orbsvcs/IFR_Service/InterfaceS.cpp b/TAO/orbsvcs/IFR_Service/InterfaceS.cpp index 407bc353258..97cbe2aa26f 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceS.cpp +++ b/TAO/orbsvcs/IFR_Service/InterfaceS.cpp @@ -157,16 +157,16 @@ _TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broke _TAO_IRObject_Strategized_Proxy_Broker::_TAO_IRObject_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } _TAO_IRObject_Strategized_Proxy_Broker::~_TAO_IRObject_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_IRObject_Proxy_Impl& @@ -175,32 +175,32 @@ _TAO_IRObject_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void _TAO_IRObject_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_IRObject_ThruPOA_Proxy_Impl, @@ -208,8 +208,8 @@ _TAO_IRObject_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -218,9 +218,9 @@ _TAO_IRObject_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -241,17 +241,17 @@ int _TAO_IRObject_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_IRObject_Proxy_Broker_Factory_function_pointer = + + _TAO_IRObject_Proxy_Broker_Factory_function_pointer = _TAO_IRObject_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_IRObject_Proxy_Broker_Factory_Initializer ( ACE_reinterpret_cast ( - long, + long, _TAO_IRObject_Proxy_Broker_Factory_Initializer ) ); @@ -266,7 +266,7 @@ _TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void) // ThruPOA Implementation of the IDL interface methods -IR_DefinitionKind +IR_DefinitionKind _TAO_IRObject_ThruPOA_Proxy_Impl::def_kind ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -298,7 +298,7 @@ _TAO_IRObject_ThruPOA_Proxy_Impl::def_kind ( ); } -void +void _TAO_IRObject_ThruPOA_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -365,25 +365,25 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->def_kind ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_DefinitionKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -393,7 +393,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -414,11 +414,11 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -438,31 +438,31 @@ void POA_CORBA_IRObject::destroy_skel ( POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference; _tao_server_request.argument_flag (0); - + #if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->destroy ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -470,7 +470,7 @@ void POA_CORBA_IRObject::destroy_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -491,9 +491,9 @@ void POA_CORBA_IRObject::destroy_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -577,14 +577,14 @@ POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return ::CORBA::IRObject::_unchecked_narrow (obj.in ()); } @@ -607,7 +607,7 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -619,11 +619,11 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exception Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -632,11 +632,11 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (C CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -658,7 +658,7 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result) { // Update the result. @@ -682,7 +682,7 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (COR Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -694,11 +694,11 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CO Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -707,7 +707,7 @@ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -880,16 +880,16 @@ POA_IR::_TAO_Contained_Strategized_Proxy_Broker *the_TAO_Contained_Strategized_P POA_IR::_TAO_Contained_Strategized_Proxy_Broker::_TAO_Contained_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_Contained_Strategized_Proxy_Broker::~_TAO_Contained_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_Contained_Proxy_Impl& @@ -898,32 +898,32 @@ POA_IR::_TAO_Contained_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_Contained_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, @@ -931,8 +931,8 @@ POA_IR::_TAO_Contained_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -941,9 +941,9 @@ POA_IR::_TAO_Contained_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -964,14 +964,14 @@ int _TAO_Contained_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_Contained_Proxy_Broker_Factory_function_pointer = + + _TAO_Contained_Proxy_Broker_Factory_function_pointer = _TAO_Contained_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Contained_Proxy_Broker_Factory_Initializer)); @@ -1370,25 +1370,25 @@ void POA_IR::Contained::_get_id_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->id ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1399,7 +1399,7 @@ void POA_IR::Contained::_get_id_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1420,11 +1420,11 @@ void POA_IR::Contained::_get_id_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -1457,27 +1457,27 @@ void POA_IR::Contained::_set_id_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set ri ( _tao_server_request, _tao_impl, id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->id ( id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -1485,7 +1485,7 @@ void POA_IR::Contained::_set_id_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1506,9 +1506,9 @@ void POA_IR::Contained::_set_id_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1529,25 +1529,25 @@ void POA_IR::Contained::_get_name_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->name ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1558,7 +1558,7 @@ void POA_IR::Contained::_get_name_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1579,11 +1579,11 @@ void POA_IR::Contained::_get_name_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -1616,27 +1616,27 @@ void POA_IR::Contained::_set_name_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set ri ( _tao_server_request, _tao_impl, name.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->name ( name.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -1644,7 +1644,7 @@ void POA_IR::Contained::_set_name_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1665,9 +1665,9 @@ void POA_IR::Contained::_set_name_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1688,25 +1688,25 @@ void POA_IR::Contained::_get_version_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->version ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1717,7 +1717,7 @@ void POA_IR::Contained::_get_version_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1738,11 +1738,11 @@ void POA_IR::Contained::_get_version_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -1775,27 +1775,27 @@ void POA_IR::Contained::_set_version_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set ri ( _tao_server_request, _tao_impl, version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->version ( version.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -1803,7 +1803,7 @@ void POA_IR::Contained::_set_version_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1824,9 +1824,9 @@ void POA_IR::Contained::_set_version_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -1847,25 +1847,25 @@ void POA_IR::Contained::_get_defined_in_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->defined_in ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_Container_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1876,7 +1876,7 @@ void POA_IR::Contained::_get_defined_in_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1897,11 +1897,11 @@ void POA_IR::Contained::_get_defined_in_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -1927,25 +1927,25 @@ void POA_IR::Contained::_get_absolute_name_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->absolute_name ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) char * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -1956,7 +1956,7 @@ void POA_IR::Contained::_get_absolute_name_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -1977,11 +1977,11 @@ void POA_IR::Contained::_get_absolute_name_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -2007,25 +2007,25 @@ void POA_IR::Contained::_get_containing_repository_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->containing_repository ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_Repository_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2036,7 +2036,7 @@ void POA_IR::Contained::_get_containing_repository_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -2057,11 +2057,11 @@ void POA_IR::Contained::_get_containing_repository_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -2087,25 +2087,25 @@ void POA_IR::Contained::describe_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->describe ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_Contained::Description * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -2116,7 +2116,7 @@ void POA_IR::Contained::describe_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -2137,11 +2137,11 @@ void POA_IR::Contained::describe_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -2178,7 +2178,7 @@ void POA_IR::Contained::move_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move ri ( _tao_server_request, _tao_impl, @@ -2187,14 +2187,14 @@ void POA_IR::Contained::move_skel ( new_version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->move ( new_container.in (), new_name.in (), @@ -2202,7 +2202,7 @@ void POA_IR::Contained::move_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -2210,7 +2210,7 @@ void POA_IR::Contained::move_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -2231,9 +2231,9 @@ void POA_IR::Contained::move_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -2320,14 +2320,14 @@ POA_IR::Contained::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_Contained::_unchecked_narrow (obj.in ()); } @@ -2350,7 +2350,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2362,11 +2362,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2375,11 +2375,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2401,7 +2401,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (char * result) { // Update the result. @@ -2427,14 +2427,14 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -2446,11 +2446,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2459,7 +2459,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2498,7 +2498,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2510,11 +2510,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2523,11 +2523,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2549,7 +2549,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (char * result) { // Update the result. @@ -2575,14 +2575,14 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -2594,11 +2594,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2607,7 +2607,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2646,7 +2646,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2658,11 +2658,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2671,11 +2671,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2697,7 +2697,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (char * result) { // Update the result. @@ -2723,14 +2723,14 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -2742,11 +2742,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2755,7 +2755,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -2794,7 +2794,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2806,11 +2806,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2819,11 +2819,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2845,7 +2845,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (IR::Container_ptr result) { // Update the result. @@ -2869,7 +2869,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2881,11 +2881,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2894,11 +2894,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2920,7 +2920,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result (char * result) { // Update the result. @@ -2944,7 +2944,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -2956,11 +2956,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -2969,11 +2969,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -2995,7 +2995,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::result (IR::Repository_ptr result) { // Update the result. @@ -3019,7 +3019,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -3031,11 +3031,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3044,11 +3044,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -3070,7 +3070,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (IR::Contained::Description * result) { // Update the result. @@ -3100,25 +3100,25 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::arguments (CORBA::En Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_new_container = parameter_list->length (); parameter_list->length (length_new_container + 1); (*parameter_list)[length_new_container].argument <<= this->new_container_; - + (*parameter_list)[length_new_container].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_new_name = parameter_list->length (); parameter_list->length (length_new_name + 1); (*parameter_list)[length_new_name].argument <<= new_name_; (*parameter_list)[length_new_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_new_version = parameter_list->length (); parameter_list->length (length_new_version + 1); (*parameter_list)[length_new_version].argument <<= new_version_; (*parameter_list)[length_new_version].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -3130,11 +3130,11 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::exceptions (CORBA::E Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -3143,7 +3143,7 @@ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::result (CORBA::Envir CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -3320,16 +3320,16 @@ POA_IR::_TAO_Container_Strategized_Proxy_Broker *POA_IR::_TAO_Container_Strategi POA_IR::_TAO_Container_Strategized_Proxy_Broker::_TAO_Container_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_Container_Strategized_Proxy_Broker::~_TAO_Container_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_Container_Proxy_Impl& @@ -3338,32 +3338,32 @@ POA_IR::_TAO_Container_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_Container_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_Container_ThruPOA_Proxy_Impl, @@ -3371,8 +3371,8 @@ POA_IR::_TAO_Container_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -3381,9 +3381,9 @@ POA_IR::_TAO_Container_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -3404,14 +3404,14 @@ int _TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_Container_Proxy_Broker_Factory_function_pointer = + + _TAO_Container_Proxy_Broker_Factory_function_pointer = _TAO_Container_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Container_Proxy_Broker_Factory_Initializer)); @@ -4056,27 +4056,27 @@ void POA_IR::Container::lookup_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup ri ( _tao_server_request, _tao_impl, search_name.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->lookup ( search_name.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_Contained_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4087,7 +4087,7 @@ void POA_IR::Container::lookup_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4108,11 +4108,11 @@ void POA_IR::Container::lookup_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4146,7 +4146,7 @@ void POA_IR::Container::contents_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents ri ( _tao_server_request, _tao_impl, @@ -4154,21 +4154,21 @@ void POA_IR::Container::contents_skel ( exclude_inherited, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->contents ( limit_type, exclude_inherited, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ContainedSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4179,7 +4179,7 @@ void POA_IR::Container::contents_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4200,11 +4200,11 @@ void POA_IR::Container::contents_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4242,7 +4242,7 @@ void POA_IR::Container::lookup_name_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name ri ( _tao_server_request, _tao_impl, @@ -4252,14 +4252,14 @@ void POA_IR::Container::lookup_name_skel ( exclude_inherited, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->lookup_name ( search_name.in (), levels_to_search, @@ -4268,7 +4268,7 @@ void POA_IR::Container::lookup_name_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ContainedSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4279,7 +4279,7 @@ void POA_IR::Container::lookup_name_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4300,11 +4300,11 @@ void POA_IR::Container::lookup_name_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4340,7 +4340,7 @@ void POA_IR::Container::describe_contents_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents ri ( _tao_server_request, _tao_impl, @@ -4349,14 +4349,14 @@ void POA_IR::Container::describe_contents_skel ( max_returned_objs, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->describe_contents ( limit_type, exclude_inherited, @@ -4364,7 +4364,7 @@ void POA_IR::Container::describe_contents_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4375,7 +4375,7 @@ void POA_IR::Container::describe_contents_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4396,11 +4396,11 @@ void POA_IR::Container::describe_contents_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4436,7 +4436,7 @@ void POA_IR::Container::create_module_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module ri ( _tao_server_request, _tao_impl, @@ -4445,14 +4445,14 @@ void POA_IR::Container::create_module_skel ( version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_module ( id.in (), name.in (), @@ -4460,7 +4460,7 @@ void POA_IR::Container::create_module_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ModuleDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4471,7 +4471,7 @@ void POA_IR::Container::create_module_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4492,11 +4492,11 @@ void POA_IR::Container::create_module_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4536,7 +4536,7 @@ void POA_IR::Container::create_constant_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant ri ( _tao_server_request, _tao_impl, @@ -4547,14 +4547,14 @@ void POA_IR::Container::create_constant_skel ( value, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_constant ( id.in (), name.in (), @@ -4564,7 +4564,7 @@ void POA_IR::Container::create_constant_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ConstantDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4575,7 +4575,7 @@ void POA_IR::Container::create_constant_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4596,11 +4596,11 @@ void POA_IR::Container::create_constant_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4638,7 +4638,7 @@ void POA_IR::Container::create_struct_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct ri ( _tao_server_request, _tao_impl, @@ -4648,14 +4648,14 @@ void POA_IR::Container::create_struct_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_struct ( id.in (), name.in (), @@ -4664,7 +4664,7 @@ void POA_IR::Container::create_struct_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_StructDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4675,7 +4675,7 @@ void POA_IR::Container::create_struct_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4696,11 +4696,11 @@ void POA_IR::Container::create_struct_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4740,7 +4740,7 @@ void POA_IR::Container::create_union_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union ri ( _tao_server_request, _tao_impl, @@ -4751,14 +4751,14 @@ void POA_IR::Container::create_union_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_union ( id.in (), name.in (), @@ -4768,7 +4768,7 @@ void POA_IR::Container::create_union_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_UnionDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4779,7 +4779,7 @@ void POA_IR::Container::create_union_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4800,11 +4800,11 @@ void POA_IR::Container::create_union_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4842,7 +4842,7 @@ void POA_IR::Container::create_enum_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum ri ( _tao_server_request, _tao_impl, @@ -4852,14 +4852,14 @@ void POA_IR::Container::create_enum_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_enum ( id.in (), name.in (), @@ -4868,7 +4868,7 @@ void POA_IR::Container::create_enum_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_EnumDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4879,7 +4879,7 @@ void POA_IR::Container::create_enum_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -4900,11 +4900,11 @@ void POA_IR::Container::create_enum_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -4942,7 +4942,7 @@ void POA_IR::Container::create_alias_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias ri ( _tao_server_request, _tao_impl, @@ -4952,14 +4952,14 @@ void POA_IR::Container::create_alias_skel ( original_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_alias ( id.in (), name.in (), @@ -4968,7 +4968,7 @@ void POA_IR::Container::create_alias_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_AliasDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -4979,7 +4979,7 @@ void POA_IR::Container::create_alias_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -5000,11 +5000,11 @@ void POA_IR::Container::create_alias_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -5046,7 +5046,7 @@ void POA_IR::Container::create_interface_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface ri ( _tao_server_request, _tao_impl, @@ -5058,14 +5058,14 @@ void POA_IR::Container::create_interface_skel ( is_local, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_interface ( id.in (), name.in (), @@ -5076,7 +5076,7 @@ void POA_IR::Container::create_interface_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -5087,7 +5087,7 @@ void POA_IR::Container::create_interface_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -5108,11 +5108,11 @@ void POA_IR::Container::create_interface_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -5162,7 +5162,7 @@ void POA_IR::Container::create_value_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value ri ( _tao_server_request, _tao_impl, @@ -5178,14 +5178,14 @@ void POA_IR::Container::create_value_skel ( initializers, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_value ( id.in (), name.in (), @@ -5200,7 +5200,7 @@ void POA_IR::Container::create_value_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -5211,7 +5211,7 @@ void POA_IR::Container::create_value_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -5232,11 +5232,11 @@ void POA_IR::Container::create_value_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -5274,7 +5274,7 @@ void POA_IR::Container::create_value_box_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box ri ( _tao_server_request, _tao_impl, @@ -5284,14 +5284,14 @@ void POA_IR::Container::create_value_box_skel ( original_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_value_box ( id.in (), name.in (), @@ -5300,7 +5300,7 @@ void POA_IR::Container::create_value_box_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -5311,7 +5311,7 @@ void POA_IR::Container::create_value_box_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -5332,11 +5332,11 @@ void POA_IR::Container::create_value_box_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -5374,7 +5374,7 @@ void POA_IR::Container::create_exception_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception ri ( _tao_server_request, _tao_impl, @@ -5384,14 +5384,14 @@ void POA_IR::Container::create_exception_skel ( members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_exception ( id.in (), name.in (), @@ -5400,7 +5400,7 @@ void POA_IR::Container::create_exception_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ExceptionDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -5411,7 +5411,7 @@ void POA_IR::Container::create_exception_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -5432,11 +5432,11 @@ void POA_IR::Container::create_exception_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -5472,7 +5472,7 @@ void POA_IR::Container::create_native_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native ri ( _tao_server_request, _tao_impl, @@ -5481,14 +5481,14 @@ void POA_IR::Container::create_native_skel ( version.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_native ( id.in (), name.in (), @@ -5496,7 +5496,7 @@ void POA_IR::Container::create_native_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_NativeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -5507,7 +5507,7 @@ void POA_IR::Container::create_native_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -5528,11 +5528,11 @@ void POA_IR::Container::create_native_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -5624,14 +5624,14 @@ POA_IR::Container::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_Container::_unchecked_narrow (obj.in ()); } @@ -5656,14 +5656,14 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::arguments (CORBA:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_search_name = parameter_list->length (); parameter_list->length (length_search_name + 1); (*parameter_list)[length_search_name].argument <<= search_name_; (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -5675,11 +5675,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::exceptions (CORBA: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5688,11 +5688,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (CORBA::Env CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5714,7 +5714,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (IR::Contained_ptr result) { // Update the result. @@ -5742,20 +5742,20 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_limit_type = parameter_list->length (); parameter_list->length (length_limit_type + 1); (*parameter_list)[length_limit_type].argument <<= this->limit_type_; - + (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exclude_inherited = parameter_list->length (); parameter_list->length (length_exclude_inherited + 1); (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_); (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -5767,11 +5767,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5780,11 +5780,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5806,7 +5806,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (IR::ContainedSeq * result) { // Update the result. @@ -5838,30 +5838,30 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_search_name = parameter_list->length (); parameter_list->length (length_search_name + 1); (*parameter_list)[length_search_name].argument <<= search_name_; (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_levels_to_search = parameter_list->length (); parameter_list->length (length_levels_to_search + 1); (*parameter_list)[length_levels_to_search].argument <<= levels_to_search_; (*parameter_list)[length_levels_to_search].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_limit_type = parameter_list->length (); parameter_list->length (length_limit_type + 1); (*parameter_list)[length_limit_type].argument <<= this->limit_type_; - + (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exclude_inherited = parameter_list->length (); parameter_list->length (length_exclude_inherited + 1); (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_); (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -5873,11 +5873,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5886,11 +5886,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -5912,7 +5912,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (IR::ContainedSeq * result) { // Update the result. @@ -5942,25 +5942,25 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_limit_type = parameter_list->length (); parameter_list->length (length_limit_type + 1); (*parameter_list)[length_limit_type].argument <<= this->limit_type_; - + (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exclude_inherited = parameter_list->length (); parameter_list->length (length_exclude_inherited + 1); (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_); (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_max_returned_objs = parameter_list->length (); parameter_list->length (length_max_returned_objs + 1); (*parameter_list)[length_max_returned_objs].argument <<= max_returned_objs_; (*parameter_list)[length_max_returned_objs].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -5972,11 +5972,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -5985,11 +5985,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6011,7 +6011,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result (IR::Container::DescriptionSeq * result) { // Update the result. @@ -6041,24 +6041,24 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6070,11 +6070,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6083,11 +6083,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6109,7 +6109,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (IR::ModuleDef_ptr result) { // Update the result. @@ -6143,35 +6143,35 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_type = parameter_list->length (); parameter_list->length (length_type + 1); (*parameter_list)[length_type].argument <<= this->type_; - + (*parameter_list)[length_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_value = parameter_list->length (); parameter_list->length (length_value + 1); (*parameter_list)[length_value].argument <<= value_; (*parameter_list)[length_value].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6183,11 +6183,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::exception Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6196,11 +6196,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (C CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6222,7 +6222,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::target_is return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (IR::ConstantDef_ptr result) { // Update the result. @@ -6254,30 +6254,30 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6289,11 +6289,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6302,11 +6302,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6328,7 +6328,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (IR::StructDef_ptr result) { // Update the result. @@ -6362,36 +6362,36 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_discriminator_type = parameter_list->length (); parameter_list->length (length_discriminator_type + 1); (*parameter_list)[length_discriminator_type].argument <<= this->discriminator_type_; - + (*parameter_list)[length_discriminator_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6403,11 +6403,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6416,11 +6416,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6442,7 +6442,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (IR::UnionDef_ptr result) { // Update the result. @@ -6474,30 +6474,30 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6509,11 +6509,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6522,11 +6522,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6548,7 +6548,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (IR::EnumDef_ptr result) { // Update the result. @@ -6580,30 +6580,30 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_original_type = parameter_list->length (); parameter_list->length (length_original_type + 1); (*parameter_list)[length_original_type].argument <<= this->original_type_; - + (*parameter_list)[length_original_type].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6615,11 +6615,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6628,11 +6628,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6654,7 +6654,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (IR::AliasDef_ptr result) { // Update the result. @@ -6690,40 +6690,40 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_base_interfaces = parameter_list->length (); parameter_list->length (length_base_interfaces + 1); (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_; - + (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_is_abstract = parameter_list->length (); parameter_list->length (length_is_abstract + 1); (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_); (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_is_local = parameter_list->length (); parameter_list->length (length_is_local + 1); (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_); (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6735,11 +6735,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6748,11 +6748,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6774,7 +6774,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result (IR::InterfaceDef_ptr result) { // Update the result. @@ -6818,63 +6818,63 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_is_custom = parameter_list->length (); parameter_list->length (length_is_custom + 1); (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_); (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_is_abstract = parameter_list->length (); parameter_list->length (length_is_abstract + 1); (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_); (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_base_value = parameter_list->length (); parameter_list->length (length_base_value + 1); (*parameter_list)[length_base_value].argument <<= this->base_value_; - + (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_is_truncatable = parameter_list->length (); parameter_list->length (length_is_truncatable + 1); (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_); (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_abstract_base_values = parameter_list->length (); parameter_list->length (length_abstract_base_values + 1); (*parameter_list)[length_abstract_base_values].argument <<= this->abstract_base_values_; - + (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_supported_interfaces = parameter_list->length (); parameter_list->length (length_supported_interfaces + 1); (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_; - + (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_initializers = parameter_list->length (); parameter_list->length (length_initializers + 1); (*parameter_list)[length_initializers].argument <<= this->initializers_; - + (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6886,11 +6886,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -6899,11 +6899,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -6925,7 +6925,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (IR::ValueDef_ptr result) { // Update the result. @@ -6957,30 +6957,30 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_original_type_def = parameter_list->length (); parameter_list->length (length_original_type_def + 1); (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_; - + (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -6992,11 +6992,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7005,11 +7005,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -7031,7 +7031,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result (IR::ValueBoxDef_ptr result) { // Update the result. @@ -7063,30 +7063,30 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -7098,11 +7098,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7111,11 +7111,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -7137,7 +7137,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result (IR::ExceptionDef_ptr result) { // Update the result. @@ -7167,24 +7167,24 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -7196,11 +7196,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7209,11 +7209,11 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -7235,7 +7235,7 @@ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (IR::NativeDef_ptr result) { // Update the result. @@ -7363,16 +7363,16 @@ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker *POA_IR::_TAO_IDLType_Strategized_ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::_TAO_IDLType_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::~_TAO_IDLType_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_IDLType_Proxy_Impl& @@ -7381,32 +7381,32 @@ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_IDLType_ThruPOA_Proxy_Impl, @@ -7414,8 +7414,8 @@ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -7424,9 +7424,9 @@ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -7447,14 +7447,14 @@ int _TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_IDLType_Proxy_Broker_Factory_function_pointer = + + _TAO_IDLType_Proxy_Broker_Factory_function_pointer = _TAO_IDLType_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_IDLType_Proxy_Broker_Factory_Initializer)); @@ -7535,25 +7535,25 @@ void POA_IR::IDLType::_get_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -7564,7 +7564,7 @@ void POA_IR::IDLType::_get_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -7585,11 +7585,11 @@ void POA_IR::IDLType::_get_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -7681,14 +7681,14 @@ POA_IR::IDLType::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_IDLType::_unchecked_narrow (obj.in ()); } @@ -7711,7 +7711,7 @@ POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::arguments (CORBA::En Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -7723,11 +7723,11 @@ POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::exceptions (CORBA::E Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -7736,11 +7736,11 @@ POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::Envir CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -7762,7 +7762,7 @@ POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -7935,16 +7935,16 @@ POA_IR::_TAO_Repository_Strategized_Proxy_Broker *POA_IR::_TAO_Repository_Strate POA_IR::_TAO_Repository_Strategized_Proxy_Broker::_TAO_Repository_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_Repository_Strategized_Proxy_Broker::~_TAO_Repository_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_Repository_Proxy_Impl& @@ -7953,32 +7953,32 @@ POA_IR::_TAO_Repository_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_Repository_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_Repository_ThruPOA_Proxy_Impl, @@ -7986,8 +7986,8 @@ POA_IR::_TAO_Repository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -7996,9 +7996,9 @@ POA_IR::_TAO_Repository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -8019,14 +8019,14 @@ int _TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_Repository_Proxy_Broker_Factory_function_pointer = + + _TAO_Repository_Proxy_Broker_Factory_function_pointer = _TAO_Repository_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Repository_Proxy_Broker_Factory_Initializer)); @@ -8353,27 +8353,27 @@ void POA_IR::Repository::lookup_id_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id ri ( _tao_server_request, _tao_impl, search_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->lookup_id ( search_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_Contained_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8384,7 +8384,7 @@ void POA_IR::Repository::lookup_id_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8405,11 +8405,11 @@ void POA_IR::Repository::lookup_id_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8441,27 +8441,27 @@ void POA_IR::Repository::get_canonical_typecode_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode ri ( _tao_server_request, _tao_impl, tc.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->get_canonical_typecode ( tc.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8472,7 +8472,7 @@ void POA_IR::Repository::get_canonical_typecode_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8493,11 +8493,11 @@ void POA_IR::Repository::get_canonical_typecode_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8529,27 +8529,27 @@ void POA_IR::Repository::get_primitive_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive ri ( _tao_server_request, _tao_impl, kind, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->get_primitive ( kind, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8560,7 +8560,7 @@ void POA_IR::Repository::get_primitive_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8581,11 +8581,11 @@ void POA_IR::Repository::get_primitive_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8617,27 +8617,27 @@ void POA_IR::Repository::create_string_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string ri ( _tao_server_request, _tao_impl, bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_string ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_StringDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8648,7 +8648,7 @@ void POA_IR::Repository::create_string_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8669,11 +8669,11 @@ void POA_IR::Repository::create_string_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8705,27 +8705,27 @@ void POA_IR::Repository::create_wstring_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring ri ( _tao_server_request, _tao_impl, bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_wstring ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_WstringDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8736,7 +8736,7 @@ void POA_IR::Repository::create_wstring_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8757,11 +8757,11 @@ void POA_IR::Repository::create_wstring_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8795,7 +8795,7 @@ void POA_IR::Repository::create_sequence_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence ri ( _tao_server_request, _tao_impl, @@ -8803,21 +8803,21 @@ void POA_IR::Repository::create_sequence_skel ( element_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_sequence ( bound, element_type.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_SequenceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8828,7 +8828,7 @@ void POA_IR::Repository::create_sequence_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8849,11 +8849,11 @@ void POA_IR::Repository::create_sequence_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8887,7 +8887,7 @@ void POA_IR::Repository::create_array_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array ri ( _tao_server_request, _tao_impl, @@ -8895,21 +8895,21 @@ void POA_IR::Repository::create_array_skel ( element_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_array ( length, element_type.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ArrayDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -8920,7 +8920,7 @@ void POA_IR::Repository::create_array_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -8941,11 +8941,11 @@ void POA_IR::Repository::create_array_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -8979,7 +8979,7 @@ void POA_IR::Repository::create_fixed_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed ri ( _tao_server_request, _tao_impl, @@ -8987,21 +8987,21 @@ void POA_IR::Repository::create_fixed_skel ( scale, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_fixed ( digits, scale, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_FixedDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -9012,7 +9012,7 @@ void POA_IR::Repository::create_fixed_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -9033,11 +9033,11 @@ void POA_IR::Repository::create_fixed_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -9132,14 +9132,14 @@ POA_IR::Repository::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_Repository::_unchecked_narrow (obj.in ()); } @@ -9164,14 +9164,14 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_search_id = parameter_list->length (); parameter_list->length (length_search_id + 1); (*parameter_list)[length_search_id].argument <<= search_id_; (*parameter_list)[length_search_id].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9183,11 +9183,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9196,11 +9196,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9222,7 +9222,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (IR::Contained_ptr result) { // Update the result. @@ -9248,14 +9248,14 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_tc = parameter_list->length (); parameter_list->length (length_tc + 1); (*parameter_list)[length_tc].argument <<= tc_; (*parameter_list)[length_tc].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9267,11 +9267,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9280,11 +9280,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9306,7 +9306,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode:: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -9332,15 +9332,15 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_kind = parameter_list->length (); parameter_list->length (length_kind + 1); (*parameter_list)[length_kind].argument <<= this->kind_; - + (*parameter_list)[length_kind].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9352,11 +9352,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::exception Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9365,11 +9365,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (C CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9391,7 +9391,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::target_is return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (IR::PrimitiveDef_ptr result) { // Update the result. @@ -9417,14 +9417,14 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_bound = parameter_list->length (); parameter_list->length (length_bound + 1); (*parameter_list)[length_bound].argument <<= bound_; (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9436,11 +9436,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::exception Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9449,11 +9449,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (C CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9475,7 +9475,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::target_is return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (IR::StringDef_ptr result) { // Update the result. @@ -9501,14 +9501,14 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_bound = parameter_list->length (); parameter_list->length (length_bound + 1); (*parameter_list)[length_bound].argument <<= bound_; (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9520,11 +9520,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9533,11 +9533,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9559,7 +9559,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result (IR::WstringDef_ptr result) { // Update the result. @@ -9587,20 +9587,20 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_bound = parameter_list->length (); parameter_list->length (length_bound + 1); (*parameter_list)[length_bound].argument <<= bound_; (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_element_type = parameter_list->length (); parameter_list->length (length_element_type + 1); (*parameter_list)[length_element_type].argument <<= this->element_type_; - + (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9612,11 +9612,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9625,11 +9625,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9651,7 +9651,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result (IR::SequenceDef_ptr result) { // Update the result. @@ -9679,20 +9679,20 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_length = parameter_list->length (); parameter_list->length (length_length + 1); (*parameter_list)[length_length].argument <<= length_; (*parameter_list)[length_length].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_element_type = parameter_list->length (); parameter_list->length (length_element_type + 1); (*parameter_list)[length_element_type].argument <<= this->element_type_; - + (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9704,11 +9704,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9717,11 +9717,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9743,7 +9743,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (IR::ArrayDef_ptr result) { // Update the result. @@ -9771,19 +9771,19 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_digits = parameter_list->length (); parameter_list->length (length_digits + 1); (*parameter_list)[length_digits].argument <<= digits_; (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_scale = parameter_list->length (); parameter_list->length (length_scale + 1); (*parameter_list)[length_scale].argument <<= scale_; (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -9795,11 +9795,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -9808,11 +9808,11 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -9834,7 +9834,7 @@ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (IR::FixedDef_ptr result) { // Update the result. @@ -10007,16 +10007,16 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker *POA_IR::_TAO_Componen POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::_TAO_ComponentRepository_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentRepository_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ComponentRepository_Proxy_Impl& @@ -10025,32 +10025,32 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ComponentRepository_ThruPOA_Proxy_Impl, @@ -10058,8 +10058,8 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -10068,9 +10068,9 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -10091,14 +10091,14 @@ int _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer = + + _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer = _TAO_ComponentRepository_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer)); @@ -10248,7 +10248,7 @@ void POA_IR::ComponentRepository::create_component_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component ri ( _tao_server_request, _tao_impl, @@ -10259,14 +10259,14 @@ void POA_IR::ComponentRepository::create_component_skel ( supports_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_component ( id.in (), name.in (), @@ -10276,7 +10276,7 @@ void POA_IR::ComponentRepository::create_component_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -10287,7 +10287,7 @@ void POA_IR::ComponentRepository::create_component_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -10308,11 +10308,11 @@ void POA_IR::ComponentRepository::create_component_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -10354,7 +10354,7 @@ void POA_IR::ComponentRepository::create_home_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home ri ( _tao_server_request, _tao_impl, @@ -10366,14 +10366,14 @@ void POA_IR::ComponentRepository::create_home_skel ( primary_key.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_home ( id.in (), name.in (), @@ -10384,7 +10384,7 @@ void POA_IR::ComponentRepository::create_home_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -10395,7 +10395,7 @@ void POA_IR::ComponentRepository::create_home_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -10416,11 +10416,11 @@ void POA_IR::ComponentRepository::create_home_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -10518,14 +10518,14 @@ POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ComponentRepository::_unchecked_narrow (obj.in ()); } @@ -10558,36 +10558,36 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_base_component = parameter_list->length (); parameter_list->length (length_base_component + 1); (*parameter_list)[length_base_component].argument <<= this->base_component_; - + (*parameter_list)[length_base_component].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_supports_interfaces = parameter_list->length (); parameter_list->length (length_supports_interfaces + 1); (*parameter_list)[length_supports_interfaces].argument <<= this->supports_interfaces_; - + (*parameter_list)[length_supports_interfaces].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -10599,11 +10599,11 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -10612,11 +10612,11 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -10638,7 +10638,7 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result) { // Update the result. @@ -10674,42 +10674,42 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_base_home = parameter_list->length (); parameter_list->length (length_base_home + 1); (*parameter_list)[length_base_home].argument <<= this->base_home_; - + (*parameter_list)[length_base_home].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_managed_component = parameter_list->length (); parameter_list->length (length_managed_component + 1); (*parameter_list)[length_managed_component].argument <<= this->managed_component_; - + (*parameter_list)[length_managed_component].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_primary_key = parameter_list->length (); parameter_list->length (length_primary_key + 1); (*parameter_list)[length_primary_key].argument <<= this->primary_key_; - + (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -10721,11 +10721,11 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -10734,11 +10734,11 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -10760,7 +10760,7 @@ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result) { // Update the result. @@ -10934,16 +10934,16 @@ POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker *POA_IR::_TAO_ModuleDef_Strategi POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::_TAO_ModuleDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::~_TAO_ModuleDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ModuleDef_Proxy_Impl& @@ -10952,32 +10952,32 @@ POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ModuleDef_ThruPOA_Proxy_Impl, @@ -10985,8 +10985,8 @@ POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -10995,9 +10995,9 @@ POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -11018,14 +11018,14 @@ int _TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = _TAO_ModuleDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ModuleDef_Proxy_Broker_Factory_Initializer)); @@ -11149,14 +11149,14 @@ POA_IR::ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ModuleDef::_unchecked_narrow (obj.in ()); } @@ -11318,16 +11318,16 @@ POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker *POA_IR::_TAO_ConstantDef_Stra POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::_TAO_ConstantDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::~_TAO_ConstantDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ConstantDef_Proxy_Impl& @@ -11336,32 +11336,32 @@ POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ConstantDef_ThruPOA_Proxy_Impl, @@ -11369,8 +11369,8 @@ POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -11379,9 +11379,9 @@ POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -11402,14 +11402,14 @@ int _TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = _TAO_ConstantDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConstantDef_Proxy_Broker_Factory_Initializer)); @@ -11617,25 +11617,25 @@ void POA_IR::ConstantDef::_get_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -11646,7 +11646,7 @@ void POA_IR::ConstantDef::_get_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -11667,11 +11667,11 @@ void POA_IR::ConstantDef::_get_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -11697,25 +11697,25 @@ void POA_IR::ConstantDef::_get_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -11726,7 +11726,7 @@ void POA_IR::ConstantDef::_get_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -11747,11 +11747,11 @@ void POA_IR::ConstantDef::_get_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -11782,27 +11782,27 @@ void POA_IR::ConstantDef::_set_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set ri ( _tao_server_request, _tao_impl, type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->type_def ( type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -11810,7 +11810,7 @@ void POA_IR::ConstantDef::_set_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -11831,9 +11831,9 @@ void POA_IR::ConstantDef::_set_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -11854,25 +11854,25 @@ void POA_IR::ConstantDef::_get_value_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->value ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Any * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -11883,7 +11883,7 @@ void POA_IR::ConstantDef::_get_value_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -11904,11 +11904,11 @@ void POA_IR::ConstantDef::_get_value_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -11939,27 +11939,27 @@ void POA_IR::ConstantDef::_set_value_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set ri ( _tao_server_request, _tao_impl, value, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->value ( value, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -11967,7 +11967,7 @@ void POA_IR::ConstantDef::_set_value_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -11988,9 +11988,9 @@ void POA_IR::ConstantDef::_set_value_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -12080,14 +12080,14 @@ POA_IR::ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ConstantDef::_unchecked_narrow (obj.in ()); } @@ -12110,7 +12110,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12122,11 +12122,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12135,11 +12135,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12161,7 +12161,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -12185,7 +12185,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12197,11 +12197,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12210,11 +12210,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12236,7 +12236,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -12262,15 +12262,15 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_type_def = parameter_list->length (); parameter_list->length (length_type_def + 1); (*parameter_list)[length_type_def].argument <<= this->type_def_; - + (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -12282,11 +12282,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12295,7 +12295,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -12334,7 +12334,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -12346,11 +12346,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12359,11 +12359,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -12385,7 +12385,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result) { // Update the result. @@ -12411,14 +12411,14 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_value = parameter_list->length (); parameter_list->length (length_value + 1); (*parameter_list)[length_value].argument <<= value_; (*parameter_list)[length_value].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -12430,11 +12430,11 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -12443,7 +12443,7 @@ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -12617,16 +12617,16 @@ POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker *POA_IR::_TAO_TypedefDef_Strate POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::_TAO_TypedefDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::~_TAO_TypedefDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_TypedefDef_Proxy_Impl& @@ -12635,32 +12635,32 @@ POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_TypedefDef_ThruPOA_Proxy_Impl, @@ -12668,8 +12668,8 @@ POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -12678,9 +12678,9 @@ POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -12701,14 +12701,14 @@ int _TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = + + _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = _TAO_TypedefDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_TypedefDef_Proxy_Broker_Factory_Initializer)); @@ -12832,14 +12832,14 @@ POA_IR::TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_TypedefDef::_unchecked_narrow (obj.in ()); } @@ -13015,16 +13015,16 @@ POA_IR::_TAO_StructDef_Strategized_Proxy_Broker *POA_IR::_TAO_StructDef_Strategi POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::_TAO_StructDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::~_TAO_StructDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_StructDef_Proxy_Impl& @@ -13033,32 +13033,32 @@ POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_StructDef_ThruPOA_Proxy_Impl, @@ -13066,8 +13066,8 @@ POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -13076,9 +13076,9 @@ POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -13099,14 +13099,14 @@ int _TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_StructDef_Proxy_Broker_Factory_function_pointer = + + _TAO_StructDef_Proxy_Broker_Factory_function_pointer = _TAO_StructDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StructDef_Proxy_Broker_Factory_Initializer)); @@ -13223,25 +13223,25 @@ void POA_IR::StructDef::_get_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -13252,7 +13252,7 @@ void POA_IR::StructDef::_get_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -13273,11 +13273,11 @@ void POA_IR::StructDef::_get_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -13308,27 +13308,27 @@ void POA_IR::StructDef::_set_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set ri ( _tao_server_request, _tao_impl, members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -13336,7 +13336,7 @@ void POA_IR::StructDef::_set_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -13357,9 +13357,9 @@ void POA_IR::StructDef::_set_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -13458,14 +13458,14 @@ POA_IR::StructDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_StructDef::_unchecked_narrow (obj.in ()); } @@ -13488,7 +13488,7 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -13500,11 +13500,11 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -13513,11 +13513,11 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -13539,7 +13539,7 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (IR::StructMemberSeq * result) { // Update the result. @@ -13565,15 +13565,15 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -13585,11 +13585,11 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -13598,7 +13598,7 @@ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -13794,16 +13794,16 @@ POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker *POA_IR::_TAO_UnionDef_Strategize POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::_TAO_UnionDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::~_TAO_UnionDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_UnionDef_Proxy_Impl& @@ -13812,32 +13812,32 @@ POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_UnionDef_ThruPOA_Proxy_Impl, @@ -13845,8 +13845,8 @@ POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -13855,9 +13855,9 @@ POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -13878,14 +13878,14 @@ int _TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_UnionDef_Proxy_Broker_Factory_function_pointer = + + _TAO_UnionDef_Proxy_Broker_Factory_function_pointer = _TAO_UnionDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UnionDef_Proxy_Broker_Factory_Initializer)); @@ -14096,25 +14096,25 @@ void POA_IR::UnionDef::_get_discriminator_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get ri ( _tao_server_request, _tao_impl , ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->discriminator_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -14125,7 +14125,7 @@ void POA_IR::UnionDef::_get_discriminator_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -14146,11 +14146,11 @@ void POA_IR::UnionDef::_get_discriminator_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -14176,25 +14176,25 @@ void POA_IR::UnionDef::_get_discriminator_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->discriminator_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -14205,7 +14205,7 @@ void POA_IR::UnionDef::_get_discriminator_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -14226,11 +14226,11 @@ void POA_IR::UnionDef::_get_discriminator_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -14261,27 +14261,27 @@ void POA_IR::UnionDef::_set_discriminator_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set ri ( _tao_server_request, _tao_impl, discriminator_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->discriminator_type_def ( discriminator_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -14289,7 +14289,7 @@ void POA_IR::UnionDef::_set_discriminator_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -14310,9 +14310,9 @@ void POA_IR::UnionDef::_set_discriminator_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -14333,25 +14333,25 @@ void POA_IR::UnionDef::_get_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_UnionMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -14362,7 +14362,7 @@ void POA_IR::UnionDef::_get_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -14383,11 +14383,11 @@ void POA_IR::UnionDef::_get_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -14418,27 +14418,27 @@ void POA_IR::UnionDef::_set_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set ri ( _tao_server_request, _tao_impl, members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -14446,7 +14446,7 @@ void POA_IR::UnionDef::_set_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -14467,9 +14467,9 @@ void POA_IR::UnionDef::_set_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -14568,14 +14568,14 @@ POA_IR::UnionDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_UnionDef::_unchecked_narrow (obj.in ()); } @@ -14598,7 +14598,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -14610,11 +14610,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14623,11 +14623,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -14649,7 +14649,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::targ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -14673,7 +14673,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -14685,11 +14685,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14698,11 +14698,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -14724,7 +14724,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get:: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -14750,15 +14750,15 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_discriminator_type_def = parameter_list->length (); parameter_list->length (length_discriminator_type_def + 1); (*parameter_list)[length_discriminator_type_def].argument <<= this->discriminator_type_def_; - + (*parameter_list)[length_discriminator_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -14770,11 +14770,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14783,7 +14783,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -14822,7 +14822,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -14834,11 +14834,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14847,11 +14847,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -14873,7 +14873,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (IR::UnionMemberSeq * result) { // Update the result. @@ -14899,15 +14899,15 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -14919,11 +14919,11 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -14932,7 +14932,7 @@ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -15108,16 +15108,16 @@ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker *POA_IR::_TAO_EnumDef_Strategized_ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::_TAO_EnumDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::~_TAO_EnumDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_EnumDef_Proxy_Impl& @@ -15126,32 +15126,32 @@ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_EnumDef_ThruPOA_Proxy_Impl, @@ -15159,8 +15159,8 @@ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -15169,9 +15169,9 @@ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -15192,14 +15192,14 @@ int _TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_EnumDef_Proxy_Broker_Factory_function_pointer = + + _TAO_EnumDef_Proxy_Broker_Factory_function_pointer = _TAO_EnumDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EnumDef_Proxy_Broker_Factory_Initializer)); @@ -15315,25 +15315,25 @@ void POA_IR::EnumDef::_get_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_EnumMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -15344,7 +15344,7 @@ void POA_IR::EnumDef::_get_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -15365,11 +15365,11 @@ void POA_IR::EnumDef::_get_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -15400,27 +15400,27 @@ void POA_IR::EnumDef::_set_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set ri ( _tao_server_request, _tao_impl, members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -15428,7 +15428,7 @@ void POA_IR::EnumDef::_set_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -15449,9 +15449,9 @@ void POA_IR::EnumDef::_set_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -15547,14 +15547,14 @@ POA_IR::EnumDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_EnumDef::_unchecked_narrow (obj.in ()); } @@ -15577,7 +15577,7 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -15589,11 +15589,11 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -15602,11 +15602,11 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -15628,7 +15628,7 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (IR::EnumMemberSeq * result) { // Update the result. @@ -15654,15 +15654,15 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -15674,11 +15674,11 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -15687,7 +15687,7 @@ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -15863,16 +15863,16 @@ POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker *POA_IR::_TAO_AliasDef_Strategize POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::_TAO_AliasDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::~_TAO_AliasDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_AliasDef_Proxy_Impl& @@ -15881,32 +15881,32 @@ POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_AliasDef_ThruPOA_Proxy_Impl, @@ -15914,8 +15914,8 @@ POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -15924,9 +15924,9 @@ POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -15947,14 +15947,14 @@ int _TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_AliasDef_Proxy_Broker_Factory_function_pointer = + + _TAO_AliasDef_Proxy_Broker_Factory_function_pointer = _TAO_AliasDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AliasDef_Proxy_Broker_Factory_Initializer)); @@ -16070,25 +16070,25 @@ void POA_IR::AliasDef::_get_original_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->original_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -16099,7 +16099,7 @@ void POA_IR::AliasDef::_get_original_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -16120,11 +16120,11 @@ void POA_IR::AliasDef::_get_original_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -16155,27 +16155,27 @@ void POA_IR::AliasDef::_set_original_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set ri ( _tao_server_request, _tao_impl, original_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->original_type_def ( original_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -16183,7 +16183,7 @@ void POA_IR::AliasDef::_set_original_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -16204,9 +16204,9 @@ void POA_IR::AliasDef::_set_original_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -16302,14 +16302,14 @@ POA_IR::AliasDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_AliasDef::_unchecked_narrow (obj.in ()); } @@ -16332,7 +16332,7 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::argum Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -16344,11 +16344,11 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::excep Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -16357,11 +16357,11 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::resul CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -16383,7 +16383,7 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::targe return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -16409,15 +16409,15 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::argum Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_original_type_def = parameter_list->length (); parameter_list->length (length_original_type_def + 1); (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_; - + (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -16429,11 +16429,11 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::excep Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -16442,7 +16442,7 @@ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::resul CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -16616,16 +16616,16 @@ POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker *POA_IR::_TAO_NativeDef_Strategi POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::_TAO_NativeDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::~_TAO_NativeDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_NativeDef_Proxy_Impl& @@ -16634,32 +16634,32 @@ POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_NativeDef_ThruPOA_Proxy_Impl, @@ -16667,8 +16667,8 @@ POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -16677,9 +16677,9 @@ POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -16700,14 +16700,14 @@ int _TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_NativeDef_Proxy_Broker_Factory_function_pointer = + + _TAO_NativeDef_Proxy_Broker_Factory_function_pointer = _TAO_NativeDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_NativeDef_Proxy_Broker_Factory_Initializer)); @@ -16835,14 +16835,14 @@ POA_IR::NativeDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_NativeDef::_unchecked_narrow (obj.in ()); } @@ -16970,16 +16970,16 @@ POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker *POA_IR::_TAO_PrimitiveDef_St POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::_TAO_PrimitiveDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_PrimitiveDef_Proxy_Impl& @@ -16988,32 +16988,32 @@ POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_PrimitiveDef_ThruPOA_Proxy_Impl, @@ -17021,8 +17021,8 @@ POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -17031,9 +17031,9 @@ POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -17054,14 +17054,14 @@ int _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = + + _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = _TAO_PrimitiveDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer)); @@ -17143,25 +17143,25 @@ void POA_IR::PrimitiveDef::_get_kind_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->kind ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_PrimitiveKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -17171,7 +17171,7 @@ void POA_IR::PrimitiveDef::_get_kind_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -17192,11 +17192,11 @@ void POA_IR::PrimitiveDef::_get_kind_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -17291,14 +17291,14 @@ POA_IR::PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_PrimitiveDef::_unchecked_narrow (obj.in ()); } @@ -17321,7 +17321,7 @@ POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -17333,11 +17333,11 @@ POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -17346,11 +17346,11 @@ POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -17372,7 +17372,7 @@ POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (IR::PrimitiveKind result) { // Update the result. @@ -17521,16 +17521,16 @@ POA_IR::_TAO_StringDef_Strategized_Proxy_Broker *POA_IR::_TAO_StringDef_Strategi POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::_TAO_StringDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::~_TAO_StringDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_StringDef_Proxy_Impl& @@ -17539,32 +17539,32 @@ POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_StringDef_ThruPOA_Proxy_Impl, @@ -17572,8 +17572,8 @@ POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -17582,9 +17582,9 @@ POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -17605,14 +17605,14 @@ int _TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_StringDef_Proxy_Broker_Factory_function_pointer = + + _TAO_StringDef_Proxy_Broker_Factory_function_pointer = _TAO_StringDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StringDef_Proxy_Broker_Factory_Initializer)); @@ -17726,25 +17726,25 @@ void POA_IR::StringDef::_get_bound_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->bound ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -17754,7 +17754,7 @@ void POA_IR::StringDef::_get_bound_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -17775,11 +17775,11 @@ void POA_IR::StringDef::_get_bound_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -17810,27 +17810,27 @@ void POA_IR::StringDef::_set_bound_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set ri ( _tao_server_request, _tao_impl, bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->bound ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -17838,7 +17838,7 @@ void POA_IR::StringDef::_set_bound_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -17859,9 +17859,9 @@ void POA_IR::StringDef::_set_bound_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -17951,14 +17951,14 @@ POA_IR::StringDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_StringDef::_unchecked_narrow (obj.in ()); } @@ -17981,7 +17981,7 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -17993,11 +17993,11 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18006,11 +18006,11 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -18032,7 +18032,7 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result) { // Update the result. @@ -18058,14 +18058,14 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_bound = parameter_list->length (); parameter_list->length (length_bound + 1); (*parameter_list)[length_bound].argument <<= bound_; (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -18077,11 +18077,11 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18090,7 +18090,7 @@ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -18254,16 +18254,16 @@ POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker *POA_IR::_TAO_WstringDef_Strate POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::_TAO_WstringDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::~_TAO_WstringDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_WstringDef_Proxy_Impl& @@ -18272,32 +18272,32 @@ POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_WstringDef_ThruPOA_Proxy_Impl, @@ -18305,8 +18305,8 @@ POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -18315,9 +18315,9 @@ POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -18338,14 +18338,14 @@ int _TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_WstringDef_Proxy_Broker_Factory_function_pointer = + + _TAO_WstringDef_Proxy_Broker_Factory_function_pointer = _TAO_WstringDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_WstringDef_Proxy_Broker_Factory_Initializer)); @@ -18459,25 +18459,25 @@ void POA_IR::WstringDef::_get_bound_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->bound ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -18487,7 +18487,7 @@ void POA_IR::WstringDef::_get_bound_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -18508,11 +18508,11 @@ void POA_IR::WstringDef::_get_bound_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -18543,27 +18543,27 @@ void POA_IR::WstringDef::_set_bound_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set ri ( _tao_server_request, _tao_impl, bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->bound ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -18571,7 +18571,7 @@ void POA_IR::WstringDef::_set_bound_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -18592,9 +18592,9 @@ void POA_IR::WstringDef::_set_bound_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -18684,14 +18684,14 @@ POA_IR::WstringDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_WstringDef::_unchecked_narrow (obj.in ()); } @@ -18714,7 +18714,7 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -18726,11 +18726,11 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18739,11 +18739,11 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -18765,7 +18765,7 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result) { // Update the result. @@ -18791,14 +18791,14 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_bound = parameter_list->length (); parameter_list->length (length_bound + 1); (*parameter_list)[length_bound].argument <<= bound_; (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -18810,11 +18810,11 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -18823,7 +18823,7 @@ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -18989,16 +18989,16 @@ POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker *POA_IR::_TAO_FixedDef_Strategize POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::_TAO_FixedDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::~_TAO_FixedDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_FixedDef_Proxy_Impl& @@ -19007,32 +19007,32 @@ POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_FixedDef_ThruPOA_Proxy_Impl, @@ -19040,8 +19040,8 @@ POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -19050,9 +19050,9 @@ POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -19073,14 +19073,14 @@ int _TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_FixedDef_Proxy_Broker_Factory_function_pointer = + + _TAO_FixedDef_Proxy_Broker_Factory_function_pointer = _TAO_FixedDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FixedDef_Proxy_Broker_Factory_Initializer)); @@ -19257,25 +19257,25 @@ void POA_IR::FixedDef::_get_digits_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->digits ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::UShort _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -19285,7 +19285,7 @@ void POA_IR::FixedDef::_get_digits_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -19306,11 +19306,11 @@ void POA_IR::FixedDef::_get_digits_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -19341,27 +19341,27 @@ void POA_IR::FixedDef::_set_digits_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set ri ( _tao_server_request, _tao_impl, digits, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->digits ( digits, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -19369,7 +19369,7 @@ void POA_IR::FixedDef::_set_digits_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -19390,9 +19390,9 @@ void POA_IR::FixedDef::_set_digits_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -19413,25 +19413,25 @@ void POA_IR::FixedDef::_get_scale_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->scale ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Short _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -19441,7 +19441,7 @@ void POA_IR::FixedDef::_get_scale_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -19462,11 +19462,11 @@ void POA_IR::FixedDef::_get_scale_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -19497,27 +19497,27 @@ void POA_IR::FixedDef::_set_scale_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set ri ( _tao_server_request, _tao_impl, scale, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->scale ( scale, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -19525,7 +19525,7 @@ void POA_IR::FixedDef::_set_scale_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -19546,9 +19546,9 @@ void POA_IR::FixedDef::_set_scale_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -19638,14 +19638,14 @@ POA_IR::FixedDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_FixedDef::_unchecked_narrow (obj.in ()); } @@ -19668,7 +19668,7 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -19680,11 +19680,11 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19693,11 +19693,11 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -19719,7 +19719,7 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result) { // Update the result. @@ -19745,14 +19745,14 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_digits = parameter_list->length (); parameter_list->length (length_digits + 1); (*parameter_list)[length_digits].argument <<= digits_; (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -19764,11 +19764,11 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19777,7 +19777,7 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -19816,7 +19816,7 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -19828,11 +19828,11 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19841,11 +19841,11 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -19867,7 +19867,7 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result) { // Update the result. @@ -19893,14 +19893,14 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_scale = parameter_list->length (); parameter_list->length (length_scale + 1); (*parameter_list)[length_scale].argument <<= scale_; (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -19912,11 +19912,11 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -19925,7 +19925,7 @@ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -20092,16 +20092,16 @@ POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker *POA_IR::_TAO_SequenceDef_Stra POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::_TAO_SequenceDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::~_TAO_SequenceDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_SequenceDef_Proxy_Impl& @@ -20110,32 +20110,32 @@ POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_SequenceDef_ThruPOA_Proxy_Impl, @@ -20143,8 +20143,8 @@ POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -20153,9 +20153,9 @@ POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -20176,14 +20176,14 @@ int _TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = + + _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = _TAO_SequenceDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_SequenceDef_Proxy_Broker_Factory_Initializer)); @@ -20391,25 +20391,25 @@ void POA_IR::SequenceDef::_get_bound_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->bound ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -20419,7 +20419,7 @@ void POA_IR::SequenceDef::_get_bound_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -20440,11 +20440,11 @@ void POA_IR::SequenceDef::_get_bound_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -20475,27 +20475,27 @@ void POA_IR::SequenceDef::_set_bound_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set ri ( _tao_server_request, _tao_impl, bound, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->bound ( bound, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -20503,7 +20503,7 @@ void POA_IR::SequenceDef::_set_bound_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -20524,9 +20524,9 @@ void POA_IR::SequenceDef::_set_bound_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20547,25 +20547,25 @@ void POA_IR::SequenceDef::_get_element_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -20576,7 +20576,7 @@ void POA_IR::SequenceDef::_get_element_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -20597,11 +20597,11 @@ void POA_IR::SequenceDef::_get_element_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -20627,25 +20627,25 @@ void POA_IR::SequenceDef::_get_element_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -20656,7 +20656,7 @@ void POA_IR::SequenceDef::_get_element_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -20677,11 +20677,11 @@ void POA_IR::SequenceDef::_get_element_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -20712,27 +20712,27 @@ void POA_IR::SequenceDef::_set_element_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set ri ( _tao_server_request, _tao_impl, element_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->element_type_def ( element_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -20740,7 +20740,7 @@ void POA_IR::SequenceDef::_set_element_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -20761,9 +20761,9 @@ void POA_IR::SequenceDef::_set_element_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -20853,14 +20853,14 @@ POA_IR::SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_SequenceDef::_unchecked_narrow (obj.in ()); } @@ -20883,7 +20883,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -20895,11 +20895,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -20908,11 +20908,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -20934,7 +20934,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result) { // Update the result. @@ -20960,14 +20960,14 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_bound = parameter_list->length (); parameter_list->length (length_bound + 1); (*parameter_list)[length_bound].argument <<= bound_; (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -20979,11 +20979,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -20992,7 +20992,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -21031,7 +21031,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -21043,11 +21043,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21056,11 +21056,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -21082,7 +21082,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::targ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -21106,7 +21106,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -21118,11 +21118,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21131,11 +21131,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -21157,7 +21157,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get:: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -21183,15 +21183,15 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_element_type_def = parameter_list->length (); parameter_list->length (length_element_type_def + 1); (*parameter_list)[length_element_type_def].argument <<= this->element_type_def_; - + (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -21203,11 +21203,11 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21216,7 +21216,7 @@ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -21383,16 +21383,16 @@ POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker *POA_IR::_TAO_ArrayDef_Strategize POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::_TAO_ArrayDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::~_TAO_ArrayDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ArrayDef_Proxy_Impl& @@ -21401,32 +21401,32 @@ POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ArrayDef_ThruPOA_Proxy_Impl, @@ -21434,8 +21434,8 @@ POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -21444,9 +21444,9 @@ POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -21467,14 +21467,14 @@ int _TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = _TAO_ArrayDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ArrayDef_Proxy_Broker_Factory_Initializer)); @@ -21682,25 +21682,25 @@ void POA_IR::ArrayDef::_get_length_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->length ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -21710,7 +21710,7 @@ void POA_IR::ArrayDef::_get_length_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -21731,11 +21731,11 @@ void POA_IR::ArrayDef::_get_length_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -21766,27 +21766,27 @@ void POA_IR::ArrayDef::_set_length_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set ri ( _tao_server_request, _tao_impl, length, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->length ( length, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -21794,7 +21794,7 @@ void POA_IR::ArrayDef::_set_length_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -21815,9 +21815,9 @@ void POA_IR::ArrayDef::_set_length_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -21838,25 +21838,25 @@ void POA_IR::ArrayDef::_get_element_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -21867,7 +21867,7 @@ void POA_IR::ArrayDef::_get_element_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -21888,11 +21888,11 @@ void POA_IR::ArrayDef::_get_element_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -21918,25 +21918,25 @@ void POA_IR::ArrayDef::_get_element_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->element_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -21947,7 +21947,7 @@ void POA_IR::ArrayDef::_get_element_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -21968,11 +21968,11 @@ void POA_IR::ArrayDef::_get_element_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -22003,27 +22003,27 @@ void POA_IR::ArrayDef::_set_element_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set ri ( _tao_server_request, _tao_impl, element_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->element_type_def ( element_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -22031,7 +22031,7 @@ void POA_IR::ArrayDef::_set_element_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -22052,9 +22052,9 @@ void POA_IR::ArrayDef::_set_element_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -22144,14 +22144,14 @@ POA_IR::ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ArrayDef::_unchecked_narrow (obj.in ()); } @@ -22174,7 +22174,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -22186,11 +22186,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22199,11 +22199,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -22225,7 +22225,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result) { // Update the result. @@ -22251,14 +22251,14 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_length = parameter_list->length (); parameter_list->length (length_length + 1); (*parameter_list)[length_length].argument <<= length_; (*parameter_list)[length_length].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -22270,11 +22270,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22283,7 +22283,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -22322,7 +22322,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -22334,11 +22334,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22347,11 +22347,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -22373,7 +22373,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -22397,7 +22397,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -22409,11 +22409,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22422,11 +22422,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -22448,7 +22448,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -22474,15 +22474,15 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_element_type_def = parameter_list->length (); parameter_list->length (length_element_type_def + 1); (*parameter_list)[length_element_type_def].argument <<= this->element_type_def_; - + (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -22494,11 +22494,11 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -22507,7 +22507,7 @@ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -22699,16 +22699,16 @@ POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker *POA_IR::_TAO_ExceptionDef_St POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::_TAO_ExceptionDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::~_TAO_ExceptionDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ExceptionDef_Proxy_Impl& @@ -22717,32 +22717,32 @@ POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ExceptionDef_ThruPOA_Proxy_Impl, @@ -22750,8 +22750,8 @@ POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -22760,9 +22760,9 @@ POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -22783,14 +22783,14 @@ int _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = _TAO_ExceptionDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer)); @@ -22936,25 +22936,25 @@ void POA_IR::ExceptionDef::_get_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -22965,7 +22965,7 @@ void POA_IR::ExceptionDef::_get_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -22986,11 +22986,11 @@ void POA_IR::ExceptionDef::_get_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -23016,25 +23016,25 @@ void POA_IR::ExceptionDef::_get_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->members ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -23045,7 +23045,7 @@ void POA_IR::ExceptionDef::_get_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -23066,11 +23066,11 @@ void POA_IR::ExceptionDef::_get_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -23101,27 +23101,27 @@ void POA_IR::ExceptionDef::_set_members_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set ri ( _tao_server_request, _tao_impl, members, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->members ( members, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -23129,7 +23129,7 @@ void POA_IR::ExceptionDef::_set_members_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -23150,9 +23150,9 @@ void POA_IR::ExceptionDef::_set_members_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -23258,7 +23258,7 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -23270,11 +23270,11 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -23283,11 +23283,11 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -23309,7 +23309,7 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -23333,7 +23333,7 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -23345,11 +23345,11 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -23358,11 +23358,11 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -23384,7 +23384,7 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result (IR::StructMemberSeq * result) { // Update the result. @@ -23410,15 +23410,15 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_members = parameter_list->length (); parameter_list->length (length_members + 1); (*parameter_list)[length_members].argument <<= this->members_; - + (*parameter_list)[length_members].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -23430,11 +23430,11 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -23443,7 +23443,7 @@ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -23621,16 +23621,16 @@ POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker *POA_IR::_TAO_AttributeDef_St POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::_TAO_AttributeDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::~_TAO_AttributeDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_AttributeDef_Proxy_Impl& @@ -23639,32 +23639,32 @@ POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_AttributeDef_ThruPOA_Proxy_Impl, @@ -23672,8 +23672,8 @@ POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -23682,9 +23682,9 @@ POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -23705,14 +23705,14 @@ int _TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = + + _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = _TAO_AttributeDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AttributeDef_Proxy_Broker_Factory_Initializer)); @@ -23920,25 +23920,25 @@ void POA_IR::AttributeDef::_get_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -23949,7 +23949,7 @@ void POA_IR::AttributeDef::_get_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -23970,11 +23970,11 @@ void POA_IR::AttributeDef::_get_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -24000,25 +24000,25 @@ void POA_IR::AttributeDef::_get_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -24029,7 +24029,7 @@ void POA_IR::AttributeDef::_get_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -24050,11 +24050,11 @@ void POA_IR::AttributeDef::_get_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -24085,27 +24085,27 @@ void POA_IR::AttributeDef::_set_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set ri ( _tao_server_request, _tao_impl, type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->type_def ( type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -24113,7 +24113,7 @@ void POA_IR::AttributeDef::_set_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -24134,9 +24134,9 @@ void POA_IR::AttributeDef::_set_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -24157,25 +24157,25 @@ void POA_IR::AttributeDef::_get_mode_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->mode ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_AttributeMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -24185,7 +24185,7 @@ void POA_IR::AttributeDef::_get_mode_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -24206,11 +24206,11 @@ void POA_IR::AttributeDef::_get_mode_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -24241,27 +24241,27 @@ void POA_IR::AttributeDef::_set_mode_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set ri ( _tao_server_request, _tao_impl, mode, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->mode ( mode, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -24269,7 +24269,7 @@ void POA_IR::AttributeDef::_set_mode_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -24290,9 +24290,9 @@ void POA_IR::AttributeDef::_set_mode_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -24382,14 +24382,14 @@ POA_IR::AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_AttributeDef::_unchecked_narrow (obj.in ()); } @@ -24412,7 +24412,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -24424,11 +24424,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -24437,11 +24437,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -24463,7 +24463,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -24487,7 +24487,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -24499,11 +24499,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -24512,11 +24512,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -24538,7 +24538,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -24564,15 +24564,15 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_type_def = parameter_list->length (); parameter_list->length (length_type_def + 1); (*parameter_list)[length_type_def].argument <<= this->type_def_; - + (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -24584,11 +24584,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -24597,7 +24597,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -24636,7 +24636,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -24648,11 +24648,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -24661,11 +24661,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -24687,7 +24687,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (IR::AttributeMode result) { // Update the result. @@ -24713,15 +24713,15 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_mode = parameter_list->length (); parameter_list->length (length_mode + 1); (*parameter_list)[length_mode].argument <<= this->mode_; - + (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -24733,11 +24733,11 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -24746,7 +24746,7 @@ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -24979,16 +24979,16 @@ POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker *POA_IR::_TAO_OperationDef_St POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::_TAO_OperationDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::~_TAO_OperationDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_OperationDef_Proxy_Impl& @@ -24997,32 +24997,32 @@ POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_OperationDef_ThruPOA_Proxy_Impl, @@ -25030,8 +25030,8 @@ POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -25040,9 +25040,9 @@ POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -25063,14 +25063,14 @@ int _TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_OperationDef_Proxy_Broker_Factory_function_pointer = + + _TAO_OperationDef_Proxy_Broker_Factory_function_pointer = _TAO_OperationDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_OperationDef_Proxy_Broker_Factory_Initializer)); @@ -25467,25 +25467,25 @@ void POA_IR::OperationDef::_get_result_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->result ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -25496,7 +25496,7 @@ void POA_IR::OperationDef::_get_result_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25517,11 +25517,11 @@ void POA_IR::OperationDef::_get_result_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -25547,25 +25547,25 @@ void POA_IR::OperationDef::_get_result_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->result_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -25576,7 +25576,7 @@ void POA_IR::OperationDef::_get_result_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25597,11 +25597,11 @@ void POA_IR::OperationDef::_get_result_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -25632,27 +25632,27 @@ void POA_IR::OperationDef::_set_result_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set ri ( _tao_server_request, _tao_impl, result_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->result_def ( result_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -25660,7 +25660,7 @@ void POA_IR::OperationDef::_set_result_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25681,9 +25681,9 @@ void POA_IR::OperationDef::_set_result_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -25704,25 +25704,25 @@ void POA_IR::OperationDef::_get_params_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get ri ( _tao_server_request, _tao_impl , ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->params ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ParDescriptionSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -25733,7 +25733,7 @@ void POA_IR::OperationDef::_get_params_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25754,11 +25754,11 @@ void POA_IR::OperationDef::_get_params_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -25789,27 +25789,27 @@ void POA_IR::OperationDef::_set_params_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set ri ( _tao_server_request, _tao_impl, params, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->params ( params, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -25817,7 +25817,7 @@ void POA_IR::OperationDef::_set_params_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25838,9 +25838,9 @@ void POA_IR::OperationDef::_set_params_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -25861,25 +25861,25 @@ void POA_IR::OperationDef::_get_mode_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->mode ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_OperationMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -25889,7 +25889,7 @@ void POA_IR::OperationDef::_get_mode_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25910,11 +25910,11 @@ void POA_IR::OperationDef::_get_mode_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -25945,27 +25945,27 @@ void POA_IR::OperationDef::_set_mode_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set ri ( _tao_server_request, _tao_impl, mode, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->mode ( mode, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -25973,7 +25973,7 @@ void POA_IR::OperationDef::_set_mode_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -25994,9 +25994,9 @@ void POA_IR::OperationDef::_set_mode_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -26017,25 +26017,25 @@ void POA_IR::OperationDef::_get_contexts_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->contexts ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ContextIdSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -26046,7 +26046,7 @@ void POA_IR::OperationDef::_get_contexts_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -26067,11 +26067,11 @@ void POA_IR::OperationDef::_get_contexts_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -26102,27 +26102,27 @@ void POA_IR::OperationDef::_set_contexts_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set ri ( _tao_server_request, _tao_impl, contexts, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->contexts ( contexts, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -26130,7 +26130,7 @@ void POA_IR::OperationDef::_set_contexts_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -26151,9 +26151,9 @@ void POA_IR::OperationDef::_set_contexts_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -26174,25 +26174,25 @@ void POA_IR::OperationDef::_get_exceptions_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->exceptions ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ExceptionDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -26203,7 +26203,7 @@ void POA_IR::OperationDef::_get_exceptions_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -26224,11 +26224,11 @@ void POA_IR::OperationDef::_get_exceptions_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -26259,27 +26259,27 @@ void POA_IR::OperationDef::_set_exceptions_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set ri ( _tao_server_request, _tao_impl, exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->exceptions ( exceptions, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -26287,7 +26287,7 @@ void POA_IR::OperationDef::_set_exceptions_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -26308,9 +26308,9 @@ void POA_IR::OperationDef::_set_exceptions_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -26400,14 +26400,14 @@ POA_IR::OperationDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_OperationDef::_unchecked_narrow (obj.in ()); } @@ -26430,7 +26430,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -26442,11 +26442,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26455,11 +26455,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -26481,7 +26481,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -26505,7 +26505,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -26517,11 +26517,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26530,11 +26530,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -26556,7 +26556,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::targ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -26582,15 +26582,15 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_result_def = parameter_list->length (); parameter_list->length (length_result_def + 1); (*parameter_list)[length_result_def].argument <<= this->result_def_; - + (*parameter_list)[length_result_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -26602,11 +26602,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26615,7 +26615,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -26654,7 +26654,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -26666,11 +26666,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26679,11 +26679,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -26705,7 +26705,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result (IR::ParDescriptionSeq * result) { // Update the result. @@ -26731,15 +26731,15 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_params = parameter_list->length (); parameter_list->length (length_params + 1); (*parameter_list)[length_params].argument <<= this->params_; - + (*parameter_list)[length_params].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -26751,11 +26751,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26764,7 +26764,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -26803,7 +26803,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -26815,11 +26815,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26828,11 +26828,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -26854,7 +26854,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (IR::OperationMode result) { // Update the result. @@ -26880,15 +26880,15 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_mode = parameter_list->length (); parameter_list->length (length_mode + 1); (*parameter_list)[length_mode].argument <<= this->mode_; - + (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -26900,11 +26900,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26913,7 +26913,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -26952,7 +26952,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -26964,11 +26964,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -26977,11 +26977,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -27003,7 +27003,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result (IR::ContextIdSeq * result) { // Update the result. @@ -27029,15 +27029,15 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_contexts = parameter_list->length (); parameter_list->length (length_contexts + 1); (*parameter_list)[length_contexts].argument <<= this->contexts_; - + (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -27049,11 +27049,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -27062,7 +27062,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -27101,7 +27101,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -27113,11 +27113,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -27126,11 +27126,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -27152,7 +27152,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::targ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::result (IR::ExceptionDefSeq * result) { // Update the result. @@ -27178,15 +27178,15 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_exceptions = parameter_list->length (); parameter_list->length (length_exceptions + 1); (*parameter_list)[length_exceptions].argument <<= this->exceptions_; - + (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -27198,11 +27198,11 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -27211,7 +27211,7 @@ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -27411,16 +27411,16 @@ POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker *POA_IR::_TAO_InterfaceDef_St POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::_TAO_InterfaceDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::~_TAO_InterfaceDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_InterfaceDef_Proxy_Impl& @@ -27429,32 +27429,32 @@ POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_InterfaceDef_ThruPOA_Proxy_Impl, @@ -27462,8 +27462,8 @@ POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -27472,9 +27472,9 @@ POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -27495,14 +27495,14 @@ int _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = + + _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = _TAO_InterfaceDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer)); @@ -27869,25 +27869,25 @@ void POA_IR::InterfaceDef::_get_base_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -27898,7 +27898,7 @@ void POA_IR::InterfaceDef::_get_base_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -27919,11 +27919,11 @@ void POA_IR::InterfaceDef::_get_base_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -27954,27 +27954,27 @@ void POA_IR::InterfaceDef::_set_base_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set ri ( _tao_server_request, _tao_impl, base_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->base_interfaces ( base_interfaces, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -27982,7 +27982,7 @@ void POA_IR::InterfaceDef::_set_base_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28003,9 +28003,9 @@ void POA_IR::InterfaceDef::_set_base_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -28026,25 +28026,25 @@ void POA_IR::InterfaceDef::_get_is_abstract_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_abstract ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -28054,7 +28054,7 @@ void POA_IR::InterfaceDef::_get_is_abstract_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28075,11 +28075,11 @@ void POA_IR::InterfaceDef::_get_is_abstract_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -28110,27 +28110,27 @@ void POA_IR::InterfaceDef::_set_is_abstract_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set ri ( _tao_server_request, _tao_impl, is_abstract, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_abstract ( is_abstract, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -28138,7 +28138,7 @@ void POA_IR::InterfaceDef::_set_is_abstract_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28159,9 +28159,9 @@ void POA_IR::InterfaceDef::_set_is_abstract_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -28182,25 +28182,25 @@ void POA_IR::InterfaceDef::_get_is_local_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_local ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -28210,7 +28210,7 @@ void POA_IR::InterfaceDef::_get_is_local_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28231,11 +28231,11 @@ void POA_IR::InterfaceDef::_get_is_local_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -28266,27 +28266,27 @@ void POA_IR::InterfaceDef::_set_is_local_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set ri ( _tao_server_request, _tao_impl, is_local, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_local ( is_local, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -28294,7 +28294,7 @@ void POA_IR::InterfaceDef::_set_is_local_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28315,9 +28315,9 @@ void POA_IR::InterfaceDef::_set_is_local_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -28344,27 +28344,27 @@ void POA_IR::InterfaceDef::is_a_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a ri ( _tao_server_request, _tao_impl, interface_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( interface_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -28374,7 +28374,7 @@ void POA_IR::InterfaceDef::is_a_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28395,11 +28395,11 @@ void POA_IR::InterfaceDef::is_a_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -28443,7 +28443,7 @@ void POA_IR::InterfaceDef::create_attribute_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute ri ( _tao_server_request, _tao_impl, @@ -28456,14 +28456,14 @@ void POA_IR::InterfaceDef::create_attribute_skel ( put_exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_attribute ( id.in (), name.in (), @@ -28475,7 +28475,7 @@ void POA_IR::InterfaceDef::create_attribute_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -28486,7 +28486,7 @@ void POA_IR::InterfaceDef::create_attribute_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28507,11 +28507,11 @@ void POA_IR::InterfaceDef::create_attribute_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -28557,7 +28557,7 @@ void POA_IR::InterfaceDef::create_operation_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation ri ( _tao_server_request, _tao_impl, @@ -28571,14 +28571,14 @@ void POA_IR::InterfaceDef::create_operation_skel ( contexts, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_operation ( id.in (), name.in (), @@ -28591,7 +28591,7 @@ void POA_IR::InterfaceDef::create_operation_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -28602,7 +28602,7 @@ void POA_IR::InterfaceDef::create_operation_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -28623,11 +28623,11 @@ void POA_IR::InterfaceDef::create_operation_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -28728,14 +28728,14 @@ POA_IR::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_InterfaceDef::_unchecked_narrow (obj.in ()); } @@ -28758,7 +28758,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -28770,11 +28770,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -28783,11 +28783,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -28809,7 +28809,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR::InterfaceDefSeq * result) { // Update the result. @@ -28835,15 +28835,15 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_base_interfaces = parameter_list->length (); parameter_list->length (length_base_interfaces + 1); (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_; - + (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -28855,11 +28855,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -28868,7 +28868,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -28907,7 +28907,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::arg Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -28919,11 +28919,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -28932,11 +28932,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -28958,7 +28958,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::tar return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result) { // Update the result. @@ -28984,14 +28984,14 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::arg Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_is_abstract = parameter_list->length (); parameter_list->length (length_is_abstract + 1); (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_); (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -29003,11 +29003,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29016,7 +29016,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -29055,7 +29055,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -29067,11 +29067,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29080,11 +29080,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -29106,7 +29106,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result) { // Update the result. @@ -29132,14 +29132,14 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_is_local = parameter_list->length (); parameter_list->length (length_is_local + 1); (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_); (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -29151,11 +29151,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29164,7 +29164,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -29205,14 +29205,14 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::arguments (COR Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_interface_id = parameter_list->length (); parameter_list->length (length_interface_id + 1); (*parameter_list)[length_interface_id].argument <<= interface_id_; (*parameter_list)[length_interface_id].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -29224,11 +29224,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::exceptions (CO Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29237,11 +29237,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -29263,7 +29263,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -29301,48 +29301,48 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_type = parameter_list->length (); parameter_list->length (length_type + 1); (*parameter_list)[length_type].argument <<= this->type_; - + (*parameter_list)[length_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_mode = parameter_list->length (); parameter_list->length (length_mode + 1); (*parameter_list)[length_mode].argument <<= this->mode_; - + (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_get_exceptions = parameter_list->length (); parameter_list->length (length_get_exceptions + 1); (*parameter_list)[length_get_exceptions].argument <<= this->get_exceptions_; - + (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_put_exceptions = parameter_list->length (); parameter_list->length (length_put_exceptions + 1); (*parameter_list)[length_put_exceptions].argument <<= this->put_exceptions_; - + (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -29354,11 +29354,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29367,11 +29367,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -29393,7 +29393,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::result (IR::AttributeDef_ptr result) { // Update the result. @@ -29433,54 +29433,54 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_result = parameter_list->length (); parameter_list->length (length_result + 1); (*parameter_list)[length_result].argument <<= this->result_; - + (*parameter_list)[length_result].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_mode = parameter_list->length (); parameter_list->length (length_mode + 1); (*parameter_list)[length_mode].argument <<= this->mode_; - + (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_params = parameter_list->length (); parameter_list->length (length_params + 1); (*parameter_list)[length_params].argument <<= this->params_; - + (*parameter_list)[length_params].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exceptions = parameter_list->length (); parameter_list->length (length_exceptions + 1); (*parameter_list)[length_exceptions].argument <<= this->exceptions_; - + (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_contexts = parameter_list->length (); parameter_list->length (length_contexts + 1); (*parameter_list)[length_contexts].argument <<= this->contexts_; - + (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -29492,11 +29492,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29505,11 +29505,11 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -29531,7 +29531,7 @@ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::result (IR::OperationDef_ptr result) { // Update the result. @@ -29694,16 +29694,16 @@ POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueMemberDe POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::_TAO_ValueMemberDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ValueMemberDef_Proxy_Impl& @@ -29712,32 +29712,32 @@ POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ValueMemberDef_ThruPOA_Proxy_Impl, @@ -29745,8 +29745,8 @@ POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -29755,9 +29755,9 @@ POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -29778,14 +29778,14 @@ int _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = _TAO_ValueMemberDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer)); @@ -29993,25 +29993,25 @@ void POA_IR::ValueMemberDef::_get_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -30022,7 +30022,7 @@ void POA_IR::ValueMemberDef::_get_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -30043,11 +30043,11 @@ void POA_IR::ValueMemberDef::_get_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -30073,25 +30073,25 @@ void POA_IR::ValueMemberDef::_get_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -30102,7 +30102,7 @@ void POA_IR::ValueMemberDef::_get_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -30123,11 +30123,11 @@ void POA_IR::ValueMemberDef::_get_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -30158,27 +30158,27 @@ void POA_IR::ValueMemberDef::_set_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set ri ( _tao_server_request, _tao_impl, type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->type_def ( type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -30186,7 +30186,7 @@ void POA_IR::ValueMemberDef::_set_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -30207,9 +30207,9 @@ void POA_IR::ValueMemberDef::_set_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -30230,25 +30230,25 @@ void POA_IR::ValueMemberDef::_get_access_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->access ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Visibility _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -30258,7 +30258,7 @@ void POA_IR::ValueMemberDef::_get_access_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -30279,11 +30279,11 @@ void POA_IR::ValueMemberDef::_get_access_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval) )) @@ -30314,27 +30314,27 @@ void POA_IR::ValueMemberDef::_set_access_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set ri ( _tao_server_request, _tao_impl , access, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->access ( access, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -30342,7 +30342,7 @@ void POA_IR::ValueMemberDef::_set_access_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -30363,9 +30363,9 @@ void POA_IR::ValueMemberDef::_set_access_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -30455,14 +30455,14 @@ POA_IR::ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ValueMemberDef::_unchecked_narrow (obj.in ()); } @@ -30485,7 +30485,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -30497,11 +30497,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -30510,11 +30510,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -30536,7 +30536,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result) { // Update the result. @@ -30560,7 +30560,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -30572,11 +30572,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -30585,11 +30585,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -30611,7 +30611,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -30637,15 +30637,15 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_type_def = parameter_list->length (); parameter_list->length (length_type_def + 1); (*parameter_list)[length_type_def].argument <<= this->type_def_; - + (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -30657,11 +30657,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -30670,7 +30670,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -30709,7 +30709,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -30721,11 +30721,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -30734,11 +30734,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -30760,7 +30760,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::targ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result) { // Update the result. @@ -30786,14 +30786,14 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::argu Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_access = parameter_list->length (); parameter_list->length (length_access + 1); (*parameter_list)[length_access].argument <<= access_; (*parameter_list)[length_access].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -30805,11 +30805,11 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::exce Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -30818,7 +30818,7 @@ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::resu CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -31029,16 +31029,16 @@ POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueDef_Strategize POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::_TAO_ValueDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::~_TAO_ValueDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ValueDef_Proxy_Impl& @@ -31047,32 +31047,32 @@ POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ValueDef_ThruPOA_Proxy_Impl, @@ -31080,8 +31080,8 @@ POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -31090,9 +31090,9 @@ POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -31113,14 +31113,14 @@ int _TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ValueDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ValueDef_Proxy_Broker_Factory_function_pointer = _TAO_ValueDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueDef_Proxy_Broker_Factory_Initializer)); @@ -31780,25 +31780,25 @@ void POA_IR::ValueDef::_get_supported_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->supported_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -31809,7 +31809,7 @@ void POA_IR::ValueDef::_get_supported_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -31830,11 +31830,11 @@ void POA_IR::ValueDef::_get_supported_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -31865,27 +31865,27 @@ void POA_IR::ValueDef::_set_supported_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set ri ( _tao_server_request, _tao_impl, supported_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->supported_interfaces ( supported_interfaces, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -31893,7 +31893,7 @@ void POA_IR::ValueDef::_set_supported_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -31914,9 +31914,9 @@ void POA_IR::ValueDef::_set_supported_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -31937,25 +31937,25 @@ void POA_IR::ValueDef::_get_initializers_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->initializers ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InitializerSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -31966,7 +31966,7 @@ void POA_IR::ValueDef::_get_initializers_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -31987,11 +31987,11 @@ void POA_IR::ValueDef::_get_initializers_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -32022,27 +32022,27 @@ void POA_IR::ValueDef::_set_initializers_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set ri ( _tao_server_request, _tao_impl, initializers, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->initializers ( initializers, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -32050,7 +32050,7 @@ void POA_IR::ValueDef::_set_initializers_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32071,9 +32071,9 @@ void POA_IR::ValueDef::_set_initializers_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -32094,25 +32094,25 @@ void POA_IR::ValueDef::_get_base_value_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_value ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -32123,7 +32123,7 @@ void POA_IR::ValueDef::_get_base_value_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32144,11 +32144,11 @@ void POA_IR::ValueDef::_get_base_value_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -32179,27 +32179,27 @@ void POA_IR::ValueDef::_set_base_value_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set ri ( _tao_server_request, _tao_impl, base_value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->base_value ( base_value.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -32207,7 +32207,7 @@ void POA_IR::ValueDef::_set_base_value_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32228,9 +32228,9 @@ void POA_IR::ValueDef::_set_base_value_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -32251,25 +32251,25 @@ void POA_IR::ValueDef::_get_abstract_base_values_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->abstract_base_values ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -32280,7 +32280,7 @@ void POA_IR::ValueDef::_get_abstract_base_values_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32301,11 +32301,11 @@ void POA_IR::ValueDef::_get_abstract_base_values_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -32336,27 +32336,27 @@ void POA_IR::ValueDef::_set_abstract_base_values_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set ri ( _tao_server_request, _tao_impl, abstract_base_values, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->abstract_base_values ( abstract_base_values, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -32364,7 +32364,7 @@ void POA_IR::ValueDef::_set_abstract_base_values_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32385,9 +32385,9 @@ void POA_IR::ValueDef::_set_abstract_base_values_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -32408,25 +32408,25 @@ void POA_IR::ValueDef::_get_is_abstract_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_abstract ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -32436,7 +32436,7 @@ void POA_IR::ValueDef::_get_is_abstract_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32457,11 +32457,11 @@ void POA_IR::ValueDef::_get_is_abstract_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -32492,27 +32492,27 @@ void POA_IR::ValueDef::_set_is_abstract_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set ri ( _tao_server_request, _tao_impl, is_abstract, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_abstract ( is_abstract, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -32520,7 +32520,7 @@ void POA_IR::ValueDef::_set_is_abstract_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32541,9 +32541,9 @@ void POA_IR::ValueDef::_set_is_abstract_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -32564,25 +32564,25 @@ void POA_IR::ValueDef::_get_is_custom_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_custom ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -32592,7 +32592,7 @@ void POA_IR::ValueDef::_get_is_custom_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32613,11 +32613,11 @@ void POA_IR::ValueDef::_get_is_custom_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -32648,27 +32648,27 @@ void POA_IR::ValueDef::_set_is_custom_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set ri ( _tao_server_request, _tao_impl, is_custom, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_custom ( is_custom, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -32676,7 +32676,7 @@ void POA_IR::ValueDef::_set_is_custom_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32697,9 +32697,9 @@ void POA_IR::ValueDef::_set_is_custom_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -32720,25 +32720,25 @@ void POA_IR::ValueDef::_get_is_truncatable_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_truncatable ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -32748,7 +32748,7 @@ void POA_IR::ValueDef::_get_is_truncatable_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32769,11 +32769,11 @@ void POA_IR::ValueDef::_get_is_truncatable_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -32804,27 +32804,27 @@ void POA_IR::ValueDef::_set_is_truncatable_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set ri ( _tao_server_request, _tao_impl, is_truncatable, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->is_truncatable ( is_truncatable, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -32832,7 +32832,7 @@ void POA_IR::ValueDef::_set_is_truncatable_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32853,9 +32853,9 @@ void POA_IR::ValueDef::_set_is_truncatable_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -32882,27 +32882,27 @@ void POA_IR::ValueDef::is_a_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a ri ( _tao_server_request, _tao_impl, id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -32912,7 +32912,7 @@ void POA_IR::ValueDef::is_a_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -32933,11 +32933,11 @@ void POA_IR::ValueDef::is_a_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -32977,7 +32977,7 @@ void POA_IR::ValueDef::create_value_member_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member ri ( _tao_server_request, _tao_impl, @@ -32988,14 +32988,14 @@ void POA_IR::ValueDef::create_value_member_skel ( access, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_value_member ( id.in (), name.in (), @@ -33005,7 +33005,7 @@ void POA_IR::ValueDef::create_value_member_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -33016,7 +33016,7 @@ void POA_IR::ValueDef::create_value_member_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -33037,11 +33037,11 @@ void POA_IR::ValueDef::create_value_member_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -33085,7 +33085,7 @@ void POA_IR::ValueDef::create_attribute_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute ri ( _tao_server_request, _tao_impl, @@ -33098,14 +33098,14 @@ void POA_IR::ValueDef::create_attribute_skel ( put_exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_attribute ( id.in (), name.in (), @@ -33117,7 +33117,7 @@ void POA_IR::ValueDef::create_attribute_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -33128,7 +33128,7 @@ void POA_IR::ValueDef::create_attribute_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -33149,11 +33149,11 @@ void POA_IR::ValueDef::create_attribute_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -33199,7 +33199,7 @@ void POA_IR::ValueDef::create_operation_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation ri ( _tao_server_request, _tao_impl, @@ -33213,14 +33213,14 @@ void POA_IR::ValueDef::create_operation_skel ( contexts, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_operation ( id.in (), name.in (), @@ -33233,7 +33233,7 @@ void POA_IR::ValueDef::create_operation_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -33244,7 +33244,7 @@ void POA_IR::ValueDef::create_operation_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -33265,11 +33265,11 @@ void POA_IR::ValueDef::create_operation_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -33370,14 +33370,14 @@ POA_IR::ValueDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ValueDef::_unchecked_narrow (obj.in ()); } @@ -33400,7 +33400,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -33412,11 +33412,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33425,11 +33425,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -33451,7 +33451,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result) { // Update the result. @@ -33477,15 +33477,15 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_supported_interfaces = parameter_list->length (); parameter_list->length (length_supported_interfaces + 1); (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_; - + (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -33497,11 +33497,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33510,7 +33510,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -33549,7 +33549,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -33561,11 +33561,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33574,11 +33574,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -33600,7 +33600,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (IR::InitializerSeq * result) { // Update the result. @@ -33626,15 +33626,15 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_initializers = parameter_list->length (); parameter_list->length (length_initializers + 1); (*parameter_list)[length_initializers].argument <<= this->initializers_; - + (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -33646,11 +33646,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33659,7 +33659,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -33698,7 +33698,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -33710,11 +33710,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33723,11 +33723,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -33749,7 +33749,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (IR::ValueDef_ptr result) { // Update the result. @@ -33775,15 +33775,15 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_base_value = parameter_list->length (); parameter_list->length (length_base_value + 1); (*parameter_list)[length_base_value].argument <<= this->base_value_; - + (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -33795,11 +33795,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33808,7 +33808,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -33847,7 +33847,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -33859,11 +33859,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33872,11 +33872,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -33898,7 +33898,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR::ValueDefSeq * result) { // Update the result. @@ -33924,15 +33924,15 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_abstract_base_values = parameter_list->length (); parameter_list->length (length_abstract_base_values + 1); (*parameter_list)[length_abstract_base_values].argument <<= this->abstract_base_values_; - + (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -33944,11 +33944,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -33957,7 +33957,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -33996,7 +33996,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -34008,11 +34008,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34021,11 +34021,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -34047,7 +34047,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result) { // Update the result. @@ -34073,14 +34073,14 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::arguments ( Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_is_abstract = parameter_list->length (); parameter_list->length (length_is_abstract + 1); (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_); (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34092,11 +34092,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34105,7 +34105,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::result (COR CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -34144,7 +34144,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -34156,11 +34156,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34169,11 +34169,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -34195,7 +34195,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result) { // Update the result. @@ -34221,14 +34221,14 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_is_custom = parameter_list->length (); parameter_list->length (length_is_custom + 1); (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_); (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34240,11 +34240,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34253,7 +34253,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -34292,7 +34292,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -34304,11 +34304,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34317,11 +34317,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -34343,7 +34343,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::target_i return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result) { // Update the result. @@ -34369,14 +34369,14 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::argument Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_is_truncatable = parameter_list->length (); parameter_list->length (length_is_truncatable + 1); (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_); (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34388,11 +34388,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::exceptio Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34401,7 +34401,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::result ( CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -34442,14 +34442,14 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Envi Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34461,11 +34461,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Env Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34474,11 +34474,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Environ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -34500,7 +34500,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -34534,35 +34534,35 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_type = parameter_list->length (); parameter_list->length (length_type + 1); (*parameter_list)[length_type].argument <<= this->type_; - + (*parameter_list)[length_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_access = parameter_list->length (); parameter_list->length (length_access + 1); (*parameter_list)[length_access].argument <<= access_; (*parameter_list)[length_access].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34574,11 +34574,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34587,11 +34587,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -34613,7 +34613,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result (IR::ValueMemberDef_ptr result) { // Update the result. @@ -34651,48 +34651,48 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_type = parameter_list->length (); parameter_list->length (length_type + 1); (*parameter_list)[length_type].argument <<= this->type_; - + (*parameter_list)[length_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_mode = parameter_list->length (); parameter_list->length (length_mode + 1); (*parameter_list)[length_mode].argument <<= this->mode_; - + (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_get_exceptions = parameter_list->length (); parameter_list->length (length_get_exceptions + 1); (*parameter_list)[length_get_exceptions].argument <<= this->get_exceptions_; - + (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_put_exceptions = parameter_list->length (); parameter_list->length (length_put_exceptions + 1); (*parameter_list)[length_put_exceptions].argument <<= this->put_exceptions_; - + (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34704,11 +34704,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34717,11 +34717,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -34743,7 +34743,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (IR::AttributeDef_ptr result) { // Update the result. @@ -34783,54 +34783,54 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_result = parameter_list->length (); parameter_list->length (length_result + 1); (*parameter_list)[length_result].argument <<= this->result_; - + (*parameter_list)[length_result].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_mode = parameter_list->length (); parameter_list->length (length_mode + 1); (*parameter_list)[length_mode].argument <<= this->mode_; - + (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_params = parameter_list->length (); parameter_list->length (length_params + 1); (*parameter_list)[length_params].argument <<= this->params_; - + (*parameter_list)[length_params].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exceptions = parameter_list->length (); parameter_list->length (length_exceptions + 1); (*parameter_list)[length_exceptions].argument <<= this->exceptions_; - + (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_contexts = parameter_list->length (); parameter_list->length (length_contexts + 1); (*parameter_list)[length_contexts].argument <<= this->contexts_; - + (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -34842,11 +34842,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34855,11 +34855,11 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -34881,7 +34881,7 @@ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (IR::OperationDef_ptr result) { // Update the result. @@ -35042,16 +35042,16 @@ POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueBoxDef_Stra POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::_TAO_ValueBoxDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ValueBoxDef_Proxy_Impl& @@ -35060,32 +35060,32 @@ POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ValueBoxDef_ThruPOA_Proxy_Impl, @@ -35093,8 +35093,8 @@ POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -35103,9 +35103,9 @@ POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -35126,14 +35126,14 @@ int _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = _TAO_ValueBoxDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer)); @@ -35249,25 +35249,25 @@ void POA_IR::ValueBoxDef::_get_original_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->original_type_def ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_IDLType_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -35278,7 +35278,7 @@ void POA_IR::ValueBoxDef::_get_original_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -35299,11 +35299,11 @@ void POA_IR::ValueBoxDef::_get_original_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -35334,27 +35334,27 @@ void POA_IR::ValueBoxDef::_set_original_type_def_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set ri ( _tao_server_request, _tao_impl, original_type_def.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->original_type_def ( original_type_def.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -35362,7 +35362,7 @@ void POA_IR::ValueBoxDef::_set_original_type_def_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -35383,9 +35383,9 @@ void POA_IR::ValueBoxDef::_set_original_type_def_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -35481,14 +35481,14 @@ POA_IR::ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ValueBoxDef::_unchecked_narrow (obj.in ()); } @@ -35511,7 +35511,7 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -35523,11 +35523,11 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -35536,11 +35536,11 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -35562,7 +35562,7 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR::IDLType_ptr result) { // Update the result. @@ -35588,15 +35588,15 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_original_type_def = parameter_list->length (); parameter_list->length (length_original_type_def + 1); (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_; - + (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -35608,11 +35608,11 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -35621,7 +35621,7 @@ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -35795,16 +35795,16 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker *POA_IR::_TAO_ProvidesDef_Stra POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::_TAO_ProvidesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ProvidesDef_Proxy_Impl& @@ -35813,32 +35813,32 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ProvidesDef_ThruPOA_Proxy_Impl, @@ -35846,8 +35846,8 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -35856,9 +35856,9 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -35879,14 +35879,14 @@ int _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = _TAO_ProvidesDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer)); @@ -35968,25 +35968,25 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->interface_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -35997,7 +35997,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -36018,11 +36018,11 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -36117,14 +36117,14 @@ POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ProvidesDef::_unchecked_narrow (obj.in ()); } @@ -36147,7 +36147,7 @@ POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -36159,11 +36159,11 @@ POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36172,11 +36172,11 @@ POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -36198,7 +36198,7 @@ POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (IR::InterfaceDef_ptr result) { // Update the result. @@ -36358,16 +36358,16 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker *POA_IR::_TAO_UsesDef_Strategized_ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::_TAO_UsesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_UsesDef_Proxy_Impl& @@ -36376,32 +36376,32 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_UsesDef_ThruPOA_Proxy_Impl, @@ -36409,8 +36409,8 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -36419,9 +36419,9 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -36442,14 +36442,14 @@ int _TAO_UsesDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_UsesDef_Proxy_Broker_Factory_function_pointer = + + _TAO_UsesDef_Proxy_Broker_Factory_function_pointer = _TAO_UsesDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UsesDef_Proxy_Broker_Factory_Initializer)); @@ -36562,25 +36562,25 @@ void POA_IR::UsesDef::_get_interface_type_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->interface_type ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -36591,7 +36591,7 @@ void POA_IR::UsesDef::_get_interface_type_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -36612,11 +36612,11 @@ void POA_IR::UsesDef::_get_interface_type_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -36642,25 +36642,25 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_multiple ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -36670,7 +36670,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -36691,11 +36691,11 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -36790,14 +36790,14 @@ POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_UsesDef::_unchecked_narrow (obj.in ()); } @@ -36820,7 +36820,7 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -36832,11 +36832,11 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36845,11 +36845,11 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -36871,7 +36871,7 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (IR::InterfaceDef_ptr result) { // Update the result. @@ -36895,7 +36895,7 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -36907,11 +36907,11 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36920,11 +36920,11 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -36946,7 +36946,7 @@ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result) { // Update the result. @@ -37106,16 +37106,16 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker *POA_IR::_TAO_EventDef_Strategize POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::_TAO_EventDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_EventDef_Proxy_Impl& @@ -37124,32 +37124,32 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_EventDef_ThruPOA_Proxy_Impl, @@ -37157,8 +37157,8 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -37167,9 +37167,9 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -37190,14 +37190,14 @@ int _TAO_EventDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_EventDef_Proxy_Broker_Factory_function_pointer = + + _TAO_EventDef_Proxy_Broker_Factory_function_pointer = _TAO_EventDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EventDef_Proxy_Broker_Factory_Initializer)); @@ -37318,27 +37318,27 @@ void POA_IR::EventDef::is_a_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a ri ( _tao_server_request, _tao_impl, event_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( event_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -37348,7 +37348,7 @@ void POA_IR::EventDef::is_a_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -37369,11 +37369,11 @@ void POA_IR::EventDef::is_a_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -37399,25 +37399,25 @@ void POA_IR::EventDef::_get_event_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->event ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -37428,7 +37428,7 @@ void POA_IR::EventDef::_get_event_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -37449,11 +37449,11 @@ void POA_IR::EventDef::_get_event_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -37548,14 +37548,14 @@ POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_EventDef::_unchecked_narrow (obj.in ()); } @@ -37580,14 +37580,14 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Envi Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_event_id = parameter_list->length (); parameter_list->length (length_event_id + 1); (*parameter_list)[length_event_id].argument <<= event_id_; (*parameter_list)[length_event_id].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -37599,11 +37599,11 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Env Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -37612,11 +37612,11 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -37638,7 +37638,7 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -37662,7 +37662,7 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -37674,11 +37674,11 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -37687,11 +37687,11 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -37713,7 +37713,7 @@ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (IR::ValueDef_ptr result) { // Update the result. @@ -37873,16 +37873,16 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker *POA_IR::_TAO_EmitsDef_Strategize POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::_TAO_EmitsDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_EmitsDef_Proxy_Impl& @@ -37891,32 +37891,32 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_EmitsDef_ThruPOA_Proxy_Impl, @@ -37924,8 +37924,8 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -37934,9 +37934,9 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -37957,14 +37957,14 @@ int _TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = + + _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = _TAO_EmitsDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EmitsDef_Proxy_Broker_Factory_Initializer)); @@ -38088,14 +38088,14 @@ POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_EmitsDef::_unchecked_narrow (obj.in ()); } @@ -38254,16 +38254,16 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker *POA_IR::_TAO_PublishesDef_St POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::_TAO_PublishesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_PublishesDef_Proxy_Impl& @@ -38272,32 +38272,32 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_PublishesDef_ThruPOA_Proxy_Impl, @@ -38305,8 +38305,8 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -38315,9 +38315,9 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -38338,14 +38338,14 @@ int _TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = + + _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = _TAO_PublishesDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PublishesDef_Proxy_Broker_Factory_Initializer)); @@ -38469,14 +38469,14 @@ POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_PublishesDef::_unchecked_narrow (obj.in ()); } @@ -38635,16 +38635,16 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker *POA_IR::_TAO_ConsumesDef_Stra POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::_TAO_ConsumesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ConsumesDef_Proxy_Impl& @@ -38653,32 +38653,32 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ConsumesDef_ThruPOA_Proxy_Impl, @@ -38686,8 +38686,8 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -38696,9 +38696,9 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -38719,14 +38719,14 @@ int _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = _TAO_ConsumesDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer)); @@ -38850,14 +38850,14 @@ POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ConsumesDef::_unchecked_narrow (obj.in ()); } @@ -39056,16 +39056,16 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker *POA_IR::_TAO_ComponentDef_St POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::_TAO_ComponentDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_ComponentDef_Proxy_Impl& @@ -39074,32 +39074,32 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_ComponentDef_ThruPOA_Proxy_Impl, @@ -39107,8 +39107,8 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -39117,9 +39117,9 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -39140,14 +39140,14 @@ int _TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = + + _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = _TAO_ComponentDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentDef_Proxy_Broker_Factory_Initializer)); @@ -39678,25 +39678,25 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->supported_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -39707,7 +39707,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -39728,11 +39728,11 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -39763,27 +39763,27 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set ri ( _tao_server_request, _tao_impl, supported_interfaces, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_impl->supported_interfaces ( supported_interfaces, ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -39791,7 +39791,7 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -39812,9 +39812,9 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + // In case ACE_TRY_ENV is not used in this function ACE_UNUSED_ARG (ACE_TRY_ENV); } @@ -39835,25 +39835,25 @@ void POA_IR::ComponentDef::_get_base_component_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_component ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -39864,7 +39864,7 @@ void POA_IR::ComponentDef::_get_base_component_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -39885,11 +39885,11 @@ void POA_IR::ComponentDef::_get_base_component_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -39915,25 +39915,25 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->provides_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ProvidesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -39944,7 +39944,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -39965,11 +39965,11 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -39995,25 +39995,25 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->uses_interfaces ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_UsesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40024,7 +40024,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40045,11 +40045,11 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40075,25 +40075,25 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->emits_events ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_EmitsDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40104,7 +40104,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40125,11 +40125,11 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40155,25 +40155,25 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->publishes_events ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_PublishesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40184,7 +40184,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40205,11 +40205,11 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40235,25 +40235,25 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->consumes_events ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ConsumesDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40264,7 +40264,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40285,11 +40285,11 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40315,25 +40315,25 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_basic ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -40343,7 +40343,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40364,11 +40364,11 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -40406,7 +40406,7 @@ void POA_IR::ComponentDef::create_provides_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides ri ( _tao_server_request, _tao_impl, @@ -40416,14 +40416,14 @@ void POA_IR::ComponentDef::create_provides_skel ( interface_type.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_provides ( id.in (), name.in (), @@ -40432,7 +40432,7 @@ void POA_IR::ComponentDef::create_provides_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ProvidesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40443,7 +40443,7 @@ void POA_IR::ComponentDef::create_provides_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40464,11 +40464,11 @@ void POA_IR::ComponentDef::create_provides_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40508,7 +40508,7 @@ void POA_IR::ComponentDef::create_uses_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses ri ( _tao_server_request, _tao_impl, @@ -40519,14 +40519,14 @@ void POA_IR::ComponentDef::create_uses_skel ( is_multiple, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_uses ( id.in (), name.in (), @@ -40536,7 +40536,7 @@ void POA_IR::ComponentDef::create_uses_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_UsesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40547,7 +40547,7 @@ void POA_IR::ComponentDef::create_uses_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40568,11 +40568,11 @@ void POA_IR::ComponentDef::create_uses_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40610,7 +40610,7 @@ void POA_IR::ComponentDef::create_emits_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits ri ( _tao_server_request, _tao_impl, @@ -40620,14 +40620,14 @@ void POA_IR::ComponentDef::create_emits_skel ( value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_emits ( id.in (), name.in (), @@ -40636,7 +40636,7 @@ void POA_IR::ComponentDef::create_emits_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_EmitsDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40647,7 +40647,7 @@ void POA_IR::ComponentDef::create_emits_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40668,11 +40668,11 @@ void POA_IR::ComponentDef::create_emits_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40710,7 +40710,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes ri ( _tao_server_request, _tao_impl, @@ -40720,14 +40720,14 @@ void POA_IR::ComponentDef::create_publishes_skel ( value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_publishes ( id.in (), name.in (), @@ -40736,7 +40736,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_PublishesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40747,7 +40747,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40768,11 +40768,11 @@ void POA_IR::ComponentDef::create_publishes_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40810,7 +40810,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes ri ( _tao_server_request, _tao_impl, @@ -40820,14 +40820,14 @@ void POA_IR::ComponentDef::create_consumes_skel ( value.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_consumes ( id.in (), name.in (), @@ -40836,7 +40836,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ConsumesDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -40847,7 +40847,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -40868,11 +40868,11 @@ void POA_IR::ComponentDef::create_consumes_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -40976,14 +40976,14 @@ POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_ComponentDef::_unchecked_narrow (obj.in ()); } @@ -41006,7 +41006,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41018,11 +41018,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41031,11 +41031,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41057,7 +41057,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result) { // Update the result. @@ -41083,15 +41083,15 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_supported_interfaces = parameter_list->length (); parameter_list->length (length_supported_interfaces + 1); (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_; - + (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -41103,11 +41103,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41116,7 +41116,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return result_any; } @@ -41155,7 +41155,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get:: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41167,11 +41167,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get:: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41180,11 +41180,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41206,7 +41206,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get:: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result) { // Update the result. @@ -41230,7 +41230,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_ Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41242,11 +41242,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_ Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41255,11 +41255,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_ CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41281,7 +41281,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result) { // Update the result. @@ -41305,7 +41305,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41317,11 +41317,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41330,11 +41330,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41356,7 +41356,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result) { // Update the result. @@ -41380,7 +41380,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41392,11 +41392,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41405,11 +41405,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41431,7 +41431,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result) { // Update the result. @@ -41455,7 +41455,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41467,11 +41467,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41480,11 +41480,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41506,7 +41506,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result) { // Update the result. @@ -41530,7 +41530,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41542,11 +41542,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get: Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41555,11 +41555,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41581,7 +41581,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get: return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result) { // Update the result. @@ -41605,7 +41605,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -41617,11 +41617,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41630,11 +41630,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -41656,7 +41656,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result) { // Update the result. @@ -41688,30 +41688,30 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arg Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_interface_type = parameter_list->length (); parameter_list->length (length_interface_type + 1); (*parameter_list)[length_interface_type].argument <<= this->interface_type_; - + (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -41723,11 +41723,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41736,11 +41736,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41762,7 +41762,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::tar return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result) { // Update the result. @@ -41796,35 +41796,35 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_interface_type = parameter_list->length (); parameter_list->length (length_interface_type + 1); (*parameter_list)[length_interface_type].argument <<= this->interface_type_; - + (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_is_multiple = parameter_list->length (); parameter_list->length (length_is_multiple + 1); (*parameter_list)[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_); (*parameter_list)[length_is_multiple].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -41836,11 +41836,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41849,11 +41849,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41875,7 +41875,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result) { // Update the result. @@ -41907,30 +41907,30 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::argume Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_value = parameter_list->length (); parameter_list->length (length_value + 1); (*parameter_list)[length_value].argument <<= this->value_; - + (*parameter_list)[length_value].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -41942,11 +41942,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::except Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -41955,11 +41955,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -41981,7 +41981,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result) { // Update the result. @@ -42013,30 +42013,30 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::ar Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_value = parameter_list->length (); parameter_list->length (length_value + 1); (*parameter_list)[length_value].argument <<= this->value_; - + (*parameter_list)[length_value].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -42048,11 +42048,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::ex Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42061,11 +42061,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::re CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -42087,7 +42087,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::ta return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result) { // Update the result. @@ -42119,30 +42119,30 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arg Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_value = parameter_list->length (); parameter_list->length (length_value + 1); (*parameter_list)[length_value].argument <<= this->value_; - + (*parameter_list)[length_value].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -42154,11 +42154,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42167,11 +42167,11 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -42193,7 +42193,7 @@ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::tar return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result) { // Update the result. @@ -42353,16 +42353,16 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker *POA_IR::_TAO_PrimaryKeyDef_ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_PrimaryKeyDef_Proxy_Impl& @@ -42371,32 +42371,32 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl, @@ -42404,8 +42404,8 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -42414,9 +42414,9 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -42437,14 +42437,14 @@ int _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer = + + _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer = _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer)); @@ -42565,27 +42565,27 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a ri ( _tao_server_request, _tao_impl, primary_key_id.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_a ( primary_key_id.in (), ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -42595,7 +42595,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -42616,11 +42616,11 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -42646,25 +42646,25 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->primary_key ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -42675,7 +42675,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -42696,11 +42696,11 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -42795,14 +42795,14 @@ POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_PrimaryKeyDef::_unchecked_narrow (obj.in ()); } @@ -42827,14 +42827,14 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (C Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_primary_key_id = parameter_list->length (); parameter_list->length (length_primary_key_id + 1); (*parameter_list)[length_primary_key_id].argument <<= primary_key_id_; (*parameter_list)[length_primary_key_id].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -42846,11 +42846,11 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions ( Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42859,11 +42859,11 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORB CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -42885,7 +42885,7 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result) { // Update the result. @@ -42909,7 +42909,7 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::a Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -42921,11 +42921,11 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::e Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42934,11 +42934,11 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::r CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -42960,7 +42960,7 @@ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::t return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR::ValueDef_ptr result) { // Update the result. @@ -43178,16 +43178,16 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker *POA_IR::_TAO_FactoryDef_Strate POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::_TAO_FactoryDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_FactoryDef_Proxy_Impl& @@ -43196,32 +43196,32 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_FactoryDef_ThruPOA_Proxy_Impl, @@ -43229,8 +43229,8 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -43239,9 +43239,9 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -43262,14 +43262,14 @@ int _TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = + + _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = _TAO_FactoryDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FactoryDef_Proxy_Broker_Factory_Initializer)); @@ -43393,14 +43393,14 @@ POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_FactoryDef::_unchecked_narrow (obj.in ()); } @@ -43617,16 +43617,16 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker *POA_IR::_TAO_FinderDef_Strategi POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::_TAO_FinderDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_FinderDef_Proxy_Impl& @@ -43635,32 +43635,32 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_FinderDef_ThruPOA_Proxy_Impl, @@ -43668,8 +43668,8 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -43678,9 +43678,9 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -43701,14 +43701,14 @@ int _TAO_FinderDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_FinderDef_Proxy_Broker_Factory_function_pointer = + + _TAO_FinderDef_Proxy_Broker_Factory_function_pointer = _TAO_FinderDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FinderDef_Proxy_Broker_Factory_Initializer)); @@ -43832,14 +43832,14 @@ POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_FinderDef::_unchecked_narrow (obj.in ()); } @@ -44034,16 +44034,16 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker *POA_IR::_TAO_HomeDef_Strategized_ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::_TAO_HomeDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } _TAO_HomeDef_Proxy_Impl& @@ -44052,32 +44052,32 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], _TAO_HomeDef_ThruPOA_Proxy_Impl, @@ -44085,8 +44085,8 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - - case TAO_ORB_Core::REMOTE_STRATEGY: + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], @@ -44095,9 +44095,9 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( ); ACE_CHECK; break; - + } - + } } @@ -44118,14 +44118,14 @@ int _TAO_HomeDef_Proxy_Broker_Factory_Initializer (long _dummy_) { ACE_UNUSED_ARG (_dummy_); - - _TAO_HomeDef_Proxy_Broker_Factory_function_pointer = + + _TAO_HomeDef_Proxy_Broker_Factory_function_pointer = _TAO_HomeDef_Proxy_Broker_Factory_function; - + return 0; } -static int _TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = +static int _TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = _TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_HomeDef_Proxy_Broker_Factory_Initializer)); @@ -44486,25 +44486,25 @@ void POA_IR::HomeDef::_get_base_home_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->base_home ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -44515,7 +44515,7 @@ void POA_IR::HomeDef::_get_base_home_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -44536,11 +44536,11 @@ void POA_IR::HomeDef::_get_base_home_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -44566,25 +44566,25 @@ void POA_IR::HomeDef::_get_managed_component_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->managed_component ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -44595,7 +44595,7 @@ void POA_IR::HomeDef::_get_managed_component_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -44616,11 +44616,11 @@ void POA_IR::HomeDef::_get_managed_component_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -44646,25 +44646,25 @@ void POA_IR::HomeDef::_get_primary_key_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->primary_key ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -44675,7 +44675,7 @@ void POA_IR::HomeDef::_get_primary_key_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -44696,11 +44696,11 @@ void POA_IR::HomeDef::_get_primary_key_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -44726,25 +44726,25 @@ void POA_IR::HomeDef::_get_factories_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->factories ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_FactoryDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -44755,7 +44755,7 @@ void POA_IR::HomeDef::_get_factories_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -44776,11 +44776,11 @@ void POA_IR::HomeDef::_get_factories_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -44806,25 +44806,25 @@ void POA_IR::HomeDef::_get_finders_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->finders ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_FinderDefSeq * _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -44835,7 +44835,7 @@ void POA_IR::HomeDef::_get_finders_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -44856,11 +44856,11 @@ void POA_IR::HomeDef::_get_finders_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -44886,25 +44886,25 @@ void POA_IR::HomeDef::_get_is_basic_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get ri ( _tao_server_request, _tao_impl, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->is_basic ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); @@ -44914,7 +44914,7 @@ void POA_IR::HomeDef::_get_is_basic_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -44935,11 +44935,11 @@ void POA_IR::HomeDef::_get_is_basic_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) @@ -44977,7 +44977,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key ri ( _tao_server_request, _tao_impl, @@ -44987,14 +44987,14 @@ void POA_IR::HomeDef::create_primary_key_skel ( primary_key.in (), ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_primary_key ( id.in (), name.in (), @@ -45003,7 +45003,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -45014,7 +45014,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -45035,11 +45035,11 @@ void POA_IR::HomeDef::create_primary_key_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -45079,7 +45079,7 @@ void POA_IR::HomeDef::create_factory_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory ri ( _tao_server_request, _tao_impl, @@ -45090,14 +45090,14 @@ void POA_IR::HomeDef::create_factory_skel ( exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_factory ( id.in (), name.in (), @@ -45107,7 +45107,7 @@ void POA_IR::HomeDef::create_factory_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_FactoryDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -45118,7 +45118,7 @@ void POA_IR::HomeDef::create_factory_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -45139,11 +45139,11 @@ void POA_IR::HomeDef::create_factory_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -45183,7 +45183,7 @@ void POA_IR::HomeDef::create_finder_skel ( _tao_server_request.orb_core ()->server_request_interceptors (), _tao_server_request.interceptor_count () ); - + POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder ri ( _tao_server_request, _tao_impl, @@ -45194,14 +45194,14 @@ void POA_IR::HomeDef::create_finder_skel ( exceptions, ACE_TRY_ENV ); - + ACE_TRY { _tao_vfr.receive_request (&ri, ACE_TRY_ENV); ACE_TRY_CHECK; - + #endif /* TAO_HAS_INTERCEPTORS */ - _tao_retval = + _tao_retval = _tao_impl->create_finder ( id.in (), name.in (), @@ -45211,7 +45211,7 @@ void POA_IR::HomeDef::create_finder_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) IR_FinderDef_ptr _tao_retval_info = _tao_retval._retn (); ri.result (_tao_retval_info); @@ -45222,7 +45222,7 @@ void POA_IR::HomeDef::create_finder_skel ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ri.forward_reference (exc); + ri.forward_reference (exc); _tao_vfr.send_other ( &ri, ACE_TRY_ENV @@ -45243,11 +45243,11 @@ void POA_IR::HomeDef::create_finder_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << _tao_retval.in ()) )) @@ -45351,14 +45351,14 @@ POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_ptr tmp = CORBA::Object::_nil (); - + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); - + CORBA::Object_var obj = tmp; return IR_HomeDef::_unchecked_narrow (obj.in ()); } @@ -45381,7 +45381,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -45393,11 +45393,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45406,11 +45406,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -45432,7 +45432,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result) { // Update the result. @@ -45456,7 +45456,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::argumen Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -45468,11 +45468,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::excepti Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45481,11 +45481,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -45507,7 +45507,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result) { // Update the result. @@ -45531,7 +45531,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (CO Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -45543,11 +45543,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (C Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45556,11 +45556,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -45582,7 +45582,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result) { // Update the result. @@ -45606,7 +45606,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -45618,11 +45618,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45631,11 +45631,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -45657,7 +45657,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result) { // Update the result. @@ -45681,7 +45681,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (CORBA: Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -45693,11 +45693,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45706,11 +45706,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::En CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -45732,7 +45732,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result) { // Update the result. @@ -45756,7 +45756,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return parameter_list; } @@ -45768,11 +45768,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORB Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45781,11 +45781,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::E CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= CORBA::Any::from_boolean (this->_result); - + return safe_result_any._retn (); } @@ -45807,7 +45807,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result) { // Update the result. @@ -45839,30 +45839,30 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_primary_key = parameter_list->length (); parameter_list->length (length_primary_key + 1); (*parameter_list)[length_primary_key].argument <<= this->primary_key_; - + (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -45874,11 +45874,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -45887,11 +45887,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CO CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -45913,7 +45913,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_ return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result) { // Update the result. @@ -45947,36 +45947,36 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (COR Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_params = parameter_list->length (); parameter_list->length (length_params + 1); (*parameter_list)[length_params].argument <<= this->params_; - + (*parameter_list)[length_params].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exceptions = parameter_list->length (); parameter_list->length (length_exceptions + 1); (*parameter_list)[length_exceptions].argument <<= this->exceptions_; - + (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -45988,11 +45988,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (CO Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -46001,11 +46001,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -46027,7 +46027,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result) { // Update the result. @@ -46061,36 +46061,36 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORB Dynamic::ParameterList *parameter_list = TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + Dynamic::ParameterList_var safe_parameter_list = parameter_list; - + CORBA::ULong length_id = parameter_list->length (); parameter_list->length (length_id + 1); (*parameter_list)[length_id].argument <<= id_; (*parameter_list)[length_id].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_name = parameter_list->length (); parameter_list->length (length_name + 1); (*parameter_list)[length_name].argument <<= name_; (*parameter_list)[length_name].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_version = parameter_list->length (); parameter_list->length (length_version + 1); (*parameter_list)[length_version].argument <<= version_; (*parameter_list)[length_version].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_params = parameter_list->length (); parameter_list->length (length_params + 1); (*parameter_list)[length_params].argument <<= this->params_; - + (*parameter_list)[length_params].mode = Dynamic::PARAM_IN; - + CORBA::ULong length_exceptions = parameter_list->length (); parameter_list->length (length_exceptions + 1); (*parameter_list)[length_exceptions].argument <<= this->exceptions_; - + (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN; - + return safe_parameter_list._retn (); } @@ -46102,11 +46102,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (COR Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return exception_list; } -CORBA::Any * +CORBA::Any * POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -46115,11 +46115,11 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA:: CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; - + return safe_result_any._retn (); } @@ -46141,7 +46141,7 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a ( return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void +void POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result) { // Update the result. @@ -46151,4 +46151,3 @@ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (IR::Fin #endif /* TAO_HAS_INTERCEPTORS */ #endif /* ifndef TAO_IDL_INTERFACES_CPP */ - diff --git a/TAO/orbsvcs/IFR_Service/InterfaceS.h b/TAO/orbsvcs/IFR_Service/InterfaceS.h index d73b559d338..6e478ebcee2 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceS.h +++ b/TAO/orbsvcs/IFR_Service/InterfaceS.h @@ -149,7 +149,7 @@ public: TAO_ServerRequest &_tao_server_request, POA_CORBA_IRObject *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -158,37 +158,37 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &); void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &); - + private: POA_CORBA_IRObject *_tao_impl; void result (IR::DefinitionKind result); - // update the result + // update the result IR_DefinitionKind _result; }; @@ -200,7 +200,7 @@ public: TAO_ServerRequest &_tao_server_request, POA_CORBA_IRObject *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -209,33 +209,33 @@ public: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_CORBA_IRObject_destroy (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &); void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &); - + private: POA_CORBA_IRObject *_tao_impl; }; @@ -245,13 +245,13 @@ public: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // -class _TAO_IRObject_Strategized_Proxy_Broker +class _TAO_IRObject_Strategized_Proxy_Broker : public virtual _TAO_IRObject_Proxy_Broker { -public: +public: _TAO_IRObject_Strategized_Proxy_Broker (void); virtual ~_TAO_IRObject_Strategized_Proxy_Broker (void); @@ -266,7 +266,7 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); @@ -275,7 +275,7 @@ private: // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. - _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance @@ -288,7 +288,7 @@ public: // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -296,7 +296,7 @@ public: // ThruPOA Impl. Declaration // -class _TAO_IRObject_ThruPOA_Proxy_Impl +class _TAO_IRObject_ThruPOA_Proxy_Impl : public virtual _TAO_IRObject_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl { @@ -334,7 +334,7 @@ TAO_NAMESPACE POA_IR // Forward Classes Declaration class _TAO_Contained_ThruPOA_Proxy_Impl; class _TAO_Contained_Strategized_Proxy_Broker; - + class Contained : public virtual POA_CORBA_IRObject { protected: @@ -595,7 +595,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -604,37 +604,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_id_get (const TAO_ServerRequestInfo_IR_Contained_id_get &); void operator= (const TAO_ServerRequestInfo_IR_Contained_id_get &); - + private: POA_IR::Contained *_tao_impl; void result (char *result); - // update the result + // update the result char * _result; }; @@ -647,7 +647,7 @@ TAO_NAMESPACE POA_IR POA_IR::Contained *tao_impl , const char * id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -656,33 +656,33 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_id_set (const TAO_ServerRequestInfo_IR_Contained_id_set &); void operator= (const TAO_ServerRequestInfo_IR_Contained_id_set &); - + private: POA_IR::Contained *_tao_impl; const char * id_; @@ -696,7 +696,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -705,37 +705,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_name_get (const TAO_ServerRequestInfo_IR_Contained_name_get &); void operator= (const TAO_ServerRequestInfo_IR_Contained_name_get &); - + private: POA_IR::Contained *_tao_impl; void result (char * result); - // update the result + // update the result char * _result; }; @@ -748,7 +748,7 @@ TAO_NAMESPACE POA_IR POA_IR::Contained *tao_impl , const char * name, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -757,33 +757,33 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_name_set (const TAO_ServerRequestInfo_IR_Contained_name_set &); void operator= (const TAO_ServerRequestInfo_IR_Contained_name_set &); - + private: POA_IR::Contained *_tao_impl; const char * name_; @@ -797,7 +797,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -806,37 +806,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_version_get (const TAO_ServerRequestInfo_IR_Contained_version_get &); void operator= (const TAO_ServerRequestInfo_IR_Contained_version_get &); - + private: POA_IR::Contained *_tao_impl; void result (char * result); - // update the result + // update the result char * _result; }; @@ -849,7 +849,7 @@ TAO_NAMESPACE POA_IR POA_IR::Contained *tao_impl , const char * version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -858,33 +858,33 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_version_set (const TAO_ServerRequestInfo_IR_Contained_version_set &); void operator= (const TAO_ServerRequestInfo_IR_Contained_version_set &); - + private: POA_IR::Contained *_tao_impl; const char * version_; @@ -898,7 +898,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -907,37 +907,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_defined_in_get (const TAO_ServerRequestInfo_IR_Contained_defined_in_get &); void operator= (const TAO_ServerRequestInfo_IR_Contained_defined_in_get &); - + private: POA_IR::Contained *_tao_impl; void result (IR::Container_ptr result); - // update the result + // update the result IR_Container_ptr _result; }; @@ -949,7 +949,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -958,37 +958,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_absolute_name_get (const TAO_ServerRequestInfo_IR_Contained_absolute_name_get &); void operator= (const TAO_ServerRequestInfo_IR_Contained_absolute_name_get &); - + private: POA_IR::Contained *_tao_impl; void result (char * result); - // update the result + // update the result char * _result; }; @@ -1000,7 +1000,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1009,37 +1009,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_containing_repository_get (const TAO_ServerRequestInfo_IR_Contained_containing_repository_get &); void operator= (const TAO_ServerRequestInfo_IR_Contained_containing_repository_get &); - + private: POA_IR::Contained *_tao_impl; void result (IR::Repository_ptr result); - // update the result + // update the result IR_Repository_ptr _result; }; @@ -1051,7 +1051,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_server_request, POA_IR::Contained *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1060,37 +1060,37 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_describe (const TAO_ServerRequestInfo_IR_Contained_describe &); void operator= (const TAO_ServerRequestInfo_IR_Contained_describe &); - + private: POA_IR::Contained *_tao_impl; void result (IR::Contained::Description * result); - // update the result + // update the result IR_Contained::Description * _result; }; @@ -1105,7 +1105,7 @@ TAO_NAMESPACE POA_IR IR_Container_ptr new_container, const char * new_name, const char * new_version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1114,33 +1114,33 @@ TAO_NAMESPACE POA_IR TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Contained_move (const TAO_ServerRequestInfo_IR_Contained_move &); void operator= (const TAO_ServerRequestInfo_IR_Contained_move &); - + private: POA_IR::Contained *_tao_impl; IR_Container_ptr new_container_; @@ -1153,12 +1153,12 @@ TAO_NAMESPACE POA_IR }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_Contained_Strategized_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker { -public: +public: _TAO_Contained_Strategized_Proxy_Broker (void); virtual ~_TAO_Contained_Strategized_Proxy_Broker (void); @@ -1173,18 +1173,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_Contained_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -1195,7 +1195,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -1203,17 +1203,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_Contained_ThruPOA_Proxy_Impl : +class _TAO_Contained_ThruPOA_Proxy_Impl : public virtual _TAO_Contained_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual _TAO_IRObject_ThruPOA_Proxy_Impl - + { public: _TAO_Contained_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) { } - + virtual char * id ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -1844,7 +1844,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -1859,7 +1859,7 @@ private: POA_IR::Container *tao_impl , const char * search_name, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1868,38 +1868,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_lookup (const TAO_ServerRequestInfo_IR_Container_lookup &); void operator= (const TAO_ServerRequestInfo_IR_Container_lookup &); - + private: POA_IR::Container *_tao_impl; const char * search_name_; void result (IR::Contained_ptr result); - // update the result + // update the result IR_Contained_ptr _result; }; @@ -1913,7 +1913,7 @@ private: , IR_DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1922,39 +1922,39 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_contents (const TAO_ServerRequestInfo_IR_Container_contents &); void operator= (const TAO_ServerRequestInfo_IR_Container_contents &); - + private: POA_IR::Container *_tao_impl; const IR_DefinitionKind & limit_type_; const CORBA::Boolean & exclude_inherited_; void result (IR::ContainedSeq * result); - // update the result + // update the result IR_ContainedSeq * _result; }; @@ -1970,7 +1970,7 @@ private: const CORBA::Long & levels_to_search, IR_DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -1979,33 +1979,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_lookup_name (const TAO_ServerRequestInfo_IR_Container_lookup_name &); void operator= (const TAO_ServerRequestInfo_IR_Container_lookup_name &); - + private: POA_IR::Container *_tao_impl; const char * search_name_; @@ -2013,7 +2013,7 @@ private: const IR_DefinitionKind & limit_type_; const CORBA::Boolean & exclude_inherited_; void result (IR::ContainedSeq * result); - // update the result + // update the result IR_ContainedSeq * _result; }; @@ -2028,7 +2028,7 @@ private: IR_DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2037,40 +2037,40 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_describe_contents (const TAO_ServerRequestInfo_IR_Container_describe_contents &); void operator= (const TAO_ServerRequestInfo_IR_Container_describe_contents &); - + private: POA_IR::Container *_tao_impl; const IR_DefinitionKind & limit_type_; const CORBA::Boolean & exclude_inherited_; const CORBA::Long & max_returned_objs_; void result (IR::Container::DescriptionSeq * result); - // update the result + // update the result IR_Container::DescriptionSeq * _result; }; @@ -2085,7 +2085,7 @@ private: const char * id, const char * name, const char * version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2094,40 +2094,40 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_module (const TAO_ServerRequestInfo_IR_Container_create_module &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_module &); - + private: POA_IR::Container *_tao_impl; const char * id_; const char * name_; const char * version_; void result (IR::ModuleDef_ptr result); - // update the result + // update the result IR_ModuleDef_ptr _result; }; @@ -2144,7 +2144,7 @@ private: const char * version, IR_IDLType_ptr type, const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2153,33 +2153,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_constant (const TAO_ServerRequestInfo_IR_Container_create_constant &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_constant &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2188,7 +2188,7 @@ private: IR_IDLType_ptr type_; const CORBA::Any & value_; void result (IR::ConstantDef_ptr result); - // update the result + // update the result IR_ConstantDef_ptr _result; }; @@ -2204,7 +2204,7 @@ private: const char * name, const char * version, const IR_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2213,33 +2213,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_struct (const TAO_ServerRequestInfo_IR_Container_create_struct &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_struct &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2247,7 +2247,7 @@ private: const char * version_; const IR_StructMemberSeq & members_; void result (IR::StructDef_ptr result); - // update the result + // update the result IR_StructDef_ptr _result; }; @@ -2264,7 +2264,7 @@ private: const char * version, IR_IDLType_ptr discriminator_type, const IR_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2273,33 +2273,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_union (const TAO_ServerRequestInfo_IR_Container_create_union &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_union &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2308,7 +2308,7 @@ private: IR_IDLType_ptr discriminator_type_; const IR_UnionMemberSeq & members_; void result (IR::UnionDef_ptr result); - // update the result + // update the result IR_UnionDef_ptr _result; }; @@ -2324,7 +2324,7 @@ private: const char * name, const char * version, const IR_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2333,33 +2333,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_enum (const TAO_ServerRequestInfo_IR_Container_create_enum &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_enum &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2367,7 +2367,7 @@ private: const char * version_; const IR_EnumMemberSeq & members_; void result (IR::EnumDef_ptr result); - // update the result + // update the result IR_EnumDef_ptr _result; }; @@ -2383,7 +2383,7 @@ private: const char * name, const char * version, IR_IDLType_ptr original_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2392,33 +2392,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_alias (const TAO_ServerRequestInfo_IR_Container_create_alias &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_alias &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2426,7 +2426,7 @@ private: const char * version_; IR_IDLType_ptr original_type_; void result (IR::AliasDef_ptr result); - // update the result + // update the result IR_AliasDef_ptr _result; }; @@ -2444,7 +2444,7 @@ private: const IR_InterfaceDefSeq & base_interfaces, const CORBA::Boolean & is_abstract, const CORBA::Boolean & is_local, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2453,33 +2453,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_interface (const TAO_ServerRequestInfo_IR_Container_create_interface &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_interface &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2489,7 +2489,7 @@ private: const CORBA::Boolean & is_abstract_; const CORBA::Boolean & is_local_; void result (IR::InterfaceDef_ptr result); - // update the result + // update the result IR_InterfaceDef_ptr _result; }; @@ -2511,7 +2511,7 @@ private: const IR_ValueDefSeq & abstract_base_values, const IR_InterfaceDefSeq & supported_interfaces, const IR_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2520,33 +2520,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_value (const TAO_ServerRequestInfo_IR_Container_create_value &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_value &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2560,7 +2560,7 @@ private: const IR_InterfaceDefSeq & supported_interfaces_; const IR_InitializerSeq & initializers_; void result (IR::ValueDef_ptr result); - // update the result + // update the result IR_ValueDef_ptr _result; }; @@ -2576,7 +2576,7 @@ private: const char * name, const char * version, IR_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2585,33 +2585,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_value_box (const TAO_ServerRequestInfo_IR_Container_create_value_box &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_value_box &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2619,7 +2619,7 @@ private: const char * version_; IR_IDLType_ptr original_type_def_; void result (IR::ValueBoxDef_ptr result); - // update the result + // update the result IR_ValueBoxDef_ptr _result; }; @@ -2635,7 +2635,7 @@ private: const char * name, const char * version, const IR_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2644,33 +2644,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_exception (const TAO_ServerRequestInfo_IR_Container_create_exception &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_exception &); - + private: POA_IR::Container *_tao_impl; const char * id_; @@ -2678,7 +2678,7 @@ private: const char * version_; const IR_StructMemberSeq & members_; void result (IR::ExceptionDef_ptr result); - // update the result + // update the result IR_ExceptionDef_ptr _result; }; @@ -2693,7 +2693,7 @@ private: const char * id, const char * name, const char * version, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -2702,40 +2702,40 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Container_create_native (const TAO_ServerRequestInfo_IR_Container_create_native &); void operator= (const TAO_ServerRequestInfo_IR_Container_create_native &); - + private: POA_IR::Container *_tao_impl; const char * id_; const char * name_; const char * version_; void result (IR::NativeDef_ptr result); - // update the result + // update the result IR_NativeDef_ptr _result; }; @@ -2744,12 +2744,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_Container_Strategized_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker { -public: +public: _TAO_Container_Strategized_Proxy_Broker (void); virtual ~_TAO_Container_Strategized_Proxy_Broker (void); @@ -2764,18 +2764,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_Container_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -2786,7 +2786,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -2794,17 +2794,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_Container_ThruPOA_Proxy_Impl : +class _TAO_Container_ThruPOA_Proxy_Impl : public virtual _TAO_Container_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual _TAO_IRObject_ThruPOA_Proxy_Impl - + { public: _TAO_Container_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) { } - + virtual IR_Contained_ptr lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name, @@ -3340,7 +3340,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::IDLType *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3349,37 +3349,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_IDLType_type_get (const TAO_ServerRequestInfo_IR_IDLType_type_get &); void operator= (const TAO_ServerRequestInfo_IR_IDLType_type_get &); - + private: POA_IR::IDLType *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -3388,12 +3388,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_IDLType_Strategized_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker { -public: +public: _TAO_IDLType_Strategized_Proxy_Broker (void); virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void); @@ -3408,18 +3408,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_IDLType_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -3430,7 +3430,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -3438,17 +3438,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_IDLType_ThruPOA_Proxy_Impl : +class _TAO_IDLType_ThruPOA_Proxy_Impl : public virtual _TAO_IDLType_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual _TAO_IRObject_ThruPOA_Proxy_Impl - + { public: _TAO_IDLType_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -3864,7 +3864,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -3879,7 +3879,7 @@ private: POA_IR::Repository *tao_impl , const char * search_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3888,38 +3888,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_lookup_id (const TAO_ServerRequestInfo_IR_Repository_lookup_id &); void operator= (const TAO_ServerRequestInfo_IR_Repository_lookup_id &); - + private: POA_IR::Repository *_tao_impl; const char * search_id_; void result (IR::Contained_ptr result); - // update the result + // update the result IR_Contained_ptr _result; }; @@ -3932,7 +3932,7 @@ private: POA_IR::Repository *tao_impl , CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3941,38 +3941,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (const TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode &); void operator= (const TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode &); - + private: POA_IR::Repository *_tao_impl; CORBA::TypeCode_ptr tc_; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -3985,7 +3985,7 @@ private: POA_IR::Repository *tao_impl , IR_PrimitiveKind & kind, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -3994,38 +3994,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_get_primitive (const TAO_ServerRequestInfo_IR_Repository_get_primitive &); void operator= (const TAO_ServerRequestInfo_IR_Repository_get_primitive &); - + private: POA_IR::Repository *_tao_impl; const IR_PrimitiveKind & kind_; void result (IR::PrimitiveDef_ptr result); - // update the result + // update the result IR_PrimitiveDef_ptr _result; }; @@ -4038,7 +4038,7 @@ private: POA_IR::Repository *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4047,38 +4047,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_create_string (const TAO_ServerRequestInfo_IR_Repository_create_string &); void operator= (const TAO_ServerRequestInfo_IR_Repository_create_string &); - + private: POA_IR::Repository *_tao_impl; const CORBA::ULong & bound_; void result (IR::StringDef_ptr result); - // update the result + // update the result IR_StringDef_ptr _result; }; @@ -4091,7 +4091,7 @@ private: POA_IR::Repository *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4100,38 +4100,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_create_wstring (const TAO_ServerRequestInfo_IR_Repository_create_wstring &); void operator= (const TAO_ServerRequestInfo_IR_Repository_create_wstring &); - + private: POA_IR::Repository *_tao_impl; const CORBA::ULong & bound_; void result (IR::WstringDef_ptr result); - // update the result + // update the result IR_WstringDef_ptr _result; }; @@ -4145,7 +4145,7 @@ private: , const CORBA::ULong & bound, IR_IDLType_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4154,39 +4154,39 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_create_sequence (const TAO_ServerRequestInfo_IR_Repository_create_sequence &); void operator= (const TAO_ServerRequestInfo_IR_Repository_create_sequence &); - + private: POA_IR::Repository *_tao_impl; const CORBA::ULong & bound_; IR_IDLType_ptr element_type_; void result (IR::SequenceDef_ptr result); - // update the result + // update the result IR_SequenceDef_ptr _result; }; @@ -4200,7 +4200,7 @@ private: , const CORBA::ULong & length, IR_IDLType_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4209,39 +4209,39 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_create_array (const TAO_ServerRequestInfo_IR_Repository_create_array &); void operator= (const TAO_ServerRequestInfo_IR_Repository_create_array &); - + private: POA_IR::Repository *_tao_impl; const CORBA::ULong & length_; IR_IDLType_ptr element_type_; void result (IR::ArrayDef_ptr result); - // update the result + // update the result IR_ArrayDef_ptr _result; }; @@ -4255,7 +4255,7 @@ private: , const CORBA::UShort & digits, const CORBA::Short & scale, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -4264,39 +4264,39 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_Repository_create_fixed (const TAO_ServerRequestInfo_IR_Repository_create_fixed &); void operator= (const TAO_ServerRequestInfo_IR_Repository_create_fixed &); - + private: POA_IR::Repository *_tao_impl; const CORBA::UShort & digits_; const CORBA::Short & scale_; void result (IR::FixedDef_ptr result); - // update the result + // update the result IR_FixedDef_ptr _result; }; @@ -4305,12 +4305,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_Repository_Strategized_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker { -public: +public: _TAO_Repository_Strategized_Proxy_Broker (void); virtual ~_TAO_Repository_Strategized_Proxy_Broker (void); @@ -4325,18 +4325,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_Repository_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -4347,7 +4347,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -4355,17 +4355,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_Repository_ThruPOA_Proxy_Impl : +class _TAO_Repository_ThruPOA_Proxy_Impl : public virtual _TAO_Repository_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual _TAO_Container_ThruPOA_Proxy_Impl - + { public: _TAO_Repository_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void) { } - + virtual IR_Contained_ptr lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id, @@ -5066,7 +5066,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -5085,7 +5085,7 @@ private: const char * version, IR_ComponentDef_ptr base_component, const IR_InterfaceDefSeq & supports_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5094,33 +5094,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentRepository_create_component (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &); void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &); - + private: POA_IR::ComponentRepository *_tao_impl; const char * id_; @@ -5129,7 +5129,7 @@ private: IR_ComponentDef_ptr base_component_; const IR_InterfaceDefSeq & supports_interfaces_; void result (IR::ComponentDef_ptr result); - // update the result + // update the result IR_ComponentDef_ptr _result; }; @@ -5147,7 +5147,7 @@ private: IR_HomeDef_ptr base_home, IR_ComponentDef_ptr managed_component, IR_ValueDef_ptr primary_key, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -5156,33 +5156,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentRepository_create_home (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &); void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &); - + private: POA_IR::ComponentRepository *_tao_impl; const char * id_; @@ -5192,7 +5192,7 @@ private: IR_ComponentDef_ptr managed_component_; IR_ValueDef_ptr primary_key_; void result (IR::HomeDef_ptr result); - // update the result + // update the result IR_HomeDef_ptr _result; }; @@ -5201,12 +5201,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker { -public: +public: _TAO_ComponentRepository_Strategized_Proxy_Broker (void); virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void); @@ -5221,18 +5221,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ComponentRepository_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -5243,7 +5243,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -5251,17 +5251,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ComponentRepository_ThruPOA_Proxy_Impl : +class _TAO_ComponentRepository_ThruPOA_Proxy_Impl : public virtual _TAO_ComponentRepository_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl - + { public: _TAO_ComponentRepository_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { } - + virtual IR_ComponentDef_ptr create_component ( CORBA_Object *_collocated_tao_target_, const char * id, @@ -5649,7 +5649,7 @@ private: class _TAO_ModuleDef_ThruPOA_Proxy_Impl; class _TAO_ModuleDef_Strategized_Proxy_Broker; - class ModuleDef : public virtual Container, + class ModuleDef : public virtual Container, public virtual Contained { protected: @@ -5923,7 +5923,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -5934,12 +5934,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker { -public: +public: _TAO_ModuleDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ModuleDef_Strategized_Proxy_Broker (void); @@ -5954,18 +5954,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ModuleDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -5976,7 +5976,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -5984,18 +5984,18 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ModuleDef_ThruPOA_Proxy_Impl : +class _TAO_ModuleDef_ThruPOA_Proxy_Impl : public virtual _TAO_ModuleDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_ModuleDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -6582,7 +6582,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -6596,7 +6596,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ConstantDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6605,37 +6605,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ConstantDef_type_get (const TAO_ServerRequestInfo_IR_ConstantDef_type_get &); void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_get &); - + private: POA_IR::ConstantDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -6647,7 +6647,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ConstantDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6656,37 +6656,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_get &); - + private: POA_IR::ConstantDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -6699,7 +6699,7 @@ private: POA_IR::ConstantDef *tao_impl , IR_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6708,33 +6708,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_set &); - + private: POA_IR::ConstantDef *_tao_impl; IR_IDLType_ptr type_def_; @@ -6748,7 +6748,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ConstantDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6757,37 +6757,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ConstantDef_value_get (const TAO_ServerRequestInfo_IR_ConstantDef_value_get &); void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_value_get &); - + private: POA_IR::ConstantDef *_tao_impl; void result (CORBA::Any * result); - // update the result + // update the result CORBA::Any * _result; }; @@ -6800,7 +6800,7 @@ private: POA_IR::ConstantDef *tao_impl , const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -6809,33 +6809,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ConstantDef_value_set (const TAO_ServerRequestInfo_IR_ConstantDef_value_set &); void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_value_set &); - + private: POA_IR::ConstantDef *_tao_impl; const CORBA::Any & value_; @@ -6846,12 +6846,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker { -public: +public: _TAO_ConstantDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ConstantDef_Strategized_Proxy_Broker (void); @@ -6866,18 +6866,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ConstantDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -6888,7 +6888,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -6896,17 +6896,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ConstantDef_ThruPOA_Proxy_Impl : +class _TAO_ConstantDef_ThruPOA_Proxy_Impl : public virtual _TAO_ConstantDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_ConstantDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -7321,7 +7321,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -7332,12 +7332,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker { -public: +public: _TAO_TypedefDef_Strategized_Proxy_Broker (void); virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void); @@ -7352,18 +7352,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_TypedefDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -7374,7 +7374,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -7382,18 +7382,18 @@ public: // ThruPOA Impl. Declaration // -class _TAO_TypedefDef_ThruPOA_Proxy_Impl : +class _TAO_TypedefDef_ThruPOA_Proxy_Impl : public virtual _TAO_TypedefDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_TypedefDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -7885,7 +7885,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -7899,7 +7899,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::StructDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -7908,37 +7908,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_StructDef_members_get (const TAO_ServerRequestInfo_IR_StructDef_members_get &); void operator= (const TAO_ServerRequestInfo_IR_StructDef_members_get &); - + private: POA_IR::StructDef *_tao_impl; void result (IR::StructMemberSeq * result); - // update the result + // update the result IR_StructMemberSeq * _result; }; @@ -7951,7 +7951,7 @@ private: POA_IR::StructDef *tao_impl , const IR_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -7960,33 +7960,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_StructDef_members_set (const TAO_ServerRequestInfo_IR_StructDef_members_set &); void operator= (const TAO_ServerRequestInfo_IR_StructDef_members_set &); - + private: POA_IR::StructDef *_tao_impl; const IR_StructMemberSeq & members_; @@ -7997,12 +7997,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_StructDef_Strategized_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker { -public: +public: _TAO_StructDef_Strategized_Proxy_Broker (void); virtual ~_TAO_StructDef_Strategized_Proxy_Broker (void); @@ -8017,18 +8017,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_StructDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -8039,7 +8039,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -8047,18 +8047,18 @@ public: // ThruPOA Impl. Declaration // -class _TAO_StructDef_ThruPOA_Proxy_Impl : +class _TAO_StructDef_ThruPOA_Proxy_Impl : public virtual _TAO_StructDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl - + { public: _TAO_StructDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -8815,7 +8815,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -8829,7 +8829,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::UnionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8838,37 +8838,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get &); void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get &); - + private: POA_IR::UnionDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -8880,7 +8880,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::UnionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8889,37 +8889,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get &); - + private: POA_IR::UnionDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -8932,7 +8932,7 @@ private: POA_IR::UnionDef *tao_impl , IR_IDLType_ptr discriminator_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8941,33 +8941,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set &); - + private: POA_IR::UnionDef *_tao_impl; IR_IDLType_ptr discriminator_type_def_; @@ -8981,7 +8981,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::UnionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -8990,37 +8990,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UnionDef_members_get (const TAO_ServerRequestInfo_IR_UnionDef_members_get &); void operator= (const TAO_ServerRequestInfo_IR_UnionDef_members_get &); - + private: POA_IR::UnionDef *_tao_impl; void result (IR::UnionMemberSeq * result); - // update the result + // update the result IR_UnionMemberSeq * _result; }; @@ -9033,7 +9033,7 @@ private: POA_IR::UnionDef *tao_impl , const IR_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9042,33 +9042,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UnionDef_members_set (const TAO_ServerRequestInfo_IR_UnionDef_members_set &); void operator= (const TAO_ServerRequestInfo_IR_UnionDef_members_set &); - + private: POA_IR::UnionDef *_tao_impl; const IR_UnionMemberSeq & members_; @@ -9079,12 +9079,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_UnionDef_Strategized_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker { -public: +public: _TAO_UnionDef_Strategized_Proxy_Broker (void); virtual ~_TAO_UnionDef_Strategized_Proxy_Broker (void); @@ -9099,18 +9099,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_UnionDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -9121,7 +9121,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -9129,18 +9129,18 @@ public: // ThruPOA Impl. Declaration // -class _TAO_UnionDef_ThruPOA_Proxy_Impl : +class _TAO_UnionDef_ThruPOA_Proxy_Impl : public virtual _TAO_UnionDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl - + { public: _TAO_UnionDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr discriminator_type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -9778,7 +9778,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -9792,7 +9792,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::EnumDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9801,37 +9801,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_EnumDef_members_get (const TAO_ServerRequestInfo_IR_EnumDef_members_get &); void operator= (const TAO_ServerRequestInfo_IR_EnumDef_members_get &); - + private: POA_IR::EnumDef *_tao_impl; void result (IR::EnumMemberSeq * result); - // update the result + // update the result IR_EnumMemberSeq * _result; }; @@ -9844,7 +9844,7 @@ private: POA_IR::EnumDef *tao_impl , const IR_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -9853,33 +9853,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_EnumDef_members_set (const TAO_ServerRequestInfo_IR_EnumDef_members_set &); void operator= (const TAO_ServerRequestInfo_IR_EnumDef_members_set &); - + private: POA_IR::EnumDef *_tao_impl; const IR_EnumMemberSeq & members_; @@ -9890,12 +9890,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_EnumDef_Strategized_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker { -public: +public: _TAO_EnumDef_Strategized_Proxy_Broker (void); virtual ~_TAO_EnumDef_Strategized_Proxy_Broker (void); @@ -9910,18 +9910,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_EnumDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -9932,7 +9932,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -9940,17 +9940,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_EnumDef_ThruPOA_Proxy_Impl : +class _TAO_EnumDef_ThruPOA_Proxy_Impl : public virtual _TAO_EnumDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl - + { public: _TAO_EnumDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_EnumMemberSeq * members ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -10356,7 +10356,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -10370,7 +10370,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::AliasDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -10379,37 +10379,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get &); - + private: POA_IR::AliasDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -10422,7 +10422,7 @@ private: POA_IR::AliasDef *tao_impl , IR_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -10431,33 +10431,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set &); - + private: POA_IR::AliasDef *_tao_impl; IR_IDLType_ptr original_type_def_; @@ -10468,12 +10468,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_AliasDef_Strategized_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker { -public: +public: _TAO_AliasDef_Strategized_Proxy_Broker (void); virtual ~_TAO_AliasDef_Strategized_Proxy_Broker (void); @@ -10488,18 +10488,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_AliasDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -10510,7 +10510,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -10518,17 +10518,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_AliasDef_ThruPOA_Proxy_Impl : +class _TAO_AliasDef_ThruPOA_Proxy_Impl : public virtual _TAO_AliasDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl - + { public: _TAO_AliasDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -10901,7 +10901,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -10912,12 +10912,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_NativeDef_Strategized_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker { -public: +public: _TAO_NativeDef_Strategized_Proxy_Broker (void); virtual ~_TAO_NativeDef_Strategized_Proxy_Broker (void); @@ -10932,18 +10932,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_NativeDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -10954,7 +10954,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -10962,17 +10962,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_NativeDef_ThruPOA_Proxy_Impl : +class _TAO_NativeDef_ThruPOA_Proxy_Impl : public virtual _TAO_NativeDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl - + { public: _TAO_NativeDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_NativeDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -11239,7 +11239,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -11253,7 +11253,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::PrimitiveDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11262,37 +11262,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (const TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get &); void operator= (const TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get &); - + private: POA_IR::PrimitiveDef *_tao_impl; void result (IR::PrimitiveKind result); - // update the result + // update the result IR_PrimitiveKind _result; }; @@ -11301,12 +11301,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker { -public: +public: _TAO_PrimitiveDef_Strategized_Proxy_Broker (void); virtual ~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void); @@ -11321,18 +11321,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_PrimitiveDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -11343,7 +11343,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -11351,17 +11351,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl : +class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl : public virtual _TAO_PrimitiveDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_PrimitiveKind kind ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -11567,7 +11567,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -11581,7 +11581,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::StringDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11590,37 +11590,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_StringDef_bound_get (const TAO_ServerRequestInfo_IR_StringDef_bound_get &); void operator= (const TAO_ServerRequestInfo_IR_StringDef_bound_get &); - + private: POA_IR::StringDef *_tao_impl; void result (CORBA::ULong result); - // update the result + // update the result CORBA::ULong _result; }; @@ -11633,7 +11633,7 @@ private: POA_IR::StringDef *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11642,33 +11642,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_StringDef_bound_set (const TAO_ServerRequestInfo_IR_StringDef_bound_set &); void operator= (const TAO_ServerRequestInfo_IR_StringDef_bound_set &); - + private: POA_IR::StringDef *_tao_impl; const CORBA::ULong & bound_; @@ -11679,12 +11679,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_StringDef_Strategized_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker { -public: +public: _TAO_StringDef_Strategized_Proxy_Broker (void); virtual ~_TAO_StringDef_Strategized_Proxy_Broker (void); @@ -11699,18 +11699,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_StringDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -11721,7 +11721,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -11729,17 +11729,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_StringDef_ThruPOA_Proxy_Impl : +class _TAO_StringDef_ThruPOA_Proxy_Impl : public virtual _TAO_StringDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_StringDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -11963,7 +11963,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -11977,7 +11977,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::WstringDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -11986,37 +11986,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_WstringDef_bound_get (const TAO_ServerRequestInfo_IR_WstringDef_bound_get &); void operator= (const TAO_ServerRequestInfo_IR_WstringDef_bound_get &); - + private: POA_IR::WstringDef *_tao_impl; void result (CORBA::ULong result); - // update the result + // update the result CORBA::ULong _result; }; @@ -12029,7 +12029,7 @@ private: POA_IR::WstringDef *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12038,33 +12038,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_WstringDef_bound_set (const TAO_ServerRequestInfo_IR_WstringDef_bound_set &); void operator= (const TAO_ServerRequestInfo_IR_WstringDef_bound_set &); - + private: POA_IR::WstringDef *_tao_impl; const CORBA::ULong & bound_; @@ -12075,12 +12075,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_WstringDef_Strategized_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker { -public: +public: _TAO_WstringDef_Strategized_Proxy_Broker (void); virtual ~_TAO_WstringDef_Strategized_Proxy_Broker (void); @@ -12095,18 +12095,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_WstringDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -12117,7 +12117,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -12125,17 +12125,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_WstringDef_ThruPOA_Proxy_Impl : +class _TAO_WstringDef_ThruPOA_Proxy_Impl : public virtual _TAO_WstringDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_WstringDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -12392,7 +12392,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -12406,7 +12406,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::FixedDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12415,37 +12415,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_FixedDef_digits_get (const TAO_ServerRequestInfo_IR_FixedDef_digits_get &); void operator= (const TAO_ServerRequestInfo_IR_FixedDef_digits_get &); - + private: POA_IR::FixedDef *_tao_impl; void result (CORBA::UShort result); - // update the result + // update the result CORBA::UShort _result; }; @@ -12458,7 +12458,7 @@ private: POA_IR::FixedDef *tao_impl , const CORBA::UShort & digits, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12467,33 +12467,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_FixedDef_digits_set (const TAO_ServerRequestInfo_IR_FixedDef_digits_set &); void operator= (const TAO_ServerRequestInfo_IR_FixedDef_digits_set &); - + private: POA_IR::FixedDef *_tao_impl; const CORBA::UShort & digits_; @@ -12507,7 +12507,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::FixedDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12516,37 +12516,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_FixedDef_scale_get (const TAO_ServerRequestInfo_IR_FixedDef_scale_get &); void operator= (const TAO_ServerRequestInfo_IR_FixedDef_scale_get &); - + private: POA_IR::FixedDef *_tao_impl; void result (CORBA::Short result); - // update the result + // update the result CORBA::Short _result; }; @@ -12559,7 +12559,7 @@ private: POA_IR::FixedDef *tao_impl , const CORBA::Short & scale, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12568,33 +12568,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_FixedDef_scale_set (const TAO_ServerRequestInfo_IR_FixedDef_scale_set &); void operator= (const TAO_ServerRequestInfo_IR_FixedDef_scale_set &); - + private: POA_IR::FixedDef *_tao_impl; const CORBA::Short & scale_; @@ -12605,12 +12605,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_FixedDef_Strategized_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker { -public: +public: _TAO_FixedDef_Strategized_Proxy_Broker (void); virtual ~_TAO_FixedDef_Strategized_Proxy_Broker (void); @@ -12625,18 +12625,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_FixedDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -12647,7 +12647,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -12655,17 +12655,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_FixedDef_ThruPOA_Proxy_Impl : +class _TAO_FixedDef_ThruPOA_Proxy_Impl : public virtual _TAO_FixedDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_FixedDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::UShort digits ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -12972,7 +12972,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -12986,7 +12986,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::SequenceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -12995,37 +12995,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_SequenceDef_bound_get (const TAO_ServerRequestInfo_IR_SequenceDef_bound_get &); void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_bound_get &); - + private: POA_IR::SequenceDef *_tao_impl; void result (CORBA::ULong result); - // update the result + // update the result CORBA::ULong _result; }; @@ -13038,7 +13038,7 @@ private: POA_IR::SequenceDef *tao_impl , const CORBA::ULong & bound, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13047,33 +13047,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_SequenceDef_bound_set (const TAO_ServerRequestInfo_IR_SequenceDef_bound_set &); void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_bound_set &); - + private: POA_IR::SequenceDef *_tao_impl; const CORBA::ULong & bound_; @@ -13087,7 +13087,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::SequenceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13096,37 +13096,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_get &); void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_get &); - + private: POA_IR::SequenceDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -13138,7 +13138,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::SequenceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13147,37 +13147,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get &); - + private: POA_IR::SequenceDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -13190,7 +13190,7 @@ private: POA_IR::SequenceDef *tao_impl , IR_IDLType_ptr element_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13199,33 +13199,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set &); - + private: POA_IR::SequenceDef *_tao_impl; IR_IDLType_ptr element_type_def_; @@ -13236,12 +13236,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker { -public: +public: _TAO_SequenceDef_Strategized_Proxy_Broker (void); virtual ~_TAO_SequenceDef_Strategized_Proxy_Broker (void); @@ -13256,18 +13256,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_SequenceDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -13278,7 +13278,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -13286,17 +13286,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_SequenceDef_ThruPOA_Proxy_Impl : +class _TAO_SequenceDef_ThruPOA_Proxy_Impl : public virtual _TAO_SequenceDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_SequenceDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -13619,7 +13619,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -13633,7 +13633,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ArrayDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13642,37 +13642,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ArrayDef_length_get (const TAO_ServerRequestInfo_IR_ArrayDef_length_get &); void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_length_get &); - + private: POA_IR::ArrayDef *_tao_impl; void result (CORBA::ULong result); - // update the result + // update the result CORBA::ULong _result; }; @@ -13685,7 +13685,7 @@ private: POA_IR::ArrayDef *tao_impl , const CORBA::ULong & length, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13694,33 +13694,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ArrayDef_length_set (const TAO_ServerRequestInfo_IR_ArrayDef_length_set &); void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_length_set &); - + private: POA_IR::ArrayDef *_tao_impl; const CORBA::ULong & length_; @@ -13734,7 +13734,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ArrayDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13743,37 +13743,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_get &); void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_get &); - + private: POA_IR::ArrayDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -13785,7 +13785,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ArrayDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13794,37 +13794,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get &); - + private: POA_IR::ArrayDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -13837,7 +13837,7 @@ private: POA_IR::ArrayDef *tao_impl , IR_IDLType_ptr element_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -13846,33 +13846,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set &); - + private: POA_IR::ArrayDef *_tao_impl; IR_IDLType_ptr element_type_def_; @@ -13883,12 +13883,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker { -public: +public: _TAO_ArrayDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ArrayDef_Strategized_Proxy_Broker (void); @@ -13903,18 +13903,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ArrayDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -13925,7 +13925,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -13933,17 +13933,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ArrayDef_ThruPOA_Proxy_Impl : +class _TAO_ArrayDef_ThruPOA_Proxy_Impl : public virtual _TAO_ArrayDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_ArrayDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::ULong length ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -14433,7 +14433,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -14447,7 +14447,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ExceptionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14456,37 +14456,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ExceptionDef_type_get (const TAO_ServerRequestInfo_IR_ExceptionDef_type_get &); void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_type_get &); - + private: POA_IR::ExceptionDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -14498,7 +14498,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ExceptionDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14507,37 +14507,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ExceptionDef_members_get (const TAO_ServerRequestInfo_IR_ExceptionDef_members_get &); void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_members_get &); - + private: POA_IR::ExceptionDef *_tao_impl; void result (IR::StructMemberSeq * result); - // update the result + // update the result IR_StructMemberSeq * _result; }; @@ -14550,7 +14550,7 @@ private: POA_IR::ExceptionDef *tao_impl , const IR_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -14559,33 +14559,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ExceptionDef_members_set (const TAO_ServerRequestInfo_IR_ExceptionDef_members_set &); void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_members_set &); - + private: POA_IR::ExceptionDef *_tao_impl; const IR_StructMemberSeq & members_; @@ -14596,12 +14596,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker { -public: +public: _TAO_ExceptionDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ExceptionDef_Strategized_Proxy_Broker (void); @@ -14616,18 +14616,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ExceptionDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -14638,7 +14638,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -14646,18 +14646,18 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ExceptionDef_ThruPOA_Proxy_Impl : +class _TAO_ExceptionDef_ThruPOA_Proxy_Impl : public virtual _TAO_ExceptionDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl - + { public: _TAO_ExceptionDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -15294,7 +15294,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -15308,7 +15308,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::AttributeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15317,37 +15317,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AttributeDef_type_get (const TAO_ServerRequestInfo_IR_AttributeDef_type_get &); void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_get &); - + private: POA_IR::AttributeDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -15359,7 +15359,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::AttributeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15368,37 +15368,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_get &); - + private: POA_IR::AttributeDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -15411,7 +15411,7 @@ private: POA_IR::AttributeDef *tao_impl , IR_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15420,33 +15420,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_set &); - + private: POA_IR::AttributeDef *_tao_impl; IR_IDLType_ptr type_def_; @@ -15460,7 +15460,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::AttributeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15469,37 +15469,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AttributeDef_mode_get (const TAO_ServerRequestInfo_IR_AttributeDef_mode_get &); void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_mode_get &); - + private: POA_IR::AttributeDef *_tao_impl; void result (IR::AttributeMode result); - // update the result + // update the result IR_AttributeMode _result; }; @@ -15512,7 +15512,7 @@ private: POA_IR::AttributeDef *tao_impl , IR_AttributeMode & mode, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -15521,33 +15521,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_AttributeDef_mode_set (const TAO_ServerRequestInfo_IR_AttributeDef_mode_set &); void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_mode_set &); - + private: POA_IR::AttributeDef *_tao_impl; const IR_AttributeMode & mode_; @@ -15558,12 +15558,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker { -public: +public: _TAO_AttributeDef_Strategized_Proxy_Broker (void); virtual ~_TAO_AttributeDef_Strategized_Proxy_Broker (void); @@ -15578,18 +15578,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_AttributeDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -15600,7 +15600,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -15608,17 +15608,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_AttributeDef_ThruPOA_Proxy_Impl : +class _TAO_AttributeDef_ThruPOA_Proxy_Impl : public virtual _TAO_AttributeDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_AttributeDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -16206,7 +16206,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -16220,7 +16220,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16229,37 +16229,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_result_get (const TAO_ServerRequestInfo_IR_OperationDef_result_get &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_get &); - + private: POA_IR::OperationDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -16271,7 +16271,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16280,37 +16280,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_result_def_get (const TAO_ServerRequestInfo_IR_OperationDef_result_def_get &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_def_get &); - + private: POA_IR::OperationDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -16323,7 +16323,7 @@ private: POA_IR::OperationDef *tao_impl , IR_IDLType_ptr result_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16332,33 +16332,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_result_def_set (const TAO_ServerRequestInfo_IR_OperationDef_result_def_set &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_def_set &); - + private: POA_IR::OperationDef *_tao_impl; IR_IDLType_ptr result_def_; @@ -16372,7 +16372,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16381,37 +16381,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_params_get (const TAO_ServerRequestInfo_IR_OperationDef_params_get &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_params_get &); - + private: POA_IR::OperationDef *_tao_impl; void result (IR::ParDescriptionSeq * result); - // update the result + // update the result IR_ParDescriptionSeq * _result; }; @@ -16424,7 +16424,7 @@ private: POA_IR::OperationDef *tao_impl , const IR_ParDescriptionSeq & params, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16433,33 +16433,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_params_set (const TAO_ServerRequestInfo_IR_OperationDef_params_set &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_params_set &); - + private: POA_IR::OperationDef *_tao_impl; const IR_ParDescriptionSeq & params_; @@ -16473,7 +16473,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16482,37 +16482,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_mode_get (const TAO_ServerRequestInfo_IR_OperationDef_mode_get &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_mode_get &); - + private: POA_IR::OperationDef *_tao_impl; void result (IR::OperationMode result); - // update the result + // update the result IR_OperationMode _result; }; @@ -16525,7 +16525,7 @@ private: POA_IR::OperationDef *tao_impl , IR_OperationMode & mode, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16534,33 +16534,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_mode_set (const TAO_ServerRequestInfo_IR_OperationDef_mode_set &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_mode_set &); - + private: POA_IR::OperationDef *_tao_impl; const IR_OperationMode & mode_; @@ -16574,7 +16574,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16583,37 +16583,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_contexts_get (const TAO_ServerRequestInfo_IR_OperationDef_contexts_get &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_contexts_get &); - + private: POA_IR::OperationDef *_tao_impl; void result (IR::ContextIdSeq * result); - // update the result + // update the result IR_ContextIdSeq * _result; }; @@ -16626,7 +16626,7 @@ private: POA_IR::OperationDef *tao_impl , const IR_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16635,33 +16635,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_contexts_set (const TAO_ServerRequestInfo_IR_OperationDef_contexts_set &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_contexts_set &); - + private: POA_IR::OperationDef *_tao_impl; const IR_ContextIdSeq & contexts_; @@ -16675,7 +16675,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::OperationDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16684,37 +16684,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_get &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_get &); - + private: POA_IR::OperationDef *_tao_impl; void result (IR::ExceptionDefSeq * result); - // update the result + // update the result IR_ExceptionDefSeq * _result; }; @@ -16727,7 +16727,7 @@ private: POA_IR::OperationDef *tao_impl , const IR_ExceptionDefSeq & exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -16736,33 +16736,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_set &); void operator= (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_set &); - + private: POA_IR::OperationDef *_tao_impl; const IR_ExceptionDefSeq & exceptions_; @@ -16773,12 +16773,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_OperationDef_Strategized_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker { -public: +public: _TAO_OperationDef_Strategized_Proxy_Broker (void); virtual ~_TAO_OperationDef_Strategized_Proxy_Broker (void); @@ -16793,18 +16793,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_OperationDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -16815,7 +16815,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -16823,17 +16823,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_OperationDef_ThruPOA_Proxy_Impl : +class _TAO_OperationDef_ThruPOA_Proxy_Impl : public virtual _TAO_OperationDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_OperationDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr result ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -17633,7 +17633,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -17647,7 +17647,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::InterfaceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17656,37 +17656,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get &); - + private: POA_IR::InterfaceDef *_tao_impl; void result (IR::InterfaceDefSeq * result); - // update the result + // update the result IR_InterfaceDefSeq * _result; }; @@ -17699,7 +17699,7 @@ private: POA_IR::InterfaceDef *tao_impl , const IR_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17708,33 +17708,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set &); - + private: POA_IR::InterfaceDef *_tao_impl; const IR_InterfaceDefSeq & base_interfaces_; @@ -17748,7 +17748,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::InterfaceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17757,37 +17757,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get &); - + private: POA_IR::InterfaceDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -17800,7 +17800,7 @@ private: POA_IR::InterfaceDef *tao_impl , const CORBA::Boolean & is_abstract, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17809,33 +17809,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set &); - + private: POA_IR::InterfaceDef *_tao_impl; const CORBA::Boolean & is_abstract_; @@ -17849,7 +17849,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::InterfaceDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17858,37 +17858,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get &); - + private: POA_IR::InterfaceDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -17901,7 +17901,7 @@ private: POA_IR::InterfaceDef *tao_impl , const CORBA::Boolean & is_local, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17910,33 +17910,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set &); - + private: POA_IR::InterfaceDef *_tao_impl; const CORBA::Boolean & is_local_; @@ -17951,7 +17951,7 @@ private: POA_IR::InterfaceDef *tao_impl , const char * interface_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -17960,38 +17960,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_is_a (const TAO_ServerRequestInfo_IR_InterfaceDef_is_a &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_a &); - + private: POA_IR::InterfaceDef *_tao_impl; const char * interface_id_; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -18010,7 +18010,7 @@ private: IR_AttributeMode & mode, const IR_ExceptionDefSeq & get_exceptions, const IR_ExceptionDefSeq & put_exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18019,33 +18019,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (const TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute &); - + private: POA_IR::InterfaceDef *_tao_impl; const char * id_; @@ -18056,7 +18056,7 @@ private: const IR_ExceptionDefSeq & get_exceptions_; const IR_ExceptionDefSeq & put_exceptions_; void result (IR::AttributeDef_ptr result); - // update the result + // update the result IR_AttributeDef_ptr _result; }; @@ -18076,7 +18076,7 @@ private: const IR_ParDescriptionSeq & params, const IR_ExceptionDefSeq & exceptions, const IR_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18085,33 +18085,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (const TAO_ServerRequestInfo_IR_InterfaceDef_create_operation &); void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_create_operation &); - + private: POA_IR::InterfaceDef *_tao_impl; const char * id_; @@ -18123,7 +18123,7 @@ private: const IR_ExceptionDefSeq & exceptions_; const IR_ContextIdSeq & contexts_; void result (IR::OperationDef_ptr result); - // update the result + // update the result IR_OperationDef_ptr _result; }; @@ -18132,12 +18132,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker { -public: +public: _TAO_InterfaceDef_Strategized_Proxy_Broker (void); virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void); @@ -18152,18 +18152,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_InterfaceDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -18174,7 +18174,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -18182,19 +18182,19 @@ public: // ThruPOA Impl. Declaration // -class _TAO_InterfaceDef_ThruPOA_Proxy_Impl : +class _TAO_InterfaceDef_ThruPOA_Proxy_Impl : public virtual _TAO_InterfaceDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, - public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_InterfaceDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_InterfaceDefSeq * base_interfaces ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -18971,7 +18971,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -18985,7 +18985,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueMemberDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -18994,37 +18994,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_get &); void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_get &); - + private: POA_IR::ValueMemberDef *_tao_impl; void result (CORBA::TypeCode_ptr result); - // update the result + // update the result CORBA::TypeCode_ptr _result; }; @@ -19036,7 +19036,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueMemberDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19045,37 +19045,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get &); - + private: POA_IR::ValueMemberDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -19088,7 +19088,7 @@ private: POA_IR::ValueMemberDef *tao_impl , IR_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19097,33 +19097,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set &); - + private: POA_IR::ValueMemberDef *_tao_impl; IR_IDLType_ptr type_def_; @@ -19137,7 +19137,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueMemberDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19146,37 +19146,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_get &); void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_get &); - + private: POA_IR::ValueMemberDef *_tao_impl; void result (CORBA::Visibility result); - // update the result + // update the result CORBA::Visibility _result; }; @@ -19189,7 +19189,7 @@ private: POA_IR::ValueMemberDef *tao_impl , const CORBA::Visibility & access, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -19198,33 +19198,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_set &); void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_set &); - + private: POA_IR::ValueMemberDef *_tao_impl; const CORBA::Visibility & access_; @@ -19235,12 +19235,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker { -public: +public: _TAO_ValueMemberDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void); @@ -19255,18 +19255,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ValueMemberDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -19277,7 +19277,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -19285,17 +19285,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl : +class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl : public virtual _TAO_ValueMemberDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -20146,7 +20146,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -20160,7 +20160,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20169,37 +20169,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get &); - + private: POA_IR::ValueDef *_tao_impl; void result (IR::InterfaceDefSeq * result); - // update the result + // update the result IR_InterfaceDefSeq * _result; }; @@ -20212,7 +20212,7 @@ private: POA_IR::ValueDef *tao_impl , const IR_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20261,7 +20261,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20300,7 +20300,7 @@ private: private: POA_IR::ValueDef *_tao_impl; void result (IR::InitializerSeq * result); - // update the result + // update the result IR_InitializerSeq * _result; }; @@ -20313,7 +20313,7 @@ private: POA_IR::ValueDef *tao_impl , const IR_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20362,7 +20362,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20401,7 +20401,7 @@ private: private: POA_IR::ValueDef *_tao_impl; void result (IR::ValueDef_ptr result); - // update the result + // update the result IR_ValueDef_ptr _result; }; @@ -20414,7 +20414,7 @@ private: POA_IR::ValueDef *tao_impl , IR_ValueDef_ptr base_value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20463,7 +20463,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20502,7 +20502,7 @@ private: private: POA_IR::ValueDef *_tao_impl; void result (IR::ValueDefSeq * result); - // update the result + // update the result IR_ValueDefSeq * _result; }; @@ -20515,7 +20515,7 @@ private: POA_IR::ValueDef *tao_impl , const IR_ValueDefSeq & abstract_base_values, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20564,7 +20564,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20603,7 +20603,7 @@ private: private: POA_IR::ValueDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -20616,7 +20616,7 @@ private: POA_IR::ValueDef *tao_impl , const CORBA::Boolean & is_abstract, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20665,7 +20665,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20704,7 +20704,7 @@ private: private: POA_IR::ValueDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -20717,7 +20717,7 @@ private: POA_IR::ValueDef *tao_impl , const CORBA::Boolean & is_custom, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20766,7 +20766,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20805,7 +20805,7 @@ private: private: POA_IR::ValueDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -20818,7 +20818,7 @@ private: POA_IR::ValueDef *tao_impl , const CORBA::Boolean & is_truncatable, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20868,7 +20868,7 @@ private: POA_IR::ValueDef *tao_impl , const char * id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20908,7 +20908,7 @@ private: POA_IR::ValueDef *_tao_impl; const char * id_; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -20925,7 +20925,7 @@ private: const char * version, IR_IDLType_ptr type, const CORBA::Visibility & access, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -20969,7 +20969,7 @@ private: IR_IDLType_ptr type_; const CORBA::Visibility & access_; void result (IR::ValueMemberDef_ptr result); - // update the result + // update the result IR_ValueMemberDef_ptr _result; }; @@ -20988,7 +20988,7 @@ private: IR_AttributeMode & mode, const IR_ExceptionDefSeq & get_exceptions, const IR_ExceptionDefSeq & put_exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -21034,7 +21034,7 @@ private: const IR_ExceptionDefSeq & get_exceptions_; const IR_ExceptionDefSeq & put_exceptions_; void result (IR::AttributeDef_ptr result); - // update the result + // update the result IR_AttributeDef_ptr _result; }; @@ -21054,7 +21054,7 @@ private: const IR_ParDescriptionSeq & params, const IR_ExceptionDefSeq & exceptions, const IR_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -21101,7 +21101,7 @@ private: const IR_ExceptionDefSeq & exceptions_; const IR_ContextIdSeq & contexts_; void result (IR::OperationDef_ptr result); - // update the result + // update the result IR_OperationDef_ptr _result; }; @@ -21110,12 +21110,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ValueDef_Strategized_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker { -public: +public: _TAO_ValueDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ValueDef_Strategized_Proxy_Broker (void); @@ -21130,18 +21130,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ValueDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -21152,7 +21152,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -21160,19 +21160,19 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ValueDef_ThruPOA_Proxy_Impl : +class _TAO_ValueDef_ThruPOA_Proxy_Impl : public virtual _TAO_ValueDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, - public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, - public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, + public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl - + { public: _TAO_ValueDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -22070,7 +22070,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -22084,7 +22084,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ValueBoxDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -22093,37 +22093,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get &); void operator= (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get &); - + private: POA_IR::ValueBoxDef *_tao_impl; void result (IR::IDLType_ptr result); - // update the result + // update the result IR_IDLType_ptr _result; }; @@ -22136,7 +22136,7 @@ private: POA_IR::ValueBoxDef *tao_impl , IR_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -22145,33 +22145,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set &); void operator= (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set &); - + private: POA_IR::ValueBoxDef *_tao_impl; IR_IDLType_ptr original_type_def_; @@ -22182,12 +22182,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker { -public: +public: _TAO_ValueBoxDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void); @@ -22202,18 +22202,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ValueBoxDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -22224,7 +22224,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -22232,17 +22232,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl : +class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl : public virtual _TAO_ValueBoxDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl - + { public: _TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -22623,7 +22623,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -22637,7 +22637,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ProvidesDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -22646,37 +22646,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &); void operator= (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &); - + private: POA_IR::ProvidesDef *_tao_impl; void result (IR::InterfaceDef_ptr result); - // update the result + // update the result IR_InterfaceDef_ptr _result; }; @@ -22685,12 +22685,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker { -public: +public: _TAO_ProvidesDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void); @@ -22705,18 +22705,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ProvidesDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -22727,7 +22727,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -22735,17 +22735,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ProvidesDef_ThruPOA_Proxy_Impl : +class _TAO_ProvidesDef_ThruPOA_Proxy_Impl : public virtual _TAO_ProvidesDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_ProvidesDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -23116,7 +23116,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -23130,7 +23130,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::UsesDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -23139,37 +23139,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &); void operator= (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &); - + private: POA_IR::UsesDef *_tao_impl; void result (IR::InterfaceDef_ptr result); - // update the result + // update the result IR_InterfaceDef_ptr _result; }; @@ -23181,7 +23181,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::UsesDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -23190,37 +23190,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &); void operator= (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &); - + private: POA_IR::UsesDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -23229,12 +23229,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_UsesDef_Strategized_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker { -public: +public: _TAO_UsesDef_Strategized_Proxy_Broker (void); virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void); @@ -23249,18 +23249,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_UsesDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -23271,7 +23271,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -23279,17 +23279,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_UsesDef_ThruPOA_Proxy_Impl : +class _TAO_UsesDef_ThruPOA_Proxy_Impl : public virtual _TAO_UsesDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_UsesDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -23677,7 +23677,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -23692,7 +23692,7 @@ private: POA_IR::EventDef *tao_impl , const char * event_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -23701,38 +23701,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_EventDef_is_a (const TAO_ServerRequestInfo_IR_EventDef_is_a &); void operator= (const TAO_ServerRequestInfo_IR_EventDef_is_a &); - + private: POA_IR::EventDef *_tao_impl; const char * event_id_; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -23744,7 +23744,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::EventDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -23753,37 +23753,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_EventDef_event_get (const TAO_ServerRequestInfo_IR_EventDef_event_get &); void operator= (const TAO_ServerRequestInfo_IR_EventDef_event_get &); - + private: POA_IR::EventDef *_tao_impl; void result (IR::ValueDef_ptr result); - // update the result + // update the result IR_ValueDef_ptr _result; }; @@ -23792,12 +23792,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_EventDef_Strategized_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker { -public: +public: _TAO_EventDef_Strategized_Proxy_Broker (void); virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void); @@ -23812,18 +23812,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_EventDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -23834,7 +23834,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -23842,17 +23842,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_EventDef_ThruPOA_Proxy_Impl : +class _TAO_EventDef_ThruPOA_Proxy_Impl : public virtual _TAO_EventDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_EventDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id, @@ -24225,7 +24225,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -24236,12 +24236,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker { -public: +public: _TAO_EmitsDef_Strategized_Proxy_Broker (void); virtual ~_TAO_EmitsDef_Strategized_Proxy_Broker (void); @@ -24256,18 +24256,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_EmitsDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -24278,7 +24278,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -24286,17 +24286,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_EmitsDef_ThruPOA_Proxy_Impl : +class _TAO_EmitsDef_ThruPOA_Proxy_Impl : public virtual _TAO_EmitsDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl - + { public: _TAO_EmitsDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -24652,7 +24652,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -24663,12 +24663,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual _TAO_PublishesDef_Proxy_Broker { -public: +public: _TAO_PublishesDef_Strategized_Proxy_Broker (void); virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void); @@ -24683,18 +24683,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_PublishesDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -24705,7 +24705,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -24713,17 +24713,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_PublishesDef_ThruPOA_Proxy_Impl : +class _TAO_PublishesDef_ThruPOA_Proxy_Impl : public virtual _TAO_PublishesDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl - + { public: _TAO_PublishesDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -25079,7 +25079,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -25090,12 +25090,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker { -public: +public: _TAO_ConsumesDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void); @@ -25110,18 +25110,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ConsumesDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -25132,7 +25132,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -25140,17 +25140,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ConsumesDef_ThruPOA_Proxy_Impl : +class _TAO_ConsumesDef_ThruPOA_Proxy_Impl : public virtual _TAO_ConsumesDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl - + { public: _TAO_ConsumesDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -25936,7 +25936,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -25950,7 +25950,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -25959,37 +25959,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::InterfaceDefSeq * result); - // update the result + // update the result IR_InterfaceDefSeq * _result; }; @@ -26002,7 +26002,7 @@ private: POA_IR::ComponentDef *tao_impl , const IR_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26011,33 +26011,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &); - + private: POA_IR::ComponentDef *_tao_impl; const IR_InterfaceDefSeq & supported_interfaces_; @@ -26051,7 +26051,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26060,37 +26060,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::ComponentDef_ptr result); - // update the result + // update the result IR_ComponentDef_ptr _result; }; @@ -26102,7 +26102,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26111,37 +26111,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::ProvidesDefSeq * result); - // update the result + // update the result IR_ProvidesDefSeq * _result; }; @@ -26153,7 +26153,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26162,37 +26162,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::UsesDefSeq * result); - // update the result + // update the result IR_UsesDefSeq * _result; }; @@ -26204,7 +26204,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26213,37 +26213,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::EmitsDefSeq * result); - // update the result + // update the result IR_EmitsDefSeq * _result; }; @@ -26255,7 +26255,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26264,37 +26264,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::PublishesDefSeq * result); - // update the result + // update the result IR_PublishesDefSeq * _result; }; @@ -26306,7 +26306,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26315,37 +26315,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (IR::ConsumesDefSeq * result); - // update the result + // update the result IR_ConsumesDefSeq * _result; }; @@ -26357,7 +26357,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::ComponentDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26366,37 +26366,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &); - + private: POA_IR::ComponentDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -26412,7 +26412,7 @@ private: const char * name, const char * version, IR_InterfaceDef_ptr interface_type, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26421,33 +26421,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_create_provides (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -26455,7 +26455,7 @@ private: const char * version_; IR_InterfaceDef_ptr interface_type_; void result (IR::ProvidesDef_ptr result); - // update the result + // update the result IR_ProvidesDef_ptr _result; }; @@ -26472,7 +26472,7 @@ private: const char * version, IR_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26481,33 +26481,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_create_uses (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -26516,7 +26516,7 @@ private: IR_InterfaceDef_ptr interface_type_; const CORBA::Boolean & is_multiple_; void result (IR::UsesDef_ptr result); - // update the result + // update the result IR_UsesDef_ptr _result; }; @@ -26532,7 +26532,7 @@ private: const char * name, const char * version, IR_ValueDef_ptr value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26541,33 +26541,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_create_emits (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -26575,7 +26575,7 @@ private: const char * version_; IR_ValueDef_ptr value_; void result (IR::EmitsDef_ptr result); - // update the result + // update the result IR_EmitsDef_ptr _result; }; @@ -26591,7 +26591,7 @@ private: const char * name, const char * version, IR_ValueDef_ptr value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26600,33 +26600,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -26634,7 +26634,7 @@ private: const char * version_; IR_ValueDef_ptr value_; void result (IR::PublishesDef_ptr result); - // update the result + // update the result IR_PublishesDef_ptr _result; }; @@ -26650,7 +26650,7 @@ private: const char * name, const char * version, IR_ValueDef_ptr value, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -26659,33 +26659,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &); void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &); - + private: POA_IR::ComponentDef *_tao_impl; const char * id_; @@ -26693,7 +26693,7 @@ private: const char * version_; IR_ValueDef_ptr value_; void result (IR::ConsumesDef_ptr result); - // update the result + // update the result IR_ConsumesDef_ptr _result; }; @@ -26702,12 +26702,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker { -public: +public: _TAO_ComponentDef_Strategized_Proxy_Broker (void); virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void); @@ -26722,18 +26722,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_ComponentDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -26744,7 +26744,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -26752,17 +26752,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_ComponentDef_ThruPOA_Proxy_Impl : +class _TAO_ComponentDef_ThruPOA_Proxy_Impl : public virtual _TAO_ComponentDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl - + { public: _TAO_ComponentDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -27667,7 +27667,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -27682,7 +27682,7 @@ private: POA_IR::PrimaryKeyDef *tao_impl , const char * primary_key_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -27691,38 +27691,38 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &); void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &); - + private: POA_IR::PrimaryKeyDef *_tao_impl; const char * primary_key_id_; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -27734,7 +27734,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::PrimaryKeyDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -27743,37 +27743,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &); void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &); - + private: POA_IR::PrimaryKeyDef *_tao_impl; void result (IR::ValueDef_ptr result); - // update the result + // update the result IR_ValueDef_ptr _result; }; @@ -27782,12 +27782,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker { -public: +public: _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void); virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void); @@ -27802,18 +27802,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_PrimaryKeyDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -27824,7 +27824,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -27832,17 +27832,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : +class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : public virtual _TAO_PrimaryKeyDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl - + { public: _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void) { } - + virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id, @@ -28287,7 +28287,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -28298,12 +28298,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker { -public: +public: _TAO_FactoryDef_Strategized_Proxy_Broker (void); virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void); @@ -28318,18 +28318,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_FactoryDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -28340,7 +28340,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -28348,17 +28348,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_FactoryDef_ThruPOA_Proxy_Impl : +class _TAO_FactoryDef_ThruPOA_Proxy_Impl : public virtual _TAO_FactoryDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl - + { public: _TAO_FactoryDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -28862,7 +28862,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -28873,12 +28873,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_FinderDef_Strategized_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker { -public: +public: _TAO_FinderDef_Strategized_Proxy_Broker (void); virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void); @@ -28893,18 +28893,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_FinderDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -28915,7 +28915,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -28923,17 +28923,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_FinderDef_ThruPOA_Proxy_Impl : +class _TAO_FinderDef_ThruPOA_Proxy_Impl : public virtual _TAO_FinderDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl - + { public: _TAO_FinderDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { } - + }; @@ -29707,7 +29707,7 @@ private: CORBA::Environment &env = TAO_default_environment () ); - + #if (TAO_HAS_INTERCEPTORS == 1) // Generation of interceptors related RequestInfo classes per operation. // This needed to be able to store the arguments, exceptions, contexts @@ -29721,7 +29721,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -29730,37 +29730,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_base_home_get (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &); - + private: POA_IR::HomeDef *_tao_impl; void result (IR::HomeDef_ptr result); - // update the result + // update the result IR_HomeDef_ptr _result; }; @@ -29772,7 +29772,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -29781,37 +29781,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &); - + private: POA_IR::HomeDef *_tao_impl; void result (IR::ComponentDef_ptr result); - // update the result + // update the result IR_ComponentDef_ptr _result; }; @@ -29823,7 +29823,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -29832,37 +29832,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &); - + private: POA_IR::HomeDef *_tao_impl; void result (IR::PrimaryKeyDef_ptr result); - // update the result + // update the result IR_PrimaryKeyDef_ptr _result; }; @@ -29874,7 +29874,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -29883,37 +29883,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_factories_get (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &); - + private: POA_IR::HomeDef *_tao_impl; void result (IR::FactoryDefSeq * result); - // update the result + // update the result IR_FactoryDefSeq * _result; }; @@ -29925,7 +29925,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -29934,37 +29934,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_finders_get (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &); - + private: POA_IR::HomeDef *_tao_impl; void result (IR::FinderDefSeq * result); - // update the result + // update the result IR_FinderDefSeq * _result; }; @@ -29976,7 +29976,7 @@ private: TAO_ServerRequest &_tao_server_request, POA_IR::HomeDef *tao_impl , - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -29985,37 +29985,37 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &); - + private: POA_IR::HomeDef *_tao_impl; void result (CORBA::Boolean result); - // update the result + // update the result CORBA::Boolean _result; }; @@ -30031,7 +30031,7 @@ private: const char * name, const char * version, IR_ValueDef_ptr primary_key, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -30040,33 +30040,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &); - + private: POA_IR::HomeDef *_tao_impl; const char * id_; @@ -30074,7 +30074,7 @@ private: const char * version_; IR_ValueDef_ptr primary_key_; void result (IR::PrimaryKeyDef_ptr result); - // update the result + // update the result IR_PrimaryKeyDef_ptr _result; }; @@ -30091,7 +30091,7 @@ private: const char * version, const IR_ParDescriptionSeq & params, const IR_ExceptionDefSeq & exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -30100,33 +30100,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_create_factory (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &); - + private: POA_IR::HomeDef *_tao_impl; const char * id_; @@ -30135,7 +30135,7 @@ private: const IR_ParDescriptionSeq & params_; const IR_ExceptionDefSeq & exceptions_; void result (IR::FactoryDef_ptr result); - // update the result + // update the result IR_FactoryDef_ptr _result; }; @@ -30152,7 +30152,7 @@ private: const char * version, const IR_ParDescriptionSeq & params, const IR_ExceptionDefSeq & exceptions, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -30161,33 +30161,33 @@ private: TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual char * target_most_derived_interface ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Boolean target_is_a ( const char * id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - - + + private: TAO_ServerRequestInfo_IR_HomeDef_create_finder (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &); void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &); - + private: POA_IR::HomeDef *_tao_impl; const char * id_; @@ -30196,7 +30196,7 @@ private: const IR_ParDescriptionSeq & params_; const IR_ExceptionDefSeq & exceptions_; void result (IR::FinderDef_ptr result); - // update the result + // update the result IR_FinderDef_ptr _result; }; @@ -30205,12 +30205,12 @@ private: }; /////////////////////////////////////////////////////////////////////// -// Strategized Proxy Broker Declaration +// Strategized Proxy Broker Declaration // class _TAO_HomeDef_Strategized_Proxy_Broker : public virtual _TAO_HomeDef_Proxy_Broker { -public: +public: _TAO_HomeDef_Strategized_Proxy_Broker (void); virtual ~_TAO_HomeDef_Strategized_Proxy_Broker (void); @@ -30225,18 +30225,18 @@ private: // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ); private: - + // Caches the proxy implementations. The proxy implementation // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. _TAO_HomeDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -30247,7 +30247,7 @@ public: }; // -// End Strategized Proxy Broker Declaration +// End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// @@ -30255,17 +30255,17 @@ public: // ThruPOA Impl. Declaration // -class _TAO_HomeDef_ThruPOA_Proxy_Impl : +class _TAO_HomeDef_ThruPOA_Proxy_Impl : public virtual _TAO_HomeDef_Proxy_Impl, public virtual TAO_ThruPOA_Object_Proxy_Impl, public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl - + { public: _TAO_HomeDef_ThruPOA_Proxy_Impl (void); - + virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void) { } - + virtual IR_HomeDef_ptr base_home ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h index 89cb7145246..5369678a49d 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.h +++ b/TAO/orbsvcs/IFR_Service/be_global.h @@ -24,6 +24,7 @@ #include "idl_bool.h" #include "tao/ORB.h" #include "tao/IFR_Client/InterfaceC.h" +#include "ace/Containers.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index fd90c1d2d55..f0204f23b2d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -6,8 +6,12 @@ #include "Locator.h" #include "Iterator.h" #include "Options.h" + #include "tao/PortableServer/Default_Acceptor_Filter.h" #include "tao/Acceptor_Registry.h" +#include "tao/ORB_Core.h" +#include "tao/MProfile.h" + #include "ace/Auto_Ptr.h" const char * @@ -189,7 +193,7 @@ ImplRepo_i::activate_server_i (const char *server, // Make sure the activation allows us to start it up. if (activation == ImplementationRepository::MANUAL && check_startup) ACE_THROW_RETURN (CORBA::TRANSIENT ( - CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, + CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), CORBA::COMPLETED_NO), ""); @@ -679,7 +683,7 @@ ImplRepo_i::server_is_running (const char *server, // @@ (brunsch) Only look at current profile for now. TAO_Profile *profile = mp.get_current_profile (); - if (profile) + if (profile) { new_location = profile->to_string (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -886,7 +890,7 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV) /** * First, figure out if we should set up a multicast handler (based on command - * line settings) and which port to set it up (based on the environment, + * line settings) and which port to set it up (based on the environment, * command line, or the default IMPLREPOSERVICE port). Then register the * handler with the @param reactor. * @@ -898,7 +902,7 @@ ImplRepo_i::setup_multicast (ACE_Reactor *reactor) { ACE_ASSERT (reactor); #if defined (ACE_HAS_IP_MULTICAST) - if (!OPTIONS::instance ()->multicast ()) + if (!OPTIONS::instance ()->multicast ()) { if (OPTIONS::instance ()->debug () > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index e50417bf11e..bd92d945272 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -1,6 +1,9 @@ // $Id$ #include "tao_imr_i.h" + +#include "tao/Stub.h" + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index a60e35423d8..3090fa34f70 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -1,8 +1,9 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Read_Buffer.h" #include "Clerk_i.h" +#include "tao/debug.h" +#include "ace/Read_Buffer.h" +#include "ace/Get_Opt.h" ACE_RCSID(Time_Service, Clerk_i, "$Id$") diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index bb65dbab941..5aa62b8023c 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -1,7 +1,8 @@ // $Id$ -#include "ace/Get_Opt.h" #include "Server_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" ACE_RCSID(Time_Service, Server_i, "$Id$") diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index 804be33b1dc..d42c978af56 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -2,6 +2,7 @@ // $Id$ #include "FactoryDriver.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" FactoryDriver::FactoryDriver (const char* name) diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index c5ca56f0e12..bd62c075bb4 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Gateway_UDP.h" +#include "tao/ORB_Core.h" #include "ace/Get_Opt.h" ACE_RCSID(EC_Examples, MCast, "$Id$") diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index a8e381f96a8..7066b59589b 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_i.h" -#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "test_i.i" diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 387b558dcfe..31b44c865cd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -19,12 +19,15 @@ #include "MCast.h" #include "RTCP.h" -ACE_RCSID(AV, AVStreams_i, "$Id$") +#include "tao/debug.h" +#include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) #include "AVStreams_i.i" #endif /* __ACE_INLINE__ */ +ACE_RCSID(AV, AVStreams_i, "$Id$") + //------------------------------------------------------------ // TAO_AV_Qos //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index d47be246a79..cf3a2395a6a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1,16 +1,19 @@ // $Id$ + #include "orbsvcs/AV/AV_Core.h" #include "orbsvcs/AV/FlowSpec_Entry.h" #include "orbsvcs/AV/Transport.h" #include "orbsvcs/AV/Protocol_Factory.h" -#include "ace/Dynamic_Service.h" #include "orbsvcs/AV/UDP.h" #include "orbsvcs/AV/TCP.h" #include "orbsvcs/AV/RTP.h" #include "orbsvcs/AV/RTCP.h" #include "orbsvcs/AV/sfp.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" +#include "ace/Dynamic_Service.h" //------------------------------------------------------------ // TAO_AV_Core diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index f9adf02c790..8dd12e99817 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -24,6 +24,8 @@ #include "orbsvcs/AVStreamsC.h" #include "AV_export.h" +#include "ace/Singleton.h" + class TAO_Base_StreamEndPoint; class TAO_AV_Connector_Registry; class TAO_AV_Acceptor_Registry; diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index a56404aeab9..bdce6ec2200 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -15,6 +15,10 @@ // ============================================================================ #include "Endpoint_Strategy.h" + +#include "tao/debug.h" +#include "tao/ORB_Core.h" + #include "ace/Process_Semaphore.h" ACE_RCSID(AV, Endpoint_Strategy, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 42b4ba4bf6e..86ff122a128 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -4,6 +4,9 @@ #define TAO_AV_ENDPOINT_STRATEGY_T_C #include "Endpoint_Strategy_T.h" + +#include "tao/debug.h" + #include "ace/Process_Semaphore.h" // ---------------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index c64496a8fca..ad8f3577f43 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -5,6 +5,9 @@ //------------------------------------------------------------ #include "FlowSpec_Entry.h" + +#include "tao/debug.h" + #include "tao/PortableServer/ORB_Manager.h" #if !defined (__ACE_INLINE__) @@ -145,7 +148,7 @@ TAO_FlowSpec_Entry::set_protocol (void) ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_); char buf[BUFSIZ]; inet_addr->addr_to_string (buf,BUFSIZ); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ())); if (IN_CLASSD (inet_addr->get_ip_address ())) { @@ -210,12 +213,12 @@ TAO_FlowSpec_Entry::parse_address (const char *address) this->address_ = inet_addr; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address %s %x\n", address,inet_addr->get_ip_address () )); - + if (IN_CLASSD (inet_addr->get_ip_address ())) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address is multicast\n")); - + this->is_multicast_ = 1; switch (this->protocol_) { @@ -254,8 +257,8 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) char *buf; ACE_NEW_RETURN (buf, char [BUFSIZ], - 0); - + 0); + ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,this->local_addr_); inet_addr->addr_to_string (buf,BUFSIZ); ACE_CString cstring (buf, 0, 0); @@ -392,7 +395,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) else{ address_str = this->carrier_protocol_; } - + this->entry_ = this->flowname_; this->entry_ += "\\"; this->entry_ += this->direction_str_; @@ -529,13 +532,13 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) } this->entry_ = this->flowname_; - this->entry_ += "\\"; - this->entry_ += address_str; - this->entry_ += "\\"; - this->entry_ += this->flow_protocol_; - this->entry_ += "\\"; + this->entry_ += "\\"; + this->entry_ += address_str; + this->entry_ += "\\"; + this->entry_ += this->flow_protocol_; + this->entry_ += "\\"; this->entry_ += this->direction_str_; - this->entry_ += "\\"; + this->entry_ += "\\"; this->entry_ += format_; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"entry_to_string: entry = %s\n",this->entry_.c_str() )); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 92e1cbd4323..3fc8cf1d652 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -5,8 +5,8 @@ /** * @file FlowSpec_Entry.h * - * $Id$ - * + * $Id$ + * * @author Nagarajan Surendran <naga@cs.wustl.edu> * */ @@ -19,6 +19,7 @@ #include "orbsvcs/AV/AV_export.h" #include "AV_Core.h" #include "ace/Addr.h" +#include "ace/Containers.h" /** * @class TAO_Tokenizer @@ -58,7 +59,7 @@ class TAO_AV_Protocol_Object; /** * @class TAO_FlowSpec_Entry - * @brief A helper entry class in the flow spec sequence passed to + * @brief A helper entry class in the flow spec sequence passed to * bind_devs. */ class TAO_AV_Export TAO_FlowSpec_Entry diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index b4d9166e2b4..b85627790f0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -4,6 +4,7 @@ #define TAO_AV_FLOWS_T_C #include "Flows_T.h" +#include "tao/debug.h" // ------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 04cb26b4c5a..080db22025f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -3,6 +3,7 @@ #include "MCast.h" #include "Nil.h" #include "AVStreams_i.h" +#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "MCast.i" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index e38668f5ac1..75d1db192cb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -2,6 +2,7 @@ #include "Policy.h" #include "FlowSpec_Entry.h" +#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "Policy.i" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 799ed871fd7..c103e4ca82e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -21,7 +21,6 @@ #include "ace/Addr.h" #include "tao/PortableServer/ORB_Manager.h" -#include "tao/debug.h" #include "orbsvcs/AV/AV_export.h" struct TAO_AV_frame_info diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index c8ef51bcd50..5f027c782fb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -2,6 +2,7 @@ #include "Protocol_Factory.h" +#include "tao/debug.h" #include "ace/Dynamic_Service.h" // TAO_AV_Flow_Protocol_Factory diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index a26d1144da9..ddbbf1b848e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -36,6 +36,7 @@ #include "ntp-time.h" #include "RTCP.h" #include "media-timer.h" +#include "tao/debug.h" // TAO_AV_RTP_State @@ -657,7 +658,7 @@ TAO_AV_RTCP_Object::send_frame (const iovec *iov, iovcnt); } -int +int TAO_AV_RTCP_Object::send_frame (const char*, size_t) { diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 15fc2136fd9..9097381b985 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -3,6 +3,8 @@ #include "TCP.h" #include "AVStreams_i.h" +#include "tao/debug.h" + //------------------------------------------------------------ // TAO_AV_TCP_Transport //------------------------------------------------------------ @@ -467,7 +469,7 @@ TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor (void) int TAO_AV_TCP_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&tcp_handler) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::make_svc_handler\n" )); @@ -501,7 +503,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, { this->flow_protocol_factory_ = factory; - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::open ")); @@ -512,15 +514,15 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, ACE_Addr *address = entry->address (); ACE_INET_Addr *inet_addr = (ACE_INET_Addr *) address; - + inet_addr->set (inet_addr->get_port_number (), inet_addr->get_host_name ()); - + char buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); - - if (TAO_debug_level > 0) + + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::open: %s", buf @@ -551,38 +553,38 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, this->endpoint_ = endpoint; this->entry_ = entry; this->flowname_ = entry->flowname (); - + ACE_INET_Addr *address; ACE_NEW_RETURN (address, ACE_INET_Addr ("0"), -1); - + int result = this->acceptor_.open (this, av_core->reactor (), *address, entry); - + if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_AV_TCP_Acceptor::open failed"), -1); this->acceptor_.acceptor ().get_local_addr (*address); - + address->set (address->get_port_number (), address->get_host_name ()); - + char buf[BUFSIZ]; address->addr_to_string (buf,BUFSIZ); - - if (TAO_debug_level > 0) + + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::open_default: %s\n", buf)); - + entry->set_local_addr (address); - + return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 3ed6bc4aa13..85a09a59eb5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "ace/Dynamic_Service.h" + #include "AVStreams_i.h" #include "sfp.h" #include "MCast.h" @@ -11,6 +11,10 @@ #include "FlowSpec_Entry.h" #include "AV_Core.h" +#include "tao/debug.h" + +#include "ace/Dynamic_Service.h" + #if !defined (__ACE_INLINE__) #include "Transport.i" #endif /* __ACE_INLINE__ */ @@ -58,10 +62,10 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, ACE_Addr *address = entry->address (); const char *flow_protocol = entry->flow_protocol_str (); const char *transport_protocol = entry->carrier_protocol_str (); - + if (ACE_OS::strcmp (flow_protocol,"") == 0) flow_protocol = transport_protocol; - + if (address == 0) { // Protocol was specified without an endpoint. According to @@ -73,7 +77,7 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, ACE_ERROR_RETURN ((LM_ERROR, "Protocol was specified without an endpoint\n"), -1); - + } else { @@ -91,13 +95,13 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, // for this transport already and hence we can reuse it. TAO_AV_TransportFactorySetItor transport_factory_end = av_core->transport_factories ()->end (); - + for (TAO_AV_TransportFactorySetItor transport_factory = av_core->transport_factories ()->begin (); transport_factory != transport_factory_end; ++transport_factory) { - + if ((*transport_factory)->factory ()->match_protocol (transport_protocol)) { TAO_AV_Connector *connector = @@ -134,7 +138,7 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, if (control_factory_name != 0) { - + TAO_AV_Flow_ProtocolFactorySetItor control_factory_end = av_core->flow_protocol_factories ()->end (); @@ -265,13 +269,13 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_AV_FlowSpecSet &flow_spec_set) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_Acceptor_Registry::open")); - TAO_AV_FlowSpecSetItor last_flowspec + TAO_AV_FlowSpecSetItor last_flowspec = flow_spec_set.end (); - + for (TAO_AV_FlowSpecSetItor flow_spec = flow_spec_set.begin (); flow_spec != last_flowspec; ++flow_spec) @@ -280,15 +284,15 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, ACE_Addr *address = entry->address (); const char *flow_protocol = entry->flow_protocol_str (); const char *transport_protocol = entry->carrier_protocol_str (); - + if (ACE_OS::strcmp (flow_protocol,"") == 0) flow_protocol = transport_protocol; - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_Acceptor_Registry::protocol for flow %s is %d", entry->flowname (), transport_protocol)); - + if (address == 0) { this->open_default (endpoint,av_core, entry); @@ -435,7 +439,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_FlowSpec_Entry *entry) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_Acceptor_Registry::open_default ")); @@ -452,12 +456,12 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, flow_protocol = transport_protocol; // loop through loaded protocols looking for protocol_prefix - TAO_AV_Flow_ProtocolFactorySetItor flow_factory + TAO_AV_Flow_ProtocolFactorySetItor flow_factory = av_core->flow_protocol_factories ()->begin (); - - TAO_AV_TransportFactorySetItor transport_factory + + TAO_AV_TransportFactorySetItor transport_factory = av_core->transport_factories ()->begin (); - + for (; flow_factory != flow_factory_end; ++flow_factory) @@ -467,7 +471,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, // If we have no matching protocol then keep searching // for one until the entire list of protocols has been // searched. - + if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, "TAO (%P|%t) Unable to match protocol prefix " @@ -487,7 +491,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, // If we have no matching protocol then keep searching // for one until the entire list of protocols has been // searched. - + if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, "TAO (%P|%t) Unable to match protocol prefix " @@ -495,13 +499,13 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, flow_protocol)); continue; } - - - + + + // got it, make an acceptor TAO_AV_Acceptor *acceptor = (*transport_factory)->factory ()->make_acceptor (); - + if (acceptor == 0) { if (TAO_debug_level > 0) @@ -511,7 +515,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, transport_protocol)); continue; } - + if (acceptor->open_default (endpoint, av_core, entry, @@ -524,7 +528,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, (*transport_factory)->name ().c_str (), "")); continue; } - + this->acceptors_.insert (acceptor); } } @@ -536,7 +540,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, "TAO (%P%t) cannot create any default acceptor\n")); return -1; } - + return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 51701342798..9b5f7b403f2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -4,6 +4,8 @@ #include "AVStreams_i.h" #include "MCast.h" +#include "tao/debug.h" + #if !defined (__ACE_INLINE__) #include "UDP.i" #endif /* __ACE_INLINE__ */ @@ -37,7 +39,7 @@ TAO_AV_UDP_Flow_Handler::handle_input (ACE_HANDLE /*fd*/) } int -TAO_AV_UDP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, +TAO_AV_UDP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, const void *arg) { return TAO_AV_Flow_Handler::handle_timeout (tv,arg); @@ -46,15 +48,15 @@ TAO_AV_UDP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, int TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Flow_Handler::set_remote_address\n")); - + ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, address); this->peer_addr_ = *inet_addr; TAO_AV_UDP_Transport *transport = ACE_dynamic_cast (TAO_AV_UDP_Transport*, this->transport_); - + return transport->set_remote_address (*inet_addr); } @@ -62,7 +64,7 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_HANDLE TAO_AV_UDP_Flow_Handler::get_handle (void) const { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_UDP_Flow_Handler::get_handle:%d\n", this->sock_dgram_.get_handle ())); @@ -271,14 +273,14 @@ TAO_AV_UDP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, char buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); - - if (TAO_debug_level > 0) + + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_UDP_Acceptor::open: %s", buf)); int result = this->open_i (inet_addr); - + if (result < 0) return result; return 0; @@ -319,10 +321,10 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr) ACE_NEW_RETURN (handler, TAO_AV_UDP_MCast_Flow_Handler, -1); - + flow_handler = handler; result = handler->get_mcast_socket ()->subscribe (*inet_addr); - + if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_AV_UDP_MCast_connector::subscribe failed\n"), @@ -406,14 +408,14 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr) char buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_AV_UDP_ACCEPTOR::open:%s \n", buf)); - + this->entry_->set_local_addr (local_addr); this->entry_->handler (flow_handler); - + // call activate svc handler. return this->activate_svc_handler (flow_handler); } @@ -452,18 +454,18 @@ int TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, TAO_AV_Transport *&transport) { - + ACE_INET_Addr *local_addr; - + int result = -1; this->entry_ = entry; this->flowname_ = entry->flowname (); ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->address ()); - + TAO_AV_Flow_Handler *flow_handler = 0; - + if (entry->is_multicast ()) { TAO_AV_UDP_MCast_Flow_Handler *handler; @@ -472,9 +474,9 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, -1); flow_handler = handler; - + result = handler->get_mcast_socket ()->subscribe (*inet_addr); - + if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_UDP_MCast_connector::open failed\n"),-1); // Now disable Multicast loopback. @@ -509,19 +511,19 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_NEW_RETURN (local_addr, ACE_INET_Addr ("0"), -1); - + TAO_AV_UDP_Flow_Handler *handler; ACE_NEW_RETURN (handler, TAO_AV_UDP_Flow_Handler, -1); - + flow_handler = handler; - + result = handler->open (*local_addr); - + if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"handler::open failed\n"),-1); - + // set the socket buffer sizes to 64k. int sndbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ; int rcvbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ; @@ -541,12 +543,12 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, return 0; handler->set_remote_address (inet_addr); - + result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); - + local_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); } @@ -566,7 +568,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, char buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_CONNECTOR::connect:%s \n",buf)); entry->set_local_addr (local_addr); @@ -670,7 +672,7 @@ TAO_AV_UDP_Object::send_frame (ACE_Message_Block *frame, return 0; } -int +int TAO_AV_UDP_Object::send_frame (const iovec *iov, int iovcnt, TAO_AV_frame_info * /*frame_info*/) @@ -775,5 +777,3 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - - diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 6b6eeb890ac..99977beeb8c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -3,6 +3,8 @@ #include "sfp.h" #include "ace/ARGV.h" +#include "tao/debug.h" + // default arguments to pass to use for the ORB const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBobjrefstyle URL"; @@ -639,8 +641,8 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, // EOF. if (n == 0) { - if (TAO_orbdebug) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, "TAO: (%P|%t) GIOP::send_request () " "EOF, closing conn:\n")); return -1; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 3518b15d4ed..96da139386a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -5,6 +5,7 @@ #include "CEC_ConsumerAdmin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_ProxyPullSupplier.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index ff64ddda5f9..e93224f3901 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -6,6 +6,8 @@ #include "CEC_SupplierAdmin.h" #include "CEC_ConsumerAdmin.h" +#include "tao/ORB_Core.h" + #if ! defined (__ACE_INLINE__) #include "CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index e12122d1bf6..54ce490da2d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -5,6 +5,7 @@ #include "CEC_SupplierAdmin.h" #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index ca109793798..13e31b03f64 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -17,6 +17,8 @@ #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "tao/ORB_Core.h" + #if ! defined (__ACE_INLINE__) #include "EC_Basic_Factory.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 159558ab75b..d819e442d92 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -25,6 +25,8 @@ #include "orbsvcs/ESF/ESF_Delayed_Changes.h" #include "orbsvcs/ESF/ESF_Delayed_Command.h" +#include "tao/ORB_Core.h" + #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index 0262262c3ec..3631b5e24ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -52,17 +52,20 @@ #define TAO_EC_GATEWAY_UDP_H #include "ace/pre.h" -#include "ace/SOCK_CODgram.h" +#include "orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/SOCK_Dgram_Mcast.h" #include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/RtecUDPAdminS.h" + #include "orbsvcs/Event/event_export.h" +#include "ace/SOCK_Dgram_Mcast.h" +#include "ace/SOCK_CODgram.h" +#include "ace/Hash_Map_Manager.h" + class TAO_ECG_UDP_Out_Endpoint; /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 4f2177a604c..b6d0ccb7cd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -17,6 +17,8 @@ #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "tao/ORB_Core.h" + #if ! defined (__ACE_INLINE__) #include "EC_Null_Factory.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index d28b63c6195..8d685ccc521 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -4,8 +4,10 @@ #include "EC_Dispatching_Task.h" #include "EC_Event_Channel.h" #include "EC_QOS_Info.h" + #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/RtecSchedulerC.h" + #include "ace/Sched_Params.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index b0e95fcf814..313e5ec3b35 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -25,6 +25,8 @@ #include "orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" +#include "ace/Thread_Manager.h" + class TAO_EC_Dispatching_Task; class TAO_EC_Event_Channel; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 97e83a664ef..386af984a53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -5,6 +5,9 @@ #include "EC_ConsumerAdmin.h" #include "EC_ProxySupplier.h" #include "EC_ProxyConsumer.h" // @@ MSVC 6 bug + +#include "tao/ORB_Core.h" + #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 90c4424e5a5..31e304a2135 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -5,6 +5,9 @@ #include "EC_SupplierAdmin.h" #include "EC_ProxyConsumer.h" #include "EC_ProxySupplier.h" // @@ MSVC 6 bug + +#include "tao/ORB_Core.h" + #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 7fc81994b5f..f36a5c20460 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -176,7 +176,7 @@ TAO_EC_Sched_Factory::create_filter_builder (TAO_EC_Event_Channel *ec) { if (this->filtering_ == 3) return new TAO_EC_Sched_Filter_Builder (ec); - + return this->TAO_EC_Default_Factory::create_filter_builder (ec); } diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp index a90709b3ed1..961f11a3074 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp @@ -5,6 +5,8 @@ #include "orbsvcs/Event/Event_Channel.h" #include "orbsvcs/Event/Module_Factory.h" +#include "tao/ORB_Core.h" + ACE_RCSID(Event, Module_Factory, "$Id$") TAO_Module_Factory::~TAO_Module_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index ab6f513f1cb..9bb7d5e3ae7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -42,6 +42,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +class TAO_Profile; + class TAO_FT_Export TAO_FT_IOGR_Property : public TAO_IOP::TAO_IOR_Property, public CORBA::LocalObject { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index df0dfc449fc..e8ce8c4a5d9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -1,6 +1,7 @@ //$Id$ #include "FT_Policy_i.h" +#include "tao/debug.h" #if !defined (__ACE_INLINE__) #include "FT_Policy_i.i" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index dd502796c8f..86e10da47e1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -1,10 +1,15 @@ +// $Id$ + #include "FT_Service_Callbacks.h" +#include "FT_Policy_i.h" + #include "tao/MProfile.h" #include "tao/Tagged_Components.h" #include "tao/Stub.h" -#include "FT_Policy_i.h" + #include "tao/Invocation.h" #include "tao/ORB_Core.h" +#include "tao/Client_Strategy_Factory.h" #if !defined (__ACE_INLINE__) # include "FT_Service_Callbacks.i" diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 8f620f7ebb7..9f1cb2987d4 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -2,6 +2,8 @@ #include "IOR_Multicast.h" +#include "tao/debug.h" + #include "ace/SOCK_Connector.h" ACE_RCSID(orbsvcs, IOR_Multicast, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 6d38fc48d25..266d2b0b05e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -5,6 +5,8 @@ #include "orbsvcs/Log/Log_Constraint_Interpreter.h" #include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "tao/debug.h" + #define QUERY_LANG_SUPPORTED_BY_LOG "TCL" Log_i::Log_i (DsLogAdmin::LogMgr_ptr factory, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index d56f5535adf..e667b46d5d5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -4,7 +4,12 @@ #include "Transient_Naming_Context.h" #include "Persistent_Context_Index.h" #include "orbsvcs/CosNamingC.h" + +#include "tao/debug.h" +#include "tao/ORB_Core.h" + #include "tao/IORTable/IORTable.h" + #include "ace/Arg_Shifter.h" #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 7e563a5e3c6..01e5234a342 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -2,6 +2,9 @@ #include "Persistent_Context_Index.h" #include "Persistent_Naming_Context.h" + +#include "tao/debug.h" + #include "ace/Auto_Ptr.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp index 0870b9ec9d4..739903a3b5e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp @@ -1,9 +1,12 @@ // $Id$ #include "Notify_Buffering_Strategy.h" -#include "orbsvcs/CosNotificationC.h" #include "Notify_Command.h" +#include "orbsvcs/CosNotificationC.h" + +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_Buffering_Strategy, "$Id$") TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy (TAO_Notify_Property_Long* const queue_length) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index 2e4c6c5b72a..8af5c9af3a2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -23,6 +23,8 @@ #include "Notify_Event_Processor.h" #include "Notify_Worker_Task.h" +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_ConsumerAdmin_i, "$Id$") // Implementation skeleton constructor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 490a1ce7968..4ac511249ca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -11,6 +11,8 @@ #include "Notify_Event.h" #include "Notify_MT_Worker_Task.h" +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$") #define ASYNCH_UPDATES_THREADS 1 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index ee33d3d7633..bc693dd6b0f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -23,7 +23,9 @@ #include "notify_export.h" #include "Notify_Event_Manager_Objects_Factory.h" + #include "ace/Service_Config.h" +#include "ace/Singleton.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp index bc5b4ca7ebc..71d9096c54e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp @@ -1,6 +1,8 @@ // $Id$ #include "Notify_Event.h" +#include "tao/debug.h" + #if ! defined (__ACE_INLINE__) #include "Notify_Event.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 9870a6b251f..8364b29da59 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -8,6 +8,8 @@ #include "Notify_FilterFactory_i.h" #include "Notify_Event.h" +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_EventChannelFactory_i, "$Id$") TAO_Notify_EventChannelFactory_i::TAO_Notify_EventChannelFactory_i (void) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp index 6f225381ab4..f42e610af45 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp @@ -13,6 +13,8 @@ #include "Notify_Collection_Factory.h" #include "Notify_AdminProperties.h" +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_EventChannel_i, "$Id$") TAO_Notify_EventChannel_i::TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFactory_i* my_factory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp index ef4619367d2..a6be3b5bd8a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp @@ -5,6 +5,8 @@ #include "Notify_Event.h" #include "Notify_Event_Processor.h" +#include "tao/debug.h" + ACE_RCSID(Notify, TAO_Notify_Event_Dispatch_Command, "$Id$") TAO_Notify_Event_Dispatch_Command::TAO_Notify_Event_Dispatch_Command (TAO_Notify_Event_Processor* event_processor, TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h index be7769774e8..fefd8ac52bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h @@ -19,17 +19,19 @@ #ifndef TAO_NOTIFY_Event_Map_HEADER_H #define TAO_NOTIFY_Event_Map_HEADER_H - #include "ace/pre.h" + #include "orbsvcs/CosNotificationC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" #include "Notify_Collection.h" #include "notify_export.h" +#include "orbsvcs/ESF/ESF_Worker.h" + +#include "ace/Hash_Map_Manager.h" class TAO_Notify_EventListener; class TAO_Notify_UpdateListener; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp index 8d9952b6efa..d2f9ef860b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp @@ -1,9 +1,12 @@ /* -*- C++ -*- $Id$ */ -#include "ace/Auto_Ptr.h" #include "Notify_Filter_i.h" #include "Notify_Constraint_Visitors.h" +#include "tao/debug.h" + +#include "ace/Auto_Ptr.h" + ACE_RCSID(Notify, Notify_Filter_i, "$Id$") // Implementation skeleton constructor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp index a141753fc3f..52b2e214cf8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp @@ -5,6 +5,8 @@ #include "Notify_AdminProperties.h" #include "Notify_Buffering_Strategy.h" +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_MT_Worker_Task, "$Id$") TAO_Notify_MT_Worker_Task::TAO_Notify_MT_Worker_Task (int n_threads, long flags, int force_active, long priority) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp index c2c53c39848..a5fdf0e9b87 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp @@ -6,6 +6,8 @@ #include "Notify_Proxy_T.h" #include "Notify_Event_Manager.h" +#include "tao/debug.h" + ACE_RCSID(Notify, Notify_Proxy_T, "$Id$") template <class SERVANT_TYPE> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp index 7f4282f1e12..91a1cd6bca8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "ace/Auto_Ptr.h" #include "Notify_SupplierAdmin_i.h" #include "Notify_ProxyPushConsumer_i.h" #include "Notify_StructuredProxyPushConsumer_i.h" @@ -11,6 +10,10 @@ #include "Notify_Factory.h" #include "Notify_Event_Manager.h" +#include "tao/debug.h" + +#include "ace/Auto_Ptr.h" + ACE_RCSID(Notify, Notify_SupplierAdmin_i, "$Id$") // Implementation skeleton constructor diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 972255b98aa..c8c98bb3e41 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -27,6 +27,8 @@ #include "orbsvcs/Property/property_export.h" #include "orbsvcs/CosPropertyServiceS.h" +#include "ace/Hash_Map_Manager.h" + // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined (_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index 4f9e9cbba66..3c83aeb0ecf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -6,7 +6,7 @@ #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" - +#include "tao/debug.h" ACE_RCSID(TAO_SSLIOP, IIOP_SSL_Connect, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 73b774e386c..ee865987feb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -148,7 +148,7 @@ TAO_SSLIOP_Connection_Handler::activate (long flags, size_t stack_size[], ACE_thread_t thread_names[]) { - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("SSLIOP_Connection_Handler::activate %d ") @@ -194,7 +194,7 @@ int TAO_SSLIOP_Connection_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask rm) { - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) SSLIOP_Server_Connection_Handler::handle_close " "(%d, %d)\n", diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 8f2caefdef2..c6b2c2fe396 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -3,10 +3,9 @@ // $Id$ #include "SSLIOP_Current.h" +#include "tao/debug.h" -ACE_RCSID (TAO_SSLIOP, - SSLIOP_Current, - "$Id$") +ACE_RCSID (TAO_SSLIOP, SSLIOP_Current, "$Id$") #if !defined (__ACE_INLINE__) # include "SSLIOP_Current.inl" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 3b39c06ca4d..b0b02dc6401 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -5,7 +5,6 @@ #include "SSLIOP_Endpoint.h" #include "SSLIOP_Connection_Handler.h" #include "tao/IIOP_Endpoint.h" -#include "tao/debug.h" ACE_RCSID(tao, SSLIOP_Endpoint, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index da317e0054a..7959cc18bfd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -4,6 +4,8 @@ #include "SSLIOP_Invocation_Interceptor.h" +#include "tao/debug.h" + // #include <openssl/x509.h> // @@ For debugging code below ACE_RCSID (TAO_SSLIOP, SSLIOP_Invocation_Interceptor, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index b927f3a363e..608bd7fbdc2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -4,6 +4,8 @@ #include "SSLIOP_ORBInitializer.h" +#include "tao/debug.h" + ACE_RCSID (TAO_SSLIOP, SSLIOP_ORBInitializer, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index d6f4ed04ef5..d4d59fb56e2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -6,7 +6,6 @@ #include "ssl_endpoints.h" #include "tao/CDR.h" #include "tao/Environment.h" -#include "tao/debug.h" ACE_RCSID(TAO_SSLIOP, SSLIOP_Profile, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index bca0c50df4e..61ea81502fe 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -4,6 +4,8 @@ #include "SSLIOP_Transport.h" +#include "tao/debug.h" + ACE_RCSID (TAO_SSLIOP, SSLIOP_Transport, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 339ae7a64f5..7740efc8ad2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -22,6 +22,8 @@ #include "Reconfig_Sched_Utils.h" +#include "ace/Hash_Map_Manager.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 8dec34d4cac..55c7920b41f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -21,9 +21,10 @@ #define SCHEDENTRY_H #include "ace/pre.h" +#include "sched_export.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Event_Service_Constants.h" -#include "sched_export.h" +#include "ace/Containers.h" ////////////////////// // Helper Functions // diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 9becba79e1c..6e6335855d0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "Security_Current.h" +#include "tao/debug.h" ACE_RCSID (TAO_Security, Security_Current, diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 5a709737ba1..6385a0c18d9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "Security_ORBInitializer.h" +#include "tao/debug.h" ACE_RCSID (TAO_Security, Security_ORBInitializer, diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index 555d249505b..bc059965f72 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -5,6 +5,8 @@ #include "TAO_TIO.h" #include "TAO_UTO.h" +#include "tao/ORB_Core.h" + // Constructor. TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value, int timer_value_usecs, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 67f6bea1427..98320ea6868 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -15,8 +15,10 @@ //=========================================================================== #include "Trading_Loader.h" -#include "ace/Dynamic_Service.h" +#include "tao/ORB_Core.h" + +#include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" ACE_RCSID (Trader, Trading_Loader, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index d2e6873614b..e1b458412d6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/FlowSpec_Entry.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 53e7345d289..1fca2fa09b6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -2,8 +2,9 @@ #include "pong.h" #include "orbsvcs/AV/Protocol_Factory.h" -#include "tao/corba.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/corba.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index ed341875eb4..50a95a0189b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ftp.h" +#include "tao/debug.h" FTP_Client_Callback::FTP_Client_Callback (void) :count_ (0) @@ -251,7 +252,7 @@ Client::init (int argc,char **argv) this->parse_args (this->argc_, this->argv_); ACE_DEBUG ((LM_DEBUG, "Parsed Address TWO%s\n", this->address_)); - + ACE_NEW_RETURN (this->fdev_, FTP_Client_FDev, -1); @@ -337,7 +338,7 @@ Client::run (void) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n")); - + if (result == 0) ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for mmdevice 1 failed\n"),-1); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 52d0abe97a3..c6d648a585a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ftp.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" @@ -131,7 +132,7 @@ Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV) " (%P|%t) Unable to initialize " "the TAO_Naming_Client. \n"), -1); - + CosNaming::Name server_mmdevice_name (1); server_mmdevice_name.length (1); server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice"); @@ -141,7 +142,7 @@ Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV) my_naming_client_->resolve (server_mmdevice_name, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - + this->server_mmdevice_ = AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), ACE_TRY_ENV); @@ -151,7 +152,7 @@ Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV) ACE_ERROR_RETURN ((LM_ERROR, "Could not resolve Server_MMdevice in Naming service <%s>\n"), -1); - + return 0; } @@ -162,18 +163,18 @@ Client::init (int argc, { this->argc_ = argc; this->argv_ = argv; - + CORBA::String_var ior; - + // Initialize the endpoint strategy with the orb and poa. - this->endpoint_strategy_.init(TAO_AV_CORE::instance ()->orb (), + this->endpoint_strategy_.init(TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()); // Parse the command line arguments - this->parse_args (argc, + this->parse_args (argc, argv); - + // Open file to read. this->fp_ = ACE_OS::fopen (this->filename_, "r"); @@ -182,13 +183,13 @@ Client::init (int argc, "Cannot open output file %s\n", this->filename_), -1); - + // Resolve the object reference of the server from the Naming Service. if (this->bind_to_server (ACE_TRY_ENV) == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), -1); - + // Create the Flow protocol name char flow_protocol_str [BUFSIZ]; if (this->use_sfp_) @@ -197,22 +198,22 @@ Client::init (int argc, else ACE_OS::strcpy (flow_protocol_str, ""); - + // Initialize the QoS AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS); - + // Set the address of the ftp client. ACE_INET_Addr addr (this->address_); - + // Initialize the flowname ACE_NEW_RETURN (this->flowname_, char [BUFSIZ], 0); - + ACE_OS::sprintf (this->flowname_, "Data_%s", this->protocol_); - + // Create the forward flow specification to describe the flow. TAO_Forward_FlowSpec_Entry entry (this->flowname_, "IN", @@ -220,11 +221,11 @@ Client::init (int argc, flow_protocol_str, this->protocol_, &addr); - + AVStreams::flowSpec flow_spec (1); flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); flow_spec.length (1); - + // Bind/Connect the client and server MMDevices. CORBA::Boolean result = this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV), @@ -233,10 +234,10 @@ Client::init (int argc, flow_spec, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - + if (result == 0) ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1); - + return 0; } @@ -247,10 +248,10 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) // Rate at which frames of data need to be sent. this->frame_rate_ = CLIENT::instance ()->frame_rate (); - + // Time within which a frame should be sent. double frame_time = 1/ (double) this->frame_rate_; - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Frame Time ONE = %f\n Frame Rate = %d\n", @@ -259,32 +260,32 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) // The time between two consecutive frames. inter_frame_time.set (frame_time); - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Inter Frame Time = %d\n", inter_frame_time.msec ())); - + ACE_TRY { - + // Continue to send data till the file is read to the end. while (1) { // Count the frames sent. count_++; - + // Read from the file into a message block. int n = ACE_OS::fread(this->mb.rd_ptr (), 1, this->mb.size (), CLIENT::instance ()->file ()); - + if (n < 0) ACE_ERROR_RETURN ((LM_ERROR, "FTP_Client_Flow_Handler::fread end of file\n"), -1); - + if (n == 0) { if (feof (CLIENT::instance ()->file ())) @@ -294,9 +295,9 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); break; } - + } - + this->mb.wr_ptr (n); if ( this->count_ > 1) @@ -314,7 +315,7 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Elapsed Time = %d\n", tv.msec ())); - + // Check to see if the inter frame time has elapsed. if (tv < inter_frame_time) { @@ -327,17 +328,17 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Wait Time = %d\n", wait_time.msec ())); - + // run the orb for the wait time so the client can continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time, ACE_TRY_ENV); ACE_TRY_CHECK; } } - + // Start timer before sending the frame. last_frame_sent_time.start (); - + // Send frame. int result = this->protocol_object_->send_frame (&this->mb); if (result < 0) @@ -345,22 +346,22 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) "send failed:%p","FTP_Client_Flow_Handler::send\n"), -1); ACE_DEBUG ((LM_DEBUG,"Client::pace_data buffer sent succesfully\n")); - + // Reset the mb. this->mb.reset (); - + } // end while - + // Since the file is read stop the stream. AVStreams::flowSpec stop_spec (1); CLIENT::instance ()->streamctrl ()->destroy (stop_spec, ACE_TRY_ENV); ACE_TRY_CHECK; - + // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0); ACE_TRY_CHECK; - + } ACE_CATCHANY { @@ -416,7 +417,7 @@ main (int argc, if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"),1); - + // Start sending data. result = CLIENT::instance ()->pace_data (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -448,4 +449,3 @@ TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_M #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/tests/AVStreams/Simple/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Simple/ftp.cpp index 53f0819f386..9db1e707b23 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple/ftp.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ftp.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index e40154e7ccd..bc27e8b0da3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -1,6 +1,7 @@ // $Id$ #include "sender.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" @@ -17,7 +18,7 @@ Sender_Callback::handle_start (void) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Sender_Callback::handle_start pace data failed"); - + return -1; } ACE_ENDTRY; @@ -99,10 +100,10 @@ Sender::parse_args (int argc, { case 'f': this->filename_ = opts.optarg; - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Input File Name %s\n", - this->filename_.c_str ())); + this->filename_.c_str ())); break; case 'r': this->frame_rate_ = ACE_OS::atoi (opts.optarg); @@ -131,16 +132,16 @@ Sender::register_sender (CORBA::Environment &ACE_TRY_ENV) " (%P|%t) Unable to initialize " "the TAO_Naming_Client. \n"), -1); - - // Register the sender mmdevice object with the ORB + + // Register the sender mmdevice object with the ORB ACE_NEW_RETURN (this->sender_mmdevice_, TAO_MMDevice (&this->endpoint_strategy_), -1); - + // Servant Reference Counting to manage lifetime PortableServer::ServantBase_var safe_sender_mmdevice = this->sender_mmdevice_; - + CORBA::Object_var mmdevice = this->sender_mmdevice_->_this (ACE_TRY_ENV); ACE_CHECK_RETURN(-1); @@ -148,7 +149,7 @@ Sender::register_sender (CORBA::Environment &ACE_TRY_ENV) CosNaming::Name sender_mmdevice_name (1); sender_mmdevice_name.length (1); sender_mmdevice_name [0].id = CORBA::string_dup ("Sender"); - + // Register the server object with the naming server. this->my_naming_client_->rebind (sender_mmdevice_name, mmdevice.in (), @@ -164,19 +165,19 @@ Sender::init (int argc, CORBA::Environment &ACE_TRY_ENV) { // Initialize the endpoint strategy with the orb and poa. - int result = - this->endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), + int result = + this->endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()); - + // Parse the command line arguments - result = this->parse_args (argc, + result = this->parse_args (argc, argv); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Error in Parse Args \n"), -1); - + // Open file to read. this->fp_ = ACE_OS::fopen (this->filename_.c_str (), "r"); @@ -185,9 +186,9 @@ Sender::init (int argc, "Cannot open output file %s\n", this->filename_.c_str ()), -1); - else + else ACE_DEBUG ((LM_DEBUG, - "File opened successfully\n")); + "File opened successfully\n")); // Register the object reference with the Naming Service. result = this->register_sender (ACE_TRY_ENV); @@ -197,7 +198,7 @@ Sender::init (int argc, ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), -1); - + return 0; } @@ -208,7 +209,7 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Time within which a frame should be sent. double frame_time = 1/ (double) this->frame_rate_; - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Frame Time ONE = %f\n Frame Rate = %d\n", @@ -221,38 +222,38 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // The time between two consecutive frames. inter_frame_time.set (frame_time); - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Inter Frame Time = %d\n", inter_frame_time.msec ())); - + ACE_TRY { - + // The time taken for sending a frame and preparing for the next frame ACE_High_Res_Timer elapsed_timer; - + // Continue to send data till the file is read to the end. while (1) { // Count the frames sent. count_++; - + // Reset the message block. this->mb_.reset (); - + // Read from the file into a message block. int n = ACE_OS::fread (this->mb_.wr_ptr (), 1, this->mb_.size (), SENDER::instance ()->file ()); - + if (n < 0) ACE_ERROR_RETURN ((LM_ERROR, "Sender::pace_data fread failed\n"), -1); - + if (n == 0) { // At end of file break the loop and end the client. @@ -260,16 +261,16 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); break; } - + this->mb_.wr_ptr (n); - + if (this->count_ > 1) { // Second frame and beyond - + // Stop the timer that was started just before the previous frame was sent. elapsed_timer.stop (); - + // Get the time elapsed after sending the previous frame. ACE_Time_Value elapsed_time; elapsed_timer.elapsed_time (elapsed_time); @@ -278,7 +279,7 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Elapsed Time = %d\n", elapsed_time.msec ())); - + // Check to see if the inter frame time has elapsed. if (elapsed_time < inter_frame_time) { @@ -290,17 +291,17 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Wait Time = %d\n", wait_time.msec ())); - + // run the orb for the wait time so the client can continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time, ACE_TRY_ENV); ACE_TRY_CHECK; } } - + // Start timer before sending the frame. elapsed_timer.start (); - + // Send frame. int result = this->protocol_object_->send_frame (&this->mb_); @@ -309,32 +310,32 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) "send failed:%p","Sender::pace_data send\n"), -1); ACE_DEBUG ((LM_DEBUG,"Sender::pace_data buffer sent succesfully\n")); - + } // end while AVStreams::flowSpec stop_spec; - + // Get the strem controoler for this stream. - CORBA::Any_ptr streamctrl_any = + CORBA::Any_ptr streamctrl_any = SENDER::instance ()->get_endpoint ()->get_property_value ("Related_StreamCtrl", ACE_TRY_ENV); ACE_TRY_CHECK; - + AVStreams::StreamCtrl_ptr streamctrl; - + *streamctrl_any >>= streamctrl; // Destroy the stream streamctrl->destroy (stop_spec, ACE_TRY_ENV); ACE_TRY_CHECK; - + // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0, ACE_TRY_ENV); ACE_TRY_CHECK; - + } ACE_CATCHANY { @@ -420,4 +421,3 @@ TAO_AV_Endpoint_Reactive_Strategy_B<Sender_StreamEndPoint,TAO_VDev,AV_Null_Media #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Sender_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp index 4f4fd5e711d..d7aaa7497f4 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "client.h" +#include "tao/debug.h" @@ -91,7 +92,7 @@ CORBA::Boolean ttcp_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &/*the_spec*/) { ACE_INET_Addr addr (GLOBALS::instance ()->port_, GLOBALS::instance ()->hostname_); - + if (this->acceptor_.open (addr, TAO_ORB_Core_instance ()->reactor ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -231,18 +232,18 @@ Client::svc (void) -1); break; } - + // activate the client MMDevice with the ORB this->poa_->activate_object (this->client_mmdevice_, ACE_TRY_ENV); ACE_TRY_CHECK; - + //Activate POA Manager PortableServer::POAManager_var mgr = this->poa_->the_POAManager (); - + mgr->activate (); - + if (this->bind_to_server () == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -258,10 +259,10 @@ Client::svc (void) ACE_TRY_CHECK; AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS); AVStreams::flowSpec_var the_flows (new AVStreams::flowSpec); - - ACE_DEBUG ((LM_DEBUG, - "Host %d ,Port %s\n", - GLOBALS::instance ()->port_, GLOBALS::instance ()->hostname_)); + + ACE_DEBUG ((LM_DEBUG, + "Host %d ,Port %s\n", + GLOBALS::instance ()->port_, GLOBALS::instance ()->hostname_)); ACE_INET_Addr addr (GLOBALS::instance ()->port_, GLOBALS::instance ()->hostname_); @@ -269,12 +270,12 @@ Client::svc (void) char buf [BUFSIZ]; addr.addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Client Svc %s\n", buf)); - + AVStreams::flowSpec flow_spec (0); - + timer.start (); this->streamctrl_.bind_devs (this->client_mmdevice_->_this (), this->server_mmdevice_.in (), @@ -287,10 +288,10 @@ Client::svc (void) long time_taken = tv1.sec () + tv1.usec () /1000000; tv1.dump (); - + ACE_DEBUG ((LM_DEBUG,"(%P|%t)time taken for stream setup is %ld \n", time_taken )); - + #if !defined (ACE_LACKS_SOCKET_BUFSIZ) int sndbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ; int rcvbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ; @@ -369,11 +370,11 @@ Client::bind_to_server (void) server_mmdevice_name.length (1); server_mmdevice_name [0].id = CORBA::string_dup ("Bench_Server_MMDevice"); - CORBA::Object_var server_mmdevice_obj + CORBA::Object_var server_mmdevice_obj = my_name_client_->resolve (server_mmdevice_name, ACE_TRY_ENV); ACE_TRY_CHECK; - + this->server_mmdevice_ = AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), ACE_TRY_ENV); @@ -456,13 +457,13 @@ main (int argc, char **argv) { //TAO_debug_level++; - + if (GLOBALS::instance ()->parse_args (argc, argv) == -1) return -1; - + GLOBALS::instance ()->thread_count_ = 1; - - // Preliminary argument processing. + + // Preliminary argument processing. int i; for (i=0;i< argc;i++) { @@ -472,21 +473,21 @@ main (int argc, char **argv) ACE_OS::atoi (argv[i+1]); } - CORBA::ORB_var orb = CORBA::ORB_init (argc, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); - + PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); - + //Activate POA Manager PortableServer::POAManager_var mgr = poa->the_POAManager (); - + mgr->activate (); - + for (i = 0; i < GLOBALS::instance ()->thread_count_; i++) { Client* client; @@ -495,7 +496,7 @@ main (int argc, char **argv) poa.in (), i), -1); - + if (client->activate (THR_BOUND) == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error in activate: %p", @@ -520,5 +521,5 @@ template class ACE_Singleton<Globals,TAO_SYNCH_MUTEX>; #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #pragma instantiate ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR> -#pragma instantiate ACE_Singleton <Globals,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton <Globals,TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp index 053bddcf5e4..5ac5c970abf 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp @@ -2,6 +2,7 @@ #include "server.h" #include "tao/Timeprobe.h" +#include "tao/debug.h" ACE_RCSID(benchmark, server, "$Id$") diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp index b86ebf34dac..49e0dda3129 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp @@ -2,6 +2,7 @@ #include "Command_Handler.h" #include "ctr.cpp" +#include "tao/debug.h" ACE_RCSID(mpeg_client, Command_Handler, "$Id$") @@ -75,7 +76,7 @@ Command_Handler::init (int argc, { this->argc_ = argc; this->argv_ = argv; - + // Increase the debug_level so that we can see the output TAO_debug_level++; CORBA::String_var ior; @@ -102,7 +103,7 @@ Command_Handler::init (int argc, ACE_TRY_CHECK; this->orb_manager_.activate_poa_manager (ACE_TRY_ENV); - + // Initialize the naming services if (my_name_client_.init (orb_manager_.orb ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -398,7 +399,7 @@ Command_Handler::init_av (void) int i; ACE_Time_Value sleep_delay; - sleep_delay.usec(10000); + sleep_delay.usec(10000); /* try to stop and close previous playing */ if (audioSocket >= 0 || videoSocket >= 0) @@ -419,7 +420,7 @@ Command_Handler::init_av (void) ACE_OS::write (asp[0],&message,BUFSIZ); ABpid = -1; } - + ACE_OS::sleep(sleep_delay); } if (videoSocket >= 0) @@ -552,7 +553,7 @@ Command_Handler::init_java_av (char *audio_ior, char *video_file) { ACE_Time_Value sleep_delay; - sleep_delay.usec(10000); + sleep_delay.usec(10000); if (audio_file != 0) ACE_DEBUG ((LM_DEBUG,"%s\n",audio_file)); if (video_file != 0) @@ -1898,7 +1899,7 @@ Command_Handler::connect_to_video_server (void) AVStreams::flowSpec_var flow_spec (new AVStreams::flowSpec); // Bind the client and server mmdevices. - + ACE_NEW_RETURN (this->video_reactive_strategy_, Video_Endpoint_Reactive_Strategy_A (&this->orb_manager_, this), @@ -2861,7 +2862,7 @@ Audio_Client_StreamEndPoint::handle_close (void) CORBA::Boolean Audio_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec) { - + ACE_DEBUG ((LM_DEBUG,"(%P|%t) handle_preconnect called\n")); ACE_INET_Addr local_addr; @@ -2906,11 +2907,11 @@ Audio_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec) "MIME:audio/au", "TCP", CORBA::string_dup (client_address_string)); - + the_spec [0] = udp_flow_entry.entry_to_string (); - + //the_spec.length (1); - //the_spec [0] = + //the_spec [0] = ACE_DEBUG ((LM_DEBUG, "(%P|%t) client flow spec is %s\n", @@ -2932,12 +2933,12 @@ Audio_Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& server_spe 0); if (entry->parse (server_spec[0].in ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Video_Client_StreamEndPoint::handle_postconnect parse failed\n"), 0); - + // Take the first string of the sequence . ACE_INET_Addr server_udp_addr (entry->address_str ()); - + ACE_DEBUG ((LM_DEBUG, "\nFlow Spec %s\n", entry->address_str ())); - + server_udp_addr.dump (); if (ACE_OS::connect (this->dgram_.get_handle (),(sockaddr *) server_udp_addr.get_addr (), server_udp_addr.get_size ()) == -1) @@ -3047,9 +3048,9 @@ Video_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec) "MIME:video/mpeg", "UDP", CORBA::string_dup (client_address_string)); - + the_spec [0] = udp_flow_entry.entry_to_string (); - + //the_spec.length (1); //the_spec [0] = CORBA::string_dup (client_address_string); @@ -3070,7 +3071,7 @@ Video_Client_StreamEndPoint::handle_postconnect (AVStreams::flowSpec& server_spe 0); if (entry->parse (server_spec[0].in ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Video_Client_StreamEndPoint::handle_postconnect parse failed\n"), 0); - + // Take the first string of the sequence . ACE_INET_Addr server_udp_addr (entry->address_str ()); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 52340cd37ce..ace884d6908 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -18,9 +18,12 @@ // // ============================================================================ -#include "ace/Read_Buffer.h" #include "CC_client.h" +#include "tao/debug.h" + +#include "ace/Read_Buffer.h" + ACE_RCSID(Concurrency, CC_client, "$Id$") // Constructor. diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp index 35a069f5781..63d27a105bc 100644 --- a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp @@ -19,7 +19,8 @@ // ============================================================================ #include "NS_client.h" -#include "stdio.h" +#include "tao/debug.h" +#include <stdio.h> ACE_RCSID(Concurrency, NS_client, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 68c1c7b33cf..c1e7f0d60ea 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -7,7 +7,9 @@ #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/CosNamingC.h" + #include "tao/Timeprobe.h" +#include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 8a271d2bd4d..46d83bb2f59 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -1,9 +1,6 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" -#include "ace/Read_Buffer.h" +#include "EC_Mcast.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" @@ -12,7 +9,12 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -#include "EC_Mcast.h" +#include "tao/ORB_Core.h" + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Sched_Params.h" +#include "ace/Read_Buffer.h" #if !defined (__ACE_INLINE__) #include "EC_Mcast.i" diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 547fd4a3cef..e51f97f027a 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -1,8 +1,10 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" +#include "EC_Multiple.h" + +#include "Scheduler_Runtime1.h" +#include "Scheduler_Runtime2.h" +#include "Scheduler_Runtime_Dynamic.h" /* infos_3 */ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" @@ -12,11 +14,12 @@ #include "orbsvcs/Sched/Config_Scheduler.h" #include "orbsvcs/Runtime_Scheduler.h" #include "orbsvcs/Event/Event_Channel.h" -#include "EC_Multiple.h" -#include "Scheduler_Runtime1.h" -#include "Scheduler_Runtime2.h" -#include "Scheduler_Runtime_Dynamic.h" /* infos_3 */ +#include "tao/ORB_Core.h" + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Sched_Params.h" #if defined (sun) # include <sys/lwp.h> /* for _lwp_self */ diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 9c9cbd9602a..9433fd5eaa7 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -26,6 +26,7 @@ #include "orbsvcs/RtecEventCommS.h" #include "orbsvcs/Channel_Clients_T.h" #include "orbsvcs/Event/EC_Gateway_Sched.h" +#include "orbsvcs/CosNamingC.h" class Test_ECG; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 217116097ae..79c02ad1adb 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -1,14 +1,17 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" +#include "ECT_Consumer.h" -#include "tao/Timeprobe.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Time_Utilities.h" -#include "ECT_Consumer.h" + +#include "tao/Timeprobe.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Sched_Params.h" ACE_RCSID(EC_Throughput, ECT_Consumer, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index 2ebb10be3b8..c8b22e8c1eb 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -21,6 +21,7 @@ #include "orbsvcs/Channel_Clients_T.h" #include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" class Test_Consumer : public POA_RtecEventComm::PushConsumer diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index c00025a6778..6f163b98afb 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -1,15 +1,18 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" +#include "ECT_Consumer_Driver.h" -#include "tao/Timeprobe.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Time_Utilities.h" -#include "ECT_Consumer_Driver.h" + +#include "tao/Timeprobe.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Sched_Params.h" ACE_RCSID(EC_Throughput, ECT_Consumer_Driver, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 8c36036a4d0..9adfb636f6d 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -13,16 +13,17 @@ #ifndef ECT_CONSUMER_DRIVER_H #define ECT_CONSUMER_DRIVER_H -#include "ace/Task.h" +#include "ECT_Driver.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/High_Res_Timer.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "ECT_Driver.h" #include "ECT_Consumer.h" +#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "ace/Task.h" +#include "ace/High_Res_Timer.h" class ECT_Consumer_Driver : public ECT_Driver { diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 3b9f4b78b6c..f2a502edad4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -5,7 +5,9 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Time_Utilities.h" + #include "tao/Timeprobe.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 18f42f45db5..e107c37693b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -1,15 +1,18 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" +#include "ECT_Supplier_Driver.h" -#include "tao/Timeprobe.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Time_Utilities.h" -#include "ECT_Supplier_Driver.h" + +#include "tao/Timeprobe.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Sched_Params.h" ACE_RCSID(EC_Throughput, ECT_Supplier_Driver, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 99d33d22e95..e8819ed904b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -1,11 +1,7 @@ // $Id$ -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" -#include "ace/High_Res_Timer.h" +#include "ECT_Throughput.h" -#include "tao/Timeprobe.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Scheduler_Factory.h" @@ -16,7 +12,14 @@ #include "orbsvcs/Event/Module_Factory.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" -#include "ECT_Throughput.h" + +#include "tao/Timeprobe.h" +#include "tao/debug.h" + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Sched_Params.h" +#include "ace/High_Res_Timer.h" ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 30cc7a8c8bd..a38f3cb6d34 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Gateway_UDP.h" +#include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" ACE_RCSID(EC_Tests_Basic, BCast, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 65f02df63c1..3bd8493fa84 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -4,6 +4,8 @@ #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Time_Utilities.h" +#include "tao/debug.h" + ACE_RCSID(EC_Tests, EC_Consumer, "$Id$") EC_Consumer::EC_Consumer (EC_Driver *driver, diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index ca7cbeedc92..9903856dfe6 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -24,7 +24,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecEventChannelAdminS.h" + #include "ace/Stats.h" +#include "ace/Task.h" class TAO_EC_Event_Channel_Attributes; class TAO_Module_Factory; diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index a013d52c084..0de3b668b5d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -4,6 +4,8 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Event_Utilities.h" +#include "tao/debug.h" + ACE_RCSID(EC_Tests, EC_Supplier, "$Id$") EC_Supplier::EC_Supplier (EC_Driver *driver, diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index fcccdb42a7b..3990a7d2327 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_i.h" -#include "tao/debug.h" #if !defined(__ACE_INLINE__) //#include "test_i.i" diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index 29f77bdcb7c..c7f601f37a0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "airplane_client_i.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp index 2187e80782e..c501db183a1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp @@ -2,6 +2,7 @@ #include "airplane_i.h" #include "tao/corba.h" +#include "tao/debug.h" ACE_RCSID(ImplRepo, airplane_i, "$Id$") @@ -30,7 +31,7 @@ Airplane_i::get_plane (CORBA::Environment &) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n")); - + switch (ACE_OS::rand () % 24) { case 0: @@ -82,6 +83,6 @@ Airplane_i::get_plane (CORBA::Environment &) case 23: return CORBA::string_dup ("Tumbler, page 138"); } - + return 0; } diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index 06843f45bf0..f19f500bb36 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -1,7 +1,10 @@ // $Id$ #include "airplane_server_i.h" + #include "tao/IORTable/IORTable.h" +#include "tao/debug.h" + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index 10d5daacdd7..b3d9f61a41a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "nestea_client_i.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" @@ -54,9 +55,9 @@ Nestea_Client_i::run () { this->server_->drink (40); this->server_->drink (100); - + ACE_DEBUG ((LM_DEBUG, "Cans: %d\n" - "Praise: %s\n", + "Praise: %s\n", this->server_->bookshelf_size (), this->server_->get_praise ())); @@ -64,7 +65,7 @@ Nestea_Client_i::run () this->server_->crush (200); ACE_DEBUG ((LM_DEBUG, "Cans: %d\n" - "Praise: %s\n", + "Praise: %s\n", this->server_->bookshelf_size (), this->server_->get_praise ())); diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 619eda4b435..ddee142a311 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -2,6 +2,7 @@ #include "nestea_i.h" #include "tao/corba.h" +#include "tao/debug.h" #include "ace/FILE_Addr.h" #include "ace/FILE_Connector.h" #include "ace/FILE_IO.h" @@ -16,7 +17,7 @@ ACE_RCSID(ImplRepo, nestea_i, "$Id$") : cans_ (0) { this->data_filename_ = ACE::strnew (filename); - + // @@ This should probably be called from somewhere else this->load_data (); } @@ -32,7 +33,7 @@ Nestea_i::~Nestea_i (void) // Add <cans> number of cans to the bookshelf. -void +void Nestea_i::drink (CORBA::Long cans, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -48,7 +49,7 @@ Nestea_i::drink (CORBA::Long cans, // Removes <cans> number of cans from the bookshelf. -void +void Nestea_i::crush (CORBA::Long cans, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -60,14 +61,14 @@ Nestea_i::crush (CORBA::Long cans, this->cans_ = 0; else this->cans_ -= cans; - + this->save_data (); } // Returns the number of cans in the bookshelf. -CORBA::Long +CORBA::Long Nestea_i::bookshelf_size (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -101,7 +102,7 @@ Nestea_i::get_praise (CORBA::Environment &) // Saves bookshelf data to a file. -int +int Nestea_i::save_data (void) { ACE_FILE_IO file; @@ -111,10 +112,10 @@ Nestea_i::save_data (void) ACE_FILE_Addr (this->data_filename_), 0, ACE_Addr::sap_any) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n to %s", - "connect", - this->data_filename_), + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n to %s", + "connect", + this->data_filename_), -1); char str[MAX_UINT32_STR_LEN]; @@ -127,7 +128,7 @@ Nestea_i::save_data (void) // Loads bookshelf data from a file. -int +int Nestea_i::load_data (void) { ACE_FILE_IO file; @@ -137,10 +138,10 @@ Nestea_i::load_data (void) ACE_FILE_Addr (this->data_filename_), 0, ACE_Addr::sap_any) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n to %s", - "connect", - this->data_filename_), + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n to %s", + "connect", + this->data_filename_), -1); char str[MAX_UINT32_STR_LEN]; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index f7660f13d30..88e9d7a1bff 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -2,6 +2,7 @@ #include "nestea_server_i.h" #include "tao/IORTable/IORTable.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index e9d05b69fd6..c75da35c1b0 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -20,6 +20,7 @@ //============================================================ #include "ncontextext_client_i.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp index e43c5f7fe17..22c9c9361c3 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp @@ -3,6 +3,7 @@ // $Id$ #include "Hash_ReplicaControl.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" Hash_ReplicaControl::Hash_ReplicaControl (void) diff --git a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp b/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp new file mode 100644 index 00000000000..d0ab49a1939 --- /dev/null +++ b/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp @@ -0,0 +1,23 @@ +// $Id$ + +#include "authorization_test_i.h" + +#if !defined(__ACE_INLINE__) +#include "authorization_test_i.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(Authorize, authorization_test_i, "$Id$") + +CORBA::Boolean +Authorization_Server_i::check_access (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return 0; +} + +void +Authorization_Server_i::shutdown (CORBA::Environment&) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->orb_->shutdown (0); +} diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index c2e83c2d23e..6fd14294832 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -19,6 +19,7 @@ // ============================================================================ #include "client.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" ACE_RCSID(Simple_Naming, client, "$Id$") diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index bc2517acc91..d36877e537f 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -1,11 +1,13 @@ // $Id$ +#include "Client_i.h" + +#include "tao/debug.h" + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS.h" -#include "Client_i.h" - ACE_RCSID(Time_Service, Client_i, "$Id$") // Constructor. diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index 21df4573b40..8273d5089ca 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -18,8 +18,9 @@ // // ============================================================================ -#include "tao/corba.h" #include "tao/DynamicInterface/Request.h" +#include "tao/corba.h" +#include "tao/debug.h" #include "ace/Profile_Timer.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index 81a18dd43e6..c0bfb09ba5d 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -1,12 +1,14 @@ // $Id$ -#include "ace/Env_Value_T.h" -#include "ace/Read_Buffer.h" #include "Cubit_Client.h" +#include "RTI_IO.h" #include "tao/Timeprobe.h" #include "tao/TAO_Internal.h" -#include "RTI_IO.h" +#include "tao/debug.h" + +#include "ace/Env_Value_T.h" +#include "ace/Read_Buffer.h" ACE_RCSID(IDL_Cubit, Cubit_Client, "Cubit_Client.cpp,v 1.31 1999/08/04 07:15:14 nanbor Exp") diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp index adba5a30843..f54292b49bb 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -2,6 +2,7 @@ #include "Cubit_Server.h" #include "tao/TAO_Internal.h" +#include "tao/debug.h" ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$") diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp index cf43571a2e5..91ad25fbc62 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp @@ -13,13 +13,15 @@ // // ============================================================================ -#include "tao/corba.h" -#include "ace/Auto_Ptr.h" #include "Cubit_Client.h" #include "Cubit_i.h" +#include "RTI_IO.h" +#include "tao/corba.h" +#include "tao/debug.h" #include "tao/Timeprobe.h" -#include "RTI_IO.h" + +#include "ace/Auto_Ptr.h" ACE_RCSID(IDL_Cubit, Cubit_Client, "Cubit_i.cpp,v 1.8 1999/07/07 15:01:28 irfan Exp") diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index 6ba2e717743..88eccdfb857 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -1,10 +1,12 @@ // $Id$ +#include "Cubit_Client.h" +#include "Cubit_Server.h" + #include "ace/Synch.h" #include "ace/Get_Opt.h" #include "ace/ARGV.h" -#include "Cubit_Client.h" -#include "Cubit_Server.h" +#include "ace/Thread_Manager.h" ACE_RCSID(IDL_Cubit, collocation_test, "$Id$") diff --git a/TAO/performance-tests/Latency/ami-latency-client.cpp b/TAO/performance-tests/Latency/ami-latency-client.cpp index 6b4349a464b..89a1c3d3f9a 100644 --- a/TAO/performance-tests/Latency/ami-latency-client.cpp +++ b/TAO/performance-tests/Latency/ami-latency-client.cpp @@ -1,11 +1,12 @@ // $Id$ +#include "testS.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" -#include "testS.h" ACE_RCSID(Latency, client, "$Id$") diff --git a/TAO/performance-tests/Latency/ami-throughput-client.cpp b/TAO/performance-tests/Latency/ami-throughput-client.cpp index feec94f45c7..bb038b48d5b 100644 --- a/TAO/performance-tests/Latency/ami-throughput-client.cpp +++ b/TAO/performance-tests/Latency/ami-throughput-client.cpp @@ -1,11 +1,12 @@ // $Id$ +#include "testS.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" -#include "testS.h" ACE_RCSID(Latency, client, "$Id$") diff --git a/TAO/performance-tests/Latency/client.cpp b/TAO/performance-tests/Latency/client.cpp index 11a15d61a18..983c3b50725 100644 --- a/TAO/performance-tests/Latency/client.cpp +++ b/TAO/performance-tests/Latency/client.cpp @@ -1,11 +1,12 @@ // $Id$ +#include "testC.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" -#include "testC.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/performance-tests/Latency/st_client.cpp b/TAO/performance-tests/Latency/st_client.cpp index ee8b4ea1278..c750a23b227 100644 --- a/TAO/performance-tests/Latency/st_client.cpp +++ b/TAO/performance-tests/Latency/st_client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "testC.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index 4639d8380cd..b657312df7b 100644 --- a/TAO/performance-tests/POA/Demux/client.cpp +++ b/TAO/performance-tests/POA/Demux/client.cpp @@ -17,6 +17,7 @@ #include "demux_test_client.h" +#include "tao/debug.h" ACE_RCSID(CodeGen, client, "$Id$") diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 76ebc264c62..c6a774aa9b8 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -14,6 +14,7 @@ // ============================================================================ #include "demux_test_client.h" +#include "tao/debug.h" // Constructor Demux_Test_Client::Demux_Test_Client (void) diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp index bdab3241871..b2bf2d2b63d 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp @@ -2,6 +2,7 @@ // Implementation of TAO's Demux_Test interface #include "demux_test_i.h" +#include "tao/ORB_Core.h" // ctor Demux_Test_i::Demux_Test_i (void) diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index b9f3e59ce4d..821f2bd00e4 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -14,6 +14,7 @@ // ============================================================================ #include "demux_test_server.h" +#include "tao/debug.h" ACE_RCSID(CodeGen, demux_test_server, "$Id$") diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp index d23adde825b..f8fd3773138 100644 --- a/TAO/performance-tests/POA/Demux/server.cpp +++ b/TAO/performance-tests/POA/Demux/server.cpp @@ -17,6 +17,7 @@ #include "demux_test_server.h" +#include "tao/debug.h" ACE_RCSID(CodeGen, server, "$Id$") diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index cfa1d925660..82b943363e6 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -19,6 +19,8 @@ // ================================================================ #include "testS.h" +#include "tao/Server_Strategy_Factory.h" +#include "tao/ORB_Core.h" #include "ace/Profile_Timer.h" #include "ace/Get_Opt.h" diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp index 9d4c63047e7..d70834d4f29 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp @@ -1,10 +1,12 @@ // $Id$ -#include "ace/Read_Buffer.h" #include "PP_Test_Client.h" #include "tao/Timeprobe.h" #include "tao/TAO_Internal.h" +#include "tao/debug.h" + +#include "ace/Read_Buffer.h" ACE_RCSID(IDL_Cubit, Cubit_Client, "$Id$") @@ -275,14 +277,14 @@ PP_Test_Client::shutdown_server (int do_shutdown) { if (do_shutdown) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n")); this->objref_->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "server, please ACE_OS::exit")); } } @@ -317,7 +319,7 @@ PP_Test_Client::run_oneway (void) if (this->shutdown_) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n")); ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START); @@ -325,7 +327,7 @@ PP_Test_Client::run_oneway (void) this->objref_->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "server, please ACE_OS::exit")); } } @@ -360,7 +362,7 @@ PP_Test_Client::run_void (void) if (this->shutdown_) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n")); ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START); @@ -368,7 +370,7 @@ PP_Test_Client::run_void (void) this->objref_->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "server, please ACE_OS::exit")); } } @@ -476,4 +478,3 @@ PP_Test_Client::init (int argc, char **argv) ACE_ENDTRY; return 0; } - diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp index 1f6a7ed4bd7..8f91dae07e7 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp @@ -2,6 +2,7 @@ #include "PP_Test_Server.h" #include "tao/TAO_Internal.h" +#include "tao/debug.h" ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$") @@ -27,7 +28,7 @@ PP_Test_Server::parse_args (void) if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", - get_opts.optarg), + get_opts.optarg), -1); break; case '?': diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index 97c1a9d380b..f3f6cb0a454 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "testC.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" #include "ace/Stats.h" diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp index 54b0228aa24..7b768d0ea90 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_i.h" -#include "tao/debug.h" #include "ace/ACE.h" ACE_RCSID(Reliable, test_i, "$Id$") diff --git a/TAO/performance-tests/Thruput/TAO/client.cpp b/TAO/performance-tests/Thruput/TAO/client.cpp index 5098c471fd7..3110c6ec9d6 100644 --- a/TAO/performance-tests/Thruput/TAO/client.cpp +++ b/TAO/performance-tests/Thruput/TAO/client.cpp @@ -16,11 +16,14 @@ // // ============================================================================ +#include "ttcpC.h" +#include "ttcp_decl.h" + +#include "tao/debug.h" + #include "ace/ACE.h" #include "ace/Read_Buffer.h" #include "ace/Get_Opt.h" -#include "ttcpC.h" -#include "ttcp_decl.h" ACE_RCSID(TAO, client, "$Id$") diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp index e85995bca84..842ef5903a4 100644 --- a/TAO/performance-tests/Thruput/TAO/server.cpp +++ b/TAO/performance-tests/Thruput/TAO/server.cpp @@ -14,11 +14,13 @@ // // ============================================================================ +#include "ttcp_i.h" + +#include "tao/debug.h" + #include "ace/ACE.h" #include "ace/Get_Opt.h" -#include "ttcp_i.h" - ACE_RCSID(TAO, server, "$Id$") char Usage[] = "\ diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index 34d171fa30a..d0d981238dc 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -28,7 +28,6 @@ #include "tao/ORB_Table.h" #include "tao/Server_Strategy_Factory.h" #include "tao/Connector_Registry.h" -#include "tao/debug.h" #include "ace/Object_Manager.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/tao/BiDir_Policy_i.cpp b/TAO/tao/BiDir_Policy_i.cpp index f34cde79b85..3a02dbd8a5c 100644 --- a/TAO/tao/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_Policy_i.cpp @@ -2,7 +2,6 @@ #include "tao/BiDir_Policy_i.h" #include "tao/Stub.h" -#include "tao/debug.h" ACE_RCSID(TAO, BiDir_Policy_i, "$Id$") diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index d5dea40248c..e0359acea7c 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -12,10 +12,10 @@ #ifndef TAO_CLEANUP_FUNC_REGISTRY_H #define TAO_CLEANUP_FUNC_REGISTRY_H - #include "ace/pre.h" #include "corbafwd.h" +#include "ace/Array_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp index be82bc37e40..03e6014c8ef 100644 --- a/TAO/tao/ClientRequestInfo.cpp +++ b/TAO/tao/ClientRequestInfo.cpp @@ -496,4 +496,27 @@ TAO_ClientRequestInfo::get_reply_service_context ( 0); } +void +TAO_ClientRequestInfo::reply_status (int invoke_status) +{ + switch (invoke_status) + { + case TAO_INVOKE_OK: + this->reply_status_ = PortableInterceptor::SUCCESSFUL; + break; + case TAO_INVOKE_RESTART: + if (this->invocation_->received_location_forward ()) + this->reply_status_ = PortableInterceptor::LOCATION_FORWARD; + else + this->reply_status_ = PortableInterceptor::TRANSPORT_RETRY; + break; + default: + // We should only get here if the invocation status is + // TAO_INVOKE_EXCEPTION, i.e. a CORBA::SystemException, so set + // the appropriate reply status. + this->reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION; + break; + } +} + #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h index 357811b7194..1df7a0508a0 100644 --- a/TAO/tao/ClientRequestInfo.h +++ b/TAO/tao/ClientRequestInfo.h @@ -37,7 +37,6 @@ #include "PortableInterceptorC.h" #include "LocalObject.h" #include "StringSeqC.h" -#include "Invocation.h" class TAO_GIOP_Invocation; diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl index 0fed4cfe47c..f88e8ec698f 100644 --- a/TAO/tao/ClientRequestInfo.inl +++ b/TAO/tao/ClientRequestInfo.inl @@ -22,29 +22,6 @@ TAO_ClientRequestInfo::response_expected (CORBA::Boolean flag) } ACE_INLINE void -TAO_ClientRequestInfo::reply_status (int invoke_status) -{ - switch (invoke_status) - { - case TAO_INVOKE_OK: - this->reply_status_ = PortableInterceptor::SUCCESSFUL; - break; - case TAO_INVOKE_RESTART: - if (this->invocation_->received_location_forward ()) - this->reply_status_ = PortableInterceptor::LOCATION_FORWARD; - else - this->reply_status_ = PortableInterceptor::TRANSPORT_RETRY; - break; - default: - // We should only get here if the invocation status is - // TAO_INVOKE_EXCEPTION, i.e. a CORBA::SystemException, so set - // the appropriate reply status. - this->reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION; - break; - } -} - -ACE_INLINE void TAO_ClientRequestInfo::forward_reference ( PortableInterceptor::ForwardRequest &) { diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 80142f84337..5d03f33a84f 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -21,14 +21,14 @@ #define TAO_CONTEXT_H #include "ace/pre.h" +#include "dynamicinterface_export.h" #include "tao/corbafwd.h" +#include "ace/Unbounded_Queue.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "dynamicinterface_export.h" - class TAO_DynamicInterface_Export CORBA_Context { // = TITLE diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index fe9cd11aaf1..c219b68d541 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -1,21 +1,20 @@ // $Id$ #include "DII_Invocation.h" - -ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$") - #include "Unknown_User_Exception.h" #include "tao/Stub.h" #include "tao/Principal.h" #include "tao/Object_KeyC.h" #include "tao/Transport_Mux_Strategy.h" -#include "tao/debug.h" #include "tao/Transport.h" #if !defined (__ACE_INLINE__) # include "DII_Invocation.inl" #endif /* ! __ACE_INLINE__ */ +ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$") + + int TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions, CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 52d4a85758b..3f5115d7f21 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -11,7 +11,7 @@ // ExceptionList.h // // = DESCRIPTION -// This file defines the ExceptionList datatype used in +// This file defines the ExceptionList datatype used in // dynamic invocations. // // = AUTHOR @@ -23,14 +23,14 @@ #define TAO_CORBA_EXCEPTIONLIST_H #include "ace/pre.h" +#include "dynamicinterface_export.h" #include "tao/corbafwd.h" +#include "ace/Unbounded_Queue.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "dynamicinterface_export.h" - class CORBA_ExceptionList; typedef CORBA_ExceptionList *CORBA_ExceptionList_ptr; @@ -149,4 +149,3 @@ private: #include "ace/post.h" #endif /* TAO_CORBA_EXCEPTIONLIST_H */ - diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 534defedb1f..396e58cea40 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1026,7 +1026,7 @@ TAO_GIOP_Message_Base:: if (transport->send (&message_block) == -1 && errno != ENOENT) { - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, "(%P|%t) error closing connection %lu, errno = %d\n", transport->id (), errno)); diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index a3fe4e59df8..58038bbe142 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -9,6 +9,7 @@ #include "Table_Adapter.h" #include "IOR_Table_Impl.h" +#include "tao/ORB_Core.h" #include "tao/Object.h" ACE_RCSID(IORTable, Table_Adapter, "$Id$") diff --git a/TAO/tao/Interceptor_List.h b/TAO/tao/Interceptor_List.h index 425e36b417f..131fcc78a75 100644 --- a/TAO/tao/Interceptor_List.h +++ b/TAO/tao/Interceptor_List.h @@ -23,7 +23,7 @@ #include "PortableInterceptorC.h" -#include "ace/Containers_T.h" +#include "ace/Array_Base.h" /** diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 569133484fd..570b4802b17 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Containers_T.h" +#include "ace/Unbounded_Queue.h" class TAO_Export TAO_Leader_Follower { diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 6920b3c6638..605e60c2e20 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -4,7 +4,6 @@ #include "tao/LocalObject.h" #include "tao/Stub.h" -#include "tao/debug.h" #include "tao/IFR_Client_Adapter.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index fcfa5d2c74a..567da38fc61 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Containers_T.h" +#include "ace/Unbounded_Queue.h" #include "tao/Any.h" class TAO_InputCDR; diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index ef00b8b846f..acfaae8175f 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -23,7 +23,7 @@ #include "PortableInterceptorC.h" #include "TAO_Singleton.h" -#include "ace/Containers_T.h" +#include "ace/Array_Base.h" /** * @class TAO_ORBInitializer_Registry diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 3462cad1fdf..614375848f5 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -367,7 +367,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // later, replace all of these // warning this turns on a daemon ACE::debug (1); - TAO_orbdebug = 1; arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter @@ -1296,7 +1295,7 @@ TAO_ORB_Core::resource_factory (void) // Still don't have one, so let's allocate the default. This // will throw an exception if it fails on exception-throwing // platforms. - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_WARNING, ACE_TEXT ("(%P|%t) WARNING - No Resource Factory found ") ACE_TEXT ("in Service Repository.\n") @@ -1473,7 +1472,7 @@ TAO_ORB_Core::client_factory (void) // Still don't have one, so let's allocate the default. This // will throw an exception if it fails on exception-throwing // platforms. - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_WARNING, ACE_TEXT ("(%P|%t) WARNING - No Client Strategy Factory found ") ACE_TEXT ("in Service Repository.\n") @@ -1512,7 +1511,7 @@ TAO_ORB_Core::server_factory (void) if (this->server_factory_ == 0) { // Still don't have one, so let's allocate the default. - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_WARNING, ACE_TEXT ("(%P|%t) WARNING - No %s found in Service Repository.") ACE_TEXT (" Using default instance.\n"), @@ -2970,7 +2969,7 @@ TAO_ORB_Core_instance (void) } -TAO_ORB_Core::TAO_Collocation_Strategies +int TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object) { @@ -2982,15 +2981,15 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object) switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) { case THRU_POA: - return TAO_ORB_Core::THRU_POA_STRATEGY; + return TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY; case DIRECT: - return TAO_ORB_Core::DIRECT_STRATEGY; + return TAO_Collocation_Strategies::CS_DIRECT_STRATEGY; } } // In this case the Object is a client. - return TAO_ORB_Core::REMOTE_STRATEGY; + return TAO_Collocation_Strategies::CS_REMOTE_STRATEGY; } diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 0331fe73fb2..c27a6c4b305 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -270,24 +270,6 @@ public: DIRECT }; - enum TAO_Collocation_Strategies - { - /// i.e no collocation. - REMOTE_STRATEGY, - - /// Calls to the collocated object are forwarded by the POA. - THRU_POA_STRATEGY, - - /// Calls to the collocated object are made directly to its - /// servant. - DIRECT_STRATEGY, - - /// This value should always be the last value in the enumeration. - /// It provides the count for the number of collocation - /// strategies. - COLLOCATION_STRATEGIES_NUM - }; - /** * This method returns the right collocation strategy, if any, * to be used to perform a method invocation on the given object. @@ -295,7 +277,7 @@ public: * @note * No-Collocation is a special case of collocation. */ - static TAO_Collocation_Strategies collocation_strategy ( + static int collocation_strategy ( CORBA::Object_ptr object); //@} diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 7d91a56e51a..45bc9195ce3 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -24,7 +24,6 @@ #include "ace/pre.h" #include "tao/corbafwd.h" -#include "tao/Abstract_Servant_Base.h" #include "tao/Object_Proxy_Broker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -34,6 +33,8 @@ class IR_InterfaceDef; class TAO_Stub; +class TAO_Abstract_ServantBase; + class TAO_Export CORBA_Object { public: diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp index 0748ca31bf0..c7ec77f596d 100644 --- a/TAO/tao/Pluggable_Messaging.cpp +++ b/TAO/tao/Pluggable_Messaging.cpp @@ -1,7 +1,6 @@ -//$Id$ +// $Id$ #include "tao/Pluggable_Messaging.h" -#include "tao/debug.h" #include "tao/Pluggable.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp index c1a63a5b197..47c67db376a 100644 --- a/TAO/tao/PortableServer/MessagingS.cpp +++ b/TAO/tao/PortableServer/MessagingS.cpp @@ -142,14 +142,14 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::the_TAO_ReplyHandler_ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::_TAO_ReplyHandler_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; } POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_Strategized_Proxy_Broker (void) { - for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i) + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; } @@ -160,7 +160,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); if (this->proxy_cache_[strategy] != 0) @@ -175,7 +175,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy ( void POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int strategy, CORBA::Environment &ACE_TRY_ENV ) { @@ -185,7 +185,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], POA_Messaging::_TAO_ReplyHandler_ThruPOA_Proxy_Impl, @@ -194,7 +194,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( ACE_CHECK; break; - case TAO_ORB_Core::DIRECT_STRATEGY: + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl, @@ -203,7 +203,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( ACE_CHECK; break; - case TAO_ORB_Core::REMOTE_STRATEGY: + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: default: ACE_NEW_THROW_EX ( this->proxy_cache_[strategy], diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h index 3fad152fc70..da000b2af4b 100644 --- a/TAO/tao/PortableServer/MessagingS.h +++ b/TAO/tao/PortableServer/MessagingS.h @@ -123,7 +123,7 @@ TAO_NAMESPACE POA_Messaging // Helper methods that takes care to create the proxy // as soon as their use is necessary. void create_proxy ( - TAO_ORB_Core::TAO_Collocation_Strategies strategy, + int collocation_strategy, CORBA::Environment &ACE_TRY_ENV ); @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_Messaging // are totally stateless, and those can be shared by all the // instances of a given IDL interface type. ::Messaging::_TAO_ReplyHandler_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index b872afadde7..e3532b8b4ee 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -16,7 +16,8 @@ #include "tao/Stub.h" #include "tao/Profile.h" #include "tao/MProfile.h" - +#include "tao/debug.h" +#include "tao/PortableInterceptor.h" #if !defined (__ACE_INLINE__) # include "Object_Adapter.i" diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp index 63c5586cc28..7fc27e57e55 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp @@ -21,7 +21,7 @@ the_tao_strategized_object_proxy_broker (void) TAO_Strategized_Object_Proxy_Broker::TAO_Strategized_Object_Proxy_Broker (void) { for (int i = 0; - i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; + i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; } @@ -29,7 +29,7 @@ TAO_Strategized_Object_Proxy_Broker::TAO_Strategized_Object_Proxy_Broker (void) TAO_Strategized_Object_Proxy_Broker::~TAO_Strategized_Object_Proxy_Broker (void) { for (int i = 0; - i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; + i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; } @@ -38,7 +38,7 @@ TAO_Object_Proxy_Impl & TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object, CORBA::Environment &ACE_TRY_ENV) { - TAO_ORB_Core::TAO_Collocation_Strategies strategy = + int strategy = TAO_ORB_Core::collocation_strategy (object); if (this->proxy_cache_[strategy] != 0) @@ -51,7 +51,7 @@ TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object, } void -TAO_Strategized_Object_Proxy_Broker::create_proxy (TAO_ORB_Core::TAO_Collocation_Strategies strategy, +TAO_Strategized_Object_Proxy_Broker::create_proxy (int strategy, CORBA::Environment &ACE_TRY_ENV) { ACE_GUARD (TAO_SYNCH_MUTEX, @@ -62,7 +62,7 @@ TAO_Strategized_Object_Proxy_Broker::create_proxy (TAO_ORB_Core::TAO_Collocation { switch (strategy) { - case TAO_ORB_Core::THRU_POA_STRATEGY: + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: { ACE_NEW_THROW_EX (this->proxy_cache_[strategy], TAO_ThruPOA_Object_Proxy_Impl, @@ -70,7 +70,7 @@ TAO_Strategized_Object_Proxy_Broker::create_proxy (TAO_ORB_Core::TAO_Collocation ACE_CHECK; break; } - case TAO_ORB_Core::DIRECT_STRATEGY: + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: { ACE_NEW_THROW_EX (this->proxy_cache_[strategy], TAO_Direct_Object_Proxy_Impl, @@ -79,7 +79,7 @@ TAO_Strategized_Object_Proxy_Broker::create_proxy (TAO_ORB_Core::TAO_Collocation break; } default: - case TAO_ORB_Core::REMOTE_STRATEGY: + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: { ACE_NEW_THROW_EX (this->proxy_cache_[strategy], TAO_Remote_Object_Proxy_Impl, diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h index 14d0ae0c2a4..93837842a05 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h @@ -26,7 +26,7 @@ #include "ace/pre.h" // -- TAO Include -- -#include "tao/corba.h" +#include "tao/corbafwd.h" #include "tao/Object_Proxy_Broker.h" #include "tao/ORB_Core.h" @@ -48,13 +48,13 @@ public: private: - void create_proxy (TAO_ORB_Core::TAO_Collocation_Strategies strategy, + void create_proxy (int collocation_strategy, CORBA::Environment &ACE_TRY_ENV); private: TAO_Object_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; TAO_SYNCH_MUTEX mutex_; }; diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index 47f0c78f0f1..d532e1b0429 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -15,8 +15,7 @@ #define TAO_PROTOCOLS_HOOKS_H #include "ace/pre.h" -#include "tao/ORB_Core.h" -#include "tao/RTCORBAC.h" +#include "RTCORBAC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,6 +23,10 @@ #include "ace/Service_Object.h" +class TAO_ORB_Core; +class TAO_GIOP_Invocation; +class TAO_Resource_Factory; + class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object { public: diff --git a/TAO/tao/RT_CORBA.h b/TAO/tao/RT_CORBA.h new file mode 100644 index 00000000000..510bb07868e --- /dev/null +++ b/TAO/tao/RT_CORBA.h @@ -0,0 +1,23 @@ +// -*- C++ -*- + +// ================================================================ +/** + * @file RT_CORBA.h + * + * $Id$ + * + * Include all the required headers to use RT CORBA easily. + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +// ================================================================ + +#ifndef TAO_RT_CORBA_H +#define TAO_RT_CORBA_H +#include "ace/pre.h" + +#include "TAOC.h" +#include "RTCORBAC.h" + +#include "ace/post.h" +#endif /* TAO_RT_CORBA_H */ diff --git a/TAO/tao/RT_ORB_Loader.cpp b/TAO/tao/RT_ORB_Loader.cpp index d13e028240f..9ac8dbaae2c 100644 --- a/TAO/tao/RT_ORB_Loader.cpp +++ b/TAO/tao/RT_ORB_Loader.cpp @@ -4,7 +4,7 @@ #include "RT_ORB.h" #include "RT_Current.h" -#include "tao/ORB_Core.h" +#include "ORB_Core.h" ACE_RCSID (TAO, RT_ORB_Loader, "$Id$") diff --git a/TAO/tao/RT_ORB_Loader.h b/TAO/tao/RT_ORB_Loader.h index 11ddec36466..6f1dd9e3161 100644 --- a/TAO/tao/RT_ORB_Loader.h +++ b/TAO/tao/RT_ORB_Loader.h @@ -17,7 +17,6 @@ #define TAO_RT_ORB_LOADER_H #include "ace/pre.h" -#include "tao/ORB_Core.h" #include "tao/Object_Loader.h" #include "ace/Service_Config.h" @@ -25,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +class TAO_ORB_Core; + class TAO_Export TAO_RT_ORB_Loader : public TAO_Object_Loader { public: diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 523aaaea637..94d5d114952 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -25,7 +25,7 @@ #include "tao/Pluggable.h" #include "tao/Protocol_Factory.h" #include "tao/orbconf.h" -#include "ace/Containers_T.h" +#include "ace/Unbounded_Set.h" class TAO_Acceptor_Registry; class TAO_Connector_Registry; diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h index cc6b2bad672..391d8ca10f5 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.h +++ b/TAO/tao/SmartProxies/Smart_Proxies.h @@ -25,12 +25,13 @@ #include "smartproxies_export.h" #include "tao/Object.h" +#include "tao/TAO_Singleton.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_SmartProxies_Export TAO_Smart_Proxy_Base +class TAO_SmartProxies_Export TAO_Smart_Proxy_Base { // = TITLE // TAO_Smart_Proxy_Base @@ -38,16 +39,16 @@ class TAO_SmartProxies_Export TAO_Smart_Proxy_Base // = DESCRIPTION // A base class for all TAO_IDL generated smart proxy base classes // Contains the _var pointer to the real proxy - + public: virtual ~TAO_Smart_Proxy_Base (void); // Destructor - + protected: TAO_Smart_Proxy_Base (void); TAO_Smart_Proxy_Base (CORBA::Object_ptr proxy); // Constructors - + CORBA::Object_var base_proxy_; // The proxy to which remote/collocated calls are made. }; diff --git a/TAO/tao/Strategies/Direct_Priority_Mapping.cpp b/TAO/tao/Strategies/Direct_Priority_Mapping.cpp index 78db50e7599..b16314573ef 100644 --- a/TAO/tao/Strategies/Direct_Priority_Mapping.cpp +++ b/TAO/tao/Strategies/Direct_Priority_Mapping.cpp @@ -5,7 +5,6 @@ #if (TAO_HAS_RT_CORBA == 1) #include "Direct_Priority_Mapping.h" -#include "tao/debug.h" #include "ace/Sched_Params.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp index 32a743fc980..2114bf893da 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp @@ -7,8 +7,6 @@ #if TAO_HAS_UIOP == 1 -#include "tao/debug.h" - ACE_RCSID(Strategies, UIOP_Endpoint, "$Id$") #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index cda77541196..c4597341d59 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -282,7 +282,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) if (protocol_factory == 0) { - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", @@ -345,7 +345,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) if (protocol_factory == 0) { - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 1d651473a41..bde238077b8 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -33,51 +33,44 @@ #include "tao/corbafwd.h" +// The definitions are included in the same order as they are declared +// in corbafwd.h +#include "tao/Typecode.h" +#include "tao/Any.h" + #include "tao/Environment.h" -#include "tao/ORB.h" #include "tao/Exception.h" -#include "tao/Any.h" + #include "tao/NVList.h" -#include "tao/Principal.h" -#include "tao/TAO_Server_Request.h" + #include "tao/Object.h" -#include "tao/Remote_Object_Proxy_Impl.h" #include "tao/LocalObject.h" -#include "tao/Typecode.h" - -#include "tao/CDR.h" +#include "tao/Principal.h" +#include "tao/ORB.h" -#include "tao/PolicyC.h" #include "tao/CurrentC.h" +#include "tao/BoundsC.h" +#include "tao/ValueBase.h" +#include "tao/ValueFactory.h" +#include "tao/PolicyC.h" +#include "tao/Services.h" +#include "tao/DomainC.h" +#include "tao/WrongTransactionC.h" // TAO specific files, avoid them as much as possible. -#include "tao/Stub.h" -#include "tao/params.h" -#include "tao/ORB_Core.h" -#include "tao/debug.h" - -#include "tao/Client_Strategy_Factory.h" -#include "tao/Server_Strategy_Factory.h" -#include "tao/Invocation.h" +#include "tao/CDR.h" -#include "tao/Managed_Types.h" #include "tao/Sequence.h" +#include "tao/Managed_Types.h" #include "tao/Object_KeyC.h" -#include "tao/ValueBase.h" -#include "tao/ValueFactory.h" -#include "tao/Services.h" #include "tao/ObjectIDList.h" -#include "tao/DomainC.h" -#include "tao/WrongTransactionC.h" -#include "tao/BoundsC.h" -#include "tao/TAOC.h" -#include "tao/MessagingC.h" -#include "tao/StringSeqC.h" -#include "tao/OctetSeqC.h" +#include "tao/Remote_Object_Proxy_Impl.h" #include "tao/PortableInterceptor.h" /* This needs to remain visible. */ +#include "tao/StringSeqC.h" +#include "tao/OctetSeqC.h" #include "tao/ClientRequestInfo.h" #include "tao/BiDirPolicyC.h" diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index edda61af502..514f053800e 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -59,6 +59,28 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Define symbolic names for the ORB collocation strategies. +class TAO_Collocation_Strategies +{ +public: + enum { + /// i.e no collocation. + CS_REMOTE_STRATEGY, + + /// Calls to the collocated object are forwarded by the POA. + CS_THRU_POA_STRATEGY, + + /// Calls to the collocated object are made directly to its + /// servant. + CS_DIRECT_STRATEGY, + + /// This value should always be the last value in the enumeration. + /// It provides the count for the number of collocation + /// strategies. + CS_LAST + }; +}; + // Forward declarations of some data types are needed. class CORBA_Any; diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp index f78bfe0e602..1df1e0f40a2 100644 --- a/TAO/tao/debug.cpp +++ b/TAO/tao/debug.cpp @@ -11,11 +11,10 @@ // part of process initialization. They are treated as immutable // values through all of this debuging package. // -// XXX on Windows, make it always use OutputDebugString () instead of stdio. +// XXX on Windows, make it always use OutputDebugString () instead of stdio. #include "tao/debug.h" ACE_RCSID(tao, debug, "$Id$") TAO_Export u_int TAO_debug_level = 0; -TAO_Export u_int TAO_orbdebug = 0; diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index cded694781c..091158a3f3b 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -433,7 +433,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) if (protocol_factory == 0) { - if (TAO_orbdebug) + if (TAO_debug_level > 0) ACE_ERROR ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) No %s found in ") ACE_TEXT ("Service Repository. ") diff --git a/TAO/tao/params.h b/TAO/tao/params.h index f59bc0c0dc6..09a976de7ae 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -24,6 +24,7 @@ #include "tao/CORBA_String.h" #include "ace/SString.h" +#include "ace/Unbounded_Queue.h" // Forward decls. diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index 3758e23d10c..9393656e85a 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -17,8 +17,9 @@ // // ============================================================================ -#include "ace/Get_Opt.h" #include "ami_test_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" ACE_RCSID(AMI, server, "$Id$") diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index d8f9b161787..e7923b51f18 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -13,13 +13,14 @@ //============================================================================= -#include "ace/Get_Opt.h" -#include "ace/Task.h" - -#include "timeoutC.h" - #include "timeout_i.h" #include "timeout_client.h" +#include "timeoutC.h" + +#include "tao/debug.h" + +#include "ace/Get_Opt.h" +#include "ace/Task.h" ACE_RCSID (AMI, client, diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index 0d92da8ae4b..079b039edd2 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -15,7 +15,7 @@ #include "ace/Get_Opt.h" #include "tao/corba.h" -#include "tao/PortableServer/POA.h" +#include "tao/debug.h" #include "timeout_i.h" #include "timeout_client.h" diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index acbe1b0509c..51b463607db 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -2,6 +2,8 @@ #include "test_i.h" +#include "tao/ORB_Core.h" + #if !defined(__ACE_INLINE__) #include "test_i.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index 1d948cf240c..690c28084db 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "test_i.h" +#include "tao/ORB_Core.h" #if !defined(__ACE_INLINE__) #include "test_i.i" diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index 94a8fb759e8..1ab19749a8e 100644 --- a/TAO/tests/CDR/allocator.cpp +++ b/TAO/tests/CDR/allocator.cpp @@ -21,11 +21,12 @@ // // ============================================================================ +#include "tao/corba.h" +#include "tao/ORB_Core.h" + #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -#include "tao/corba.h" - ACE_RCSID(CDR, allocator, "$Id$") #define DEFAULT_BUFFER_SIZE 512 diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index 5e7e790cc7a..b7b23188e72 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -17,8 +17,9 @@ // // ============================================================================ -#include "ace/Get_Opt.h" #include "tao/corba.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" ACE_RCSID(CDR, basic_types, "$Id$") diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 6a286d714af..65b66e0ba66 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "tao/corba.h" +#include "tao/debug.h" ACE_RCSID(CDR, tc, "$Id$") diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index ce6f2724641..e81a70270e4 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -1,8 +1,9 @@ // $Id$ +#include "testC.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "testC.h" ACE_RCSID(DSI_Gateway, client, "$Id$") diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index cc796516824..2f093fbbae8 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_dsi.h" -#include "tao/debug.h" #include "tao/DynamicInterface/Request.h" #if !defined(__ACE_INLINE__) @@ -49,7 +48,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request, // Updates the byte order state, if necessary. target_request->invoke (ACE_TRY_ENV); ACE_CHECK; - + // Outgoing reply must have the same byte order as the incoming one. request->_tao_reply_byte_order (target_request->_tao_byte_order ()); } diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index 1597da38608..27f8a59d204 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "test_i.h" +#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "test_i.i" diff --git a/TAO/tests/Endpoint_Per_Priority/client.cpp b/TAO/tests/Endpoint_Per_Priority/client.cpp index f2403586cf1..fb9b7ef6dbd 100644 --- a/TAO/tests/Endpoint_Per_Priority/client.cpp +++ b/TAO/tests/Endpoint_Per_Priority/client.cpp @@ -1,7 +1,8 @@ // $Id$ #include "testC.h" -#include "tao/TAOC.h" +#include "tao/RT_CORBA.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Stats.h" diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index a7e374e5501..108184cad9e 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -1,7 +1,8 @@ // $Id$ -#include "ace/Get_Opt.h" #include "ping_i.h" +#include "tao/debug.h" +#include "ace/Get_Opt.h" ACE_RCSID(Faults, server, "$Id$") diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index aa6c9b360d5..90c0c05b6ec 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -1,6 +1,7 @@ //$Id$ #include "Server_i.h" +#include "tao/debug.h" #include "tao/IORTable/IORTable.h" // Constructor. diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index 7cf7d425138..b8e877722ca 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_i.h" -#include "tao/debug.h" ACE_RCSID(MT_Client, test_i, "$Id$") diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index c1c4a7f93b4..27ebda35fb2 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_i.h" -#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "test_i.i" diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index 99e7c03296a..1614b38adc0 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -1,8 +1,9 @@ // $Id$ +#include "testC.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "testC.h" ACE_RCSID(MT_Client, client, "$Id$") diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 79cf0c252e0..d44016f40f1 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -1,8 +1,9 @@ // $Id$ +#include "testC.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "testC.h" ACE_RCSID(MT_Client, orb_creation, "$Id$") diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index b0a607fdafe..cfa5f5cba69 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "test_i.h" +#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "test_i.i" diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp index 256305636ec..b7efe7f29a1 100644 --- a/TAO/tests/Native_Exceptions/test_i.cpp +++ b/TAO/tests/Native_Exceptions/test_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "test_i.h" -#include "tao/debug.h" #if !defined(__ACE_INLINE__) #include "test_i.i" diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index 4ba14142d28..2ede15e0127 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -18,9 +18,10 @@ // // ============================================================================ -#include "ace/Read_Buffer.h" #include "client.h" #include "local_server.h" +#include "tao/debug.h" +#include "ace/Read_Buffer.h" ACE_RCSID(MT_Client_Test, client, "$Id$") diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 93206613489..8c997c45d87 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -17,8 +17,9 @@ // // ============================================================================ -#include "ace/Read_Buffer.h" #include "local_server.h" +#include "tao/debug.h" +#include "ace/Read_Buffer.h" ACE_RCSID(MT_Client_Test, local_server, "$Id$") diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index caf9caaca31..8fd4340af1d 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "server.h" +#include "tao/debug.h" ACE_RCSID(MT_Client_Test, server, "$Id$") diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 947e0eabf78..bdab9cb12af 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -19,6 +19,7 @@ #include "Object_A_i.h" #include "tao/corba.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" ACE_RCSID(Triangle_Test, Object_A_i, "$Id$") diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index dc68312347b..b4d7712d67a 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -17,8 +17,9 @@ // // ============================================================================ -#include "ace/Read_Buffer.h" #include "initiator.h" +#include "tao/debug.h" +#include "ace/Read_Buffer.h" ACE_RCSID(Triangle_Test, initiator, "$Id$") diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index 9be44b25f7c..274f683b77b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "server_A.h" +#include "tao/debug.h" ACE_RCSID(Triangle_Test, server_A, "$Id$") diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index e96e580adb6..ed62056251c 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -18,6 +18,7 @@ // ============================================================================ #include "server_B.h" +#include "tao/debug.h" ACE_RCSID(Triangle_Test, server_B, "$Id$") diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index d2c4fad03d2..51768cfc050 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -22,7 +22,6 @@ #include "ace/High_Res_Timer.h" #include "tao/corba.h" -#include "tao/debug.h" #include "testC.h" ACE_RCSID(OctetSeq, OctetSeq, "$Id$") diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index ed1a02d6819..e1a949eda57 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -16,6 +16,8 @@ // ================================================== #include "testS.h" +#include "tao/ORB_Core.h" +#include "tao/Server_Strategy_Factory.h" ACE_RCSID(Identity, Identity, "$Id$") diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 13e42512cbd..045c618c27c 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "any.h" +#include "tao/debug.h" ACE_RCSID(Param_Test, any, "$Id$") diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index 616030b252b..d94d83e8e98 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -17,9 +17,10 @@ #include "param_testCli.h" #include "tao/corba.h" +#include "tao/debug.h" +#include "tao/Stub.h" #include "ace/Get_Opt.h" - ACE_RCSID(Param_Test, anyop, "$Id$") int diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 97e77a84221..d3050e2852e 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "complex_any.h" +#include "tao/debug.h" const int LEVEL_2_LENGTH = 5; const int LEVEL_3_LENGTH = 3; diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 3e8a183300e..eec0aa7823f 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "except.h" +#include "tao/debug.h" #include "tao/DynamicInterface/Unknown_User_Exception.h" diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h index b1bc3561de7..02c81242d8d 100644 --- a/TAO/tests/Param_Test/helper.h +++ b/TAO/tests/Param_Test/helper.h @@ -22,6 +22,7 @@ #include "param_testCli.h" #include "tao/DynamicInterface/Request.h" +#include "ace/Singleton.h" class Generator { @@ -46,4 +47,5 @@ public: }; typedef ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX> GENERATOR; + #endif /* HELPER_H */ diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index 2e57e28a9d2..a4b65950b0f 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -16,9 +16,10 @@ // // ============================================================================ +#include "options.h" +#include "tao/debug.h" #include "ace/Read_Buffer.h" #include "ace/Get_Opt.h" -#include "options.h" ACE_RCSID(Param_Test, options, "$Id$") diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 8e5776cf89e..544d4c2928d 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -13,8 +13,9 @@ // // ============================================================================ -#include "tao/corba.h" #include "param_test_i.h" +#include "tao/corba.h" +#include "tao/debug.h" ACE_RCSID(Param_Test, param_test_i, "$Id$") diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp index da8e4698d30..8187d3ad3c1 100644 --- a/TAO/tests/Param_Test/results.cpp +++ b/TAO/tests/Param_Test/results.cpp @@ -16,8 +16,9 @@ // // ============================================================================ -#include "ace/Log_Msg.h" #include "results.h" +#include "tao/debug.h" +#include "ace/Log_Msg.h" ACE_RCSID(Param_Test, results, "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp") diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 9b17bb15211..738a343337e 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -13,11 +13,11 @@ // // ============================================================================ +#include "param_test_i.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -#include "param_test_i.h" - ACE_RCSID(Param_Test, server, "$Id$") // Parses the command line arguments and returns an error status. diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index c134ea9c69b..035ed312b29 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -18,6 +18,7 @@ #include "helper.h" #include "ub_any_seq.h" +#include "tao/debug.h" const CORBA::ULong TEST_SEQ_LENGTH = 5; const CORBA::ULong NUM_TEST_TYPES = 4; diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index a5da249d31b..bb08e35b53f 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -1,6 +1,7 @@ // $Id$ #include "testC.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #include "ace/Task.h" diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index 2a0f3b5c5f2..dba57b7a213 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -5,6 +5,7 @@ #include "marker.h" #include "Client_ORBInitializer.h" #include "Interceptor_Type.h" +#include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS.h" diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 74a2e0b972d..274596b42ff 100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -17,7 +17,6 @@ main (int, char *[]) #else #include "client.h" -#include "tao/qt_resource.h" int main (int argc, char *argv[]) diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index 5ec3f7347e0..089d378548c 100755 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -20,6 +20,7 @@ #if defined (ACE_HAS_QT) +#include "tao/qt_resource.h" #include <qapplication.h> #include <qvbox.h> #include <qslider.h> diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 33acfad1cd2..e580ca26a3c 100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (QtTests, server, "$Id$") #if !defined (ACE_HAS_QT) -int +int main (int, char *[]) { ACE_ERROR ((LM_INFO, @@ -60,7 +60,7 @@ main (int argc, char *argv[]) return 1; // Qt specific stuff for running with TAO... - QApplication app (argc, argv); + QApplication app (argc, argv); TAO_QtResource_Factory::set_context (&app); ACE_DECLARE_NEW_CORBA_ENV; @@ -99,16 +99,16 @@ main (int argc, char *argv[]) QVBox box; box.resize (145, 100); - QLCDNumber lcd (2, &box, "lcd_display"); - + QLCDNumber lcd (2, &box, "lcd_display"); + // Connect the signal from the hosted servant with the public // SLOT method display () for the LCD Widget. - + QObject::connect (&display_impl, SIGNAL (set_value (int)), &lcd, SLOT (display (int))); - + app.setMainWidget(&box); box.show (); @@ -136,9 +136,9 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_TRY_ENV); ACE_TRY_CHECK; - // We choose to run the main Qt event loop.. + // We choose to run the main Qt event loop.. app.exec (); - + } ACE_CATCHANY { diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index 2f66126a079..41ad4cf02e8 100755 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h @@ -20,11 +20,14 @@ #if defined(ACE_HAS_QT) + +#include "tao/qt_resource.h" #include <qapplication.h> #include <qobject.h> + class LCD_Display_imp : public QObject, public POA_LCD_Display - + { Q_OBJECT // = TITLE @@ -41,7 +44,7 @@ public: void shutdown (CORBA::Environment&) ACE_THROW_SPEC ((CORBA::SystemException)); - void send_val (CORBA::Long val, + void send_val (CORBA::Long val, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 073745fdcd1..5105f05e34f 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "testC.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index a37164b4769..be2d16adec0 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "testC.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" #include "ace/Task.h" diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index e4eff3b1e9f..1d83e435569 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "testC.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #if (TAO_HAS_RT_CORBA == 1) diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 50006221b7b..4a92b30c808 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -13,15 +13,16 @@ // // = AUTHOR // Kirthika Parameswaran <kirthika@cs.wustl.edu> -// +// //========================================================================= -#include "ace/Get_Opt.h" #include "testC.h" #include "Smart_Proxy_Impl.h" +#include "tao/debug.h" #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" #include "ace/Stats.h" +#include "ace/Get_Opt.h" ACE_RCSID(Benchmark, client, "$Id$") @@ -32,13 +33,13 @@ int register_smart_proxy = 1; class Marker { public: - + void accumulate_into (ACE_Throughput_Stats &throughput) const { // Accumulate the throughput statistics into <throughput> throughput.accumulate (this->throughput_); } - void dump_stats (const char* msg, + void dump_stats (const char* msg, ACE_UINT32 gsf) { // Print stats @@ -48,11 +49,11 @@ class Marker ACE_hrtime_t latency_diff) { // get the sample. - this->throughput_.sample (throughput_diff, + this->throughput_.sample (throughput_diff, latency_diff); } - private: + private: ACE_Throughput_Stats throughput_; // Keep throughput statistics on a per-thread basis }; @@ -123,7 +124,7 @@ main (int argc, char *argv[]) if (parse_args (argc, argv) != 0) return 1; - + CORBA::Object_var object = orb->string_to_object (ior, ACE_TRY_ENV); @@ -138,22 +139,22 @@ main (int argc, char *argv[]) // doesnt have to make sure to destoy it and also for the smart // proxy designer who now can manage the lifetime of the object // much surely. - + Smart_Test_Factory *test_factory = 0; - ACE_NEW_RETURN (test_factory, + ACE_NEW_RETURN (test_factory, Smart_Test_Factory, -1); - - // To make KAI Compiler happy as it considers <test_factory> to be + + // To make KAI Compiler happy as it considers <test_factory> to be // an unused variable. ACE_UNUSED_ARG (test_factory); } #endif /*(TAO_HAS_SMART_PROXIES == 1)*/ - + Test_var server = Test::_narrow (object.in (), ACE_TRY_ENV); - + if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Object reference <%s> is nil\n", @@ -165,7 +166,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "High res. timer calibration....")); ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); ACE_DEBUG ((LM_DEBUG, "done\n")); - + marker.accumulate_into (throughput); CORBA::Short price =0; CORBA::Long cost =0; @@ -174,33 +175,33 @@ main (int argc, char *argv[]) { // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - + price = server->box_prices (ACE_TRY_ENV); if (price < 300) cost = server->tickets (5); - + // Grab timestamp again. - ACE_hrtime_t now = ACE_OS::gethrtime (); - + ACE_hrtime_t now = ACE_OS::gethrtime (); + // Record statistics. marker.sample (now - throughput_base, now - latency_base); - + ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } - + marker.dump_stats ("buying tickets ", gsf); - - server->shutdown (ACE_TRY_ENV); + + server->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; /* Test_var server1 = Test::_narrow (object.in (), ACE_TRY_ENV); - + if (CORBA::is_nil (server1.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Object reference <%s> is nil\n", @@ -208,11 +209,11 @@ main (int argc, char *argv[]) 1); Marker marker1; ACE_Throughput_Stats throughput1; - + ACE_DEBUG ((LM_DEBUG, "High res. timer calibration....")); ACE_UINT32 gsf1 = ACE_High_Res_Timer::global_scale_factor (); ACE_DEBUG ((LM_DEBUG, "done\n")); - + marker1.accumulate_into (throughput1); CORBA::Short price1 =0; CORBA::Long cost1 =0; @@ -221,26 +222,26 @@ main (int argc, char *argv[]) { // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - + price1 = server1->box_prices (ACE_TRY_ENV); if (price1 < 300) cost = server1->tickets (5); - + // Grab timestamp again. - ACE_hrtime_t now = ACE_OS::gethrtime (); - + ACE_hrtime_t now = ACE_OS::gethrtime (); + // Record statistics. marker.sample (now - throughput_base1, now - latency_base); - + ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } - + marker1.dump_stats ("buying tickets using a default proxy ", gsf1); - - server1->shutdown (ACE_TRY_ENV); + + server1->shutdown (ACE_TRY_ENV); ACE_TRY_CHECK; */ } diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h index a4f6f615310..74b463910d7 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h @@ -1,20 +1,21 @@ // $Id$ #include "Smart_Proxy_Impl.h" +#include "ace/Service_Object.h" -class ACE_Svc_Export Smart_Test_Factory +class ACE_Svc_Export Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory, public ACE_Service_Object - + { public: Smart_Test_Factory (void); - + virtual Test_ptr create_proxy (Test_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment ()); - // This method will create the smart_proxy. + // This method will create the smart_proxy. }; // The following Factory is used by the <ACE_Service_Config> to diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 86ce08e0086..44d6029e22a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -14,9 +14,10 @@ // // ================================================================ +#include "testC.h" +#include "tao/RT_CORBA.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "testC.h" ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$") |