diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-04 09:28:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-04 09:28:53 +0000 |
| commit | dcdccad0abfc104eb62bc1c6a437bc1d8d97640c (patch) | |
| tree | 00413a9561bac06fe513fbf55ab1991d20347f34 | |
| parent | bf94e22c0c7bc8a72a9bc0c2c099c6c19994509d (diff) | |
| download | ATCD-dcdccad0abfc104eb62bc1c6a437bc1d8d97640c.tar.gz | |
ChangeLogTag: Mon Jul 4 09:23:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
67 files changed, 314 insertions, 103 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 99c20dc4dcb..abceca9f195 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,248 @@ +Mon Jul 4 09:23:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/AMH/Sink_Server/AMH_Servant.h: + * examples/Content_Server/AMI_Iterator/Content_Iterator_i.h: + * examples/Content_Server/AMI_Iterator/Iterator_Handler.h: + * examples/Content_Server/AMI_Observer/Callback_Handler.h: + * examples/Content_Server/AMI_Observer/Callback_i.h: + * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h: + * examples/Content_Server/SMI_Iterator/Content_Iterator_i.h: + * examples/Load_Balancing/Identity_i.h: + * examples/Load_Balancing/Load_Balancer_i.h: + * examples/Load_Balancing_persistent/Identity_i.h: + * examples/Load_Balancing_persistent/Load_Balancer_i.h: + * examples/POA/Forwarding/test_i.h: + * examples/RTCORBA/Activity/Job_i.h: + * examples/RTScheduling/Job_i.h: + * examples/Simple/time-date/Time_Date_i.h: + * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h: + * orbsvcs/ImplRepo_Service/Iterator.h: + * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h: + * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h: + * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h: + * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h: + * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h: + * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h: + * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h: + * orbsvcs/examples/ImR/Advanced/Manager_i.h: + * orbsvcs/examples/ImR/Advanced/Messenger_i.h: + * orbsvcs/examples/ImR/Combined_Service/dynserver.h: + * orbsvcs/examples/LoadBalancing/RPS_Monitor.h: + * orbsvcs/examples/LoadBalancing/StockFactory.h: + * orbsvcs/examples/Log/Notify/Notify_Consumer.h: + * orbsvcs/examples/Log/Notify/Notify_Supplier.h: + * orbsvcs/examples/Notify/Filter/Filter.h: + * orbsvcs/examples/Notify/Lanes/Consumer.h: + * orbsvcs/examples/Notify/Lanes/Supplier.h: + * orbsvcs/examples/Notify/Subscribe/Subscribe.h: + * orbsvcs/examples/Notify/ThreadPool/Consumer.h: + * orbsvcs/examples/Notify/ThreadPool/Supplier.h: + * orbsvcs/examples/ORT/Gateway_i.h: + * orbsvcs/orbsvcs/AV/AVStreams_i.h: + * orbsvcs/orbsvcs/AV/Flows_T.h: + * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h: + * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h: + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h: + * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h: + * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_Random.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h: + * orbsvcs/orbsvcs/Log/BasicLog_i.h: + * orbsvcs/orbsvcs/Log/EventLog_i.h: + * orbsvcs/orbsvcs/Log/Iterator_i.h: + * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h: + * orbsvcs/orbsvcs/Log/NotifyLogNotification.h: + * orbsvcs/orbsvcs/Log/NotifyLog_i.h: + * orbsvcs/orbsvcs/Log/RTEventLog_i.h: + * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h: + * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h: + * orbsvcs/orbsvcs/Notify/ETCL_Filter.h: + * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h: + * orbsvcs/orbsvcs/Property/CosPropertyService_i.h: + * orbsvcs/orbsvcs/Trader/Offer_Iterators.h: + * orbsvcs/orbsvcs/Trader/Trader_T.h: + * orbsvcs/orbsvcs/Trader/Trader_Utils.h: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h: + * orbsvcs/performance-tests/RTEvent/lib/Consumer.h: + * orbsvcs/performance-tests/RTEvent/lib/Control.h: + * orbsvcs/performance-tests/RTEvent/lib/Loopback.h: + * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h: + * orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h: + * orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h: + * orbsvcs/performance-tests/RTEvent/lib/Supplier.h: + * orbsvcs/tests/CosEvent/Basic/Random.h: + * orbsvcs/tests/Event/Basic/Random.h: + * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h: + * orbsvcs/tests/HTIOP/Hello/Hello.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h: + * orbsvcs/tests/Miop/McastHello/McastHello.h: + * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h: + * orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h: + * orbsvcs/tests/Notify/lib/Peer_T.h: + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h: + * orbsvcs/tests/RTCosScheduling/Object1_i.h: + * orbsvcs/tests/Security/Callback/client_i.h: + * orbsvcs/tests/Security/Callback/server_i.h: + * orbsvcs/tests/Security/Secure_Invocation/Foo_i.h: + * performance-tests/Protocols/Protocols.mpc + * tests/AMI_Buffering/AMI_Buffering.h: + * tests/AMI_Buffering/AMI_Buffering_Admin.h: + * tests/AMI_Buffering/Reply_Handler.h: + * tests/Any/Recursive/Hello.h: + * tests/BiDirectional_NestedUpcall/test_i.h: + * tests/Big_Reply/Big_Reply_i.h: + * tests/Big_Request_Muxing/Payload_Receiver.h: + * tests/Big_Twoways/Peer.h: + * tests/Blocking_Sync_None/Blocking_Sync_None.h: + * tests/Bug_1476_Regression/Sender_i.h: + * tests/Bug_1482_Regression/Hello.h: + * tests/Bug_1495_Regression/test_i.h: + * tests/Bug_1551_Regression/Hello.h: + * tests/Bug_1551_Regression/Reply_Handler.h: + * tests/Cache_Growth_Test/Hello.h: + * tests/Client_Leaks/Process.h: + * tests/Client_Leaks/Process_Factory.h: + * tests/Client_Leaks/Startup_Callback.h: + * tests/Collocation_Tests/Hello.h: + * tests/Connect_Strategy_Test/Hello.h: + * tests/Connection_Purging/test_i.h: + * tests/Crash_On_Write/Oneway_Receiver.h: + * tests/Crashed_Callback/Crashed_Callback.h: + * tests/Crashed_Callback/Service.h: + * tests/Faults/ping_i.h: + * tests/Faults/test_i.h: + * tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h: + * tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h: + * tests/Hang_Shutdown/test_i.h: + * tests/Hello/Hello.h: + * tests/ICMG_Any_Bug/Hello.h: + * tests/ICMG_Any_Bug/HelloWorld.h: + * tests/IOR_Endpoint_Hostnames/bogus_i.h: + * tests/LongUpcalls/AMI_Manager.h: + * tests/LongUpcalls/Controller.h: + * tests/LongUpcalls/Manager.h: + * tests/LongUpcalls/Manager_Handler.h: + * tests/MT_BiDir/Receiver_i.h: + * tests/MT_BiDir/Sender_i.h: + * tests/MT_Timeout/Sleep_Service.h: + * tests/Nested_Upcall_Crash/Client_Peer.h: + * tests/Nested_Upcall_Crash/Server_Peer.h: + * tests/OBV/Supports/Supports_Test_impl.h: + * tests/ORB_shutdown/Foo_Bar.h: + * tests/Object_Loader/Test_i.h: + * tests/Oneway_Buffering/Oneway_Buffering.h: + * tests/Oneway_Buffering/Oneway_Buffering_Admin.h: + * tests/Oneways_Invoking_Twoways/Receiver_i.h: + * tests/Oneways_Invoking_Twoways/Sender_i.h: + * tests/POA/Deactivate_Object/Hello.h: + * tests/Portable_Interceptors/AMI/Echo.h: + * tests/Portable_Interceptors/AMI/Echo_Handler.h: + * tests/Portable_Interceptors/Collocated/Dynamic/test_i.h: + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h: + * tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h: + * tests/RTCORBA/Thread_Pool/test_i.h: + * tests/Reliable_Oneways/Oneway_Receiver.h: + * tests/Reliable_Oneways/Shutdown_Helper.h: + * tests/Servant_To_Reference_Test/Test_i.h: + * tests/Server_Connection_Purging/Test_i.h: + * tests/Server_Leaks/Ping_Service.h: + * tests/Server_Port_Zero/Hello.h: + * tests/Stack_Recursion/Sender.h: + * TAO_IDL/be/be_visitor_interface/interface_ih.cpp: + * docs/tutorials/Quoter/Event_Service/Stock_i.h: + * docs/tutorials/Quoter/RT_Event_Service/Stock_i.h: + * docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h: + * examples/POA/Adapter_Activator/server.cpp: + * examples/POA/Reference_Counted_Servant/server.cpp: + * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp: + * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp: + * orbsvcs/examples/ImR/Combined_Service/combined.cpp: + * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp: + * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp: + * orbsvcs/tests/Event/Mcast/Simple/consumer.cpp: + * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp: + * orbsvcs/tests/ImplRepo/scale/server_i.cpp: + * orbsvcs/tests/Redundant_Naming/client.cpp: + * orbsvcs/tests/Security/ssliop_corbaloc/client.cpp: + * orbsvcs/tests/Simple_Naming/client.cpp: + * performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h: + * performance-tests/Latency/AMI/Roundtrip.h: + * performance-tests/Latency/AMI/Roundtrip_Handler.h: + * performance-tests/Latency/Collocation/Roundtrip.h: + * performance-tests/Latency/DII/Roundtrip.h: + * performance-tests/Latency/DSI/Roundtrip.h: + * performance-tests/Latency/Deferred/Roundtrip.h: + * performance-tests/Latency/Single_Threaded/Roundtrip.h: + * performance-tests/Latency/Thread_Per_Connection/Roundtrip.h: + * performance-tests/Latency/Thread_Pool/Roundtrip.h: + * performance-tests/Memory/IORsize/Foo_i.h: + * performance-tests/Memory/IORsize/Memory_Growth.h: + * performance-tests/Memory/Single_Threaded/Memory_Growth.h: + * performance-tests/POA/Implicit_Activation/Factory.h: + * performance-tests/POA/Implicit_Activation/Simple.h: + * performance-tests/Protocols/Protocols.mpc + * performance-tests/Protocols/distributor.cpp: + * performance-tests/Protocols/receiver.cpp: + * performance-tests/RTCorba/Thread_Pool/server.cpp: + * performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h: + * performance-tests/Sequence_Latency/AMI/Roundtrip.h: + * performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h: + * performance-tests/Sequence_Latency/DII/Roundtrip.h: + * performance-tests/Sequence_Latency/DSI/Roundtrip.h: + * performance-tests/Sequence_Latency/Deferred/Roundtrip.h: + * performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h: + * performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h: + * performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h: + * performance-tests/Throughput/Receiver.h: + * performance-tests/Throughput/Receiver_Factory.h: + * tao/ImR_Client/ServerObject_i.h: + * tests/AMH_Exceptions/server.cpp: + * tests/AMH_Oneway/server.cpp: + * tests/Bug_1568_Regression/server.cpp: + * tests/Bug_1670_Regression/server.cpp: + * tests/Collocation_Opportunities/Collocation_Opportunities.cpp: + * tests/Faults/test_i.h: + * tests/Objref_Sequence_Test/server.cpp: + * tests/POA/Etherealization/Etherealization.cpp: + * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp: + * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp: + * tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp: + * tests/POA/Persistent_ID/server.cpp: + * tests/RTCORBA/Collocation/Collocation.cpp: + * tests/RTCORBA/Linear_Priority/server.cpp: + * tests/RTCORBA/Persistent_IOR/server.cpp: + * tests/RTCORBA/Policy_Combinations/server.cpp: + * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp: + * tests/UNKNOWN_Exception/server.cpp: + All servants are reference counted by default, no need anymore to + derive the servant from RefCountServantBase. Also removed the msvc + pragma push/pop when it was not needed anymore + + * tao/Object.{h,cpp}: + Corrected implementation _get_orb() + + * tao/SystemException.cpp: + Initailize pointers with 0 + Mon Jul 4 07:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Big_Twoways/Coordinator.h: diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 7bb033fb1df..82a30b05474 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -16,8 +16,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface_ih, +ACE_RCSID (be_visitor_interface, + interface_ih, "$Id$") // ************************************************************ @@ -45,8 +45,8 @@ be_visitor_interface_ih::visit_interface (be_interface *node) static char namebuf [NAMEBUFSIZE]; - ACE_OS::memset (namebuf, - '\0', + ACE_OS::memset (namebuf, + '\0', NAMEBUFSIZE); // Generate the skeleton class name. @@ -67,7 +67,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node) // Inherit from the base skeleton name, unless the interface // is local. *os <<"public virtual "; - + if (node->is_local ()) { *os << node->full_name (); @@ -78,15 +78,11 @@ be_visitor_interface_ih::visit_interface (be_interface *node) } *os << ", public virtual "; - + if (node->is_local ()) { *os << "TAO_Local_RefCounted_Object"; } - else - { - *os << "PortableServer::RefCountServantBase"; - } *os << be_nl << "{" << be_nl @@ -131,9 +127,9 @@ be_visitor_interface_ih::visit_interface (be_interface *node) // Generate the code for the members of the derived classes. - int status = + int status = node->traverse_inheritance_graph ( - be_visitor_interface_ih::method_helper, + be_visitor_interface_ih::method_helper, os ); @@ -173,7 +169,7 @@ be_visitor_interface_ih::method_helper (be_interface *derived, { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_interface_is::" - "method_helper\n"), + "method_helper\n"), -1); } } diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h index d6e82748c82..b4c619e1a6a 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h @@ -10,8 +10,7 @@ #include <orbsvcs/CosEventChannelAdminC.h> class Quoter_Stock_i - : public virtual POA_Quoter::Modify_Stock, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Quoter::Modify_Stock { public: Quoter_Stock_i (const char *symbol, diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h index 7ec530709eb..91b781df2ee 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h @@ -10,8 +10,7 @@ #include <orbsvcs/RtecEventChannelAdminC.h> class Quoter_Stock_i - : public virtual POA_Quoter::Modify_Stock, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Quoter::Modify_Stock { public: Quoter_Stock_i (const char *symbol, diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h index 31aabd92ce3..55e0530d057 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h @@ -14,8 +14,7 @@ #endif /* _MSC_VER */ class Quoter_Stock_i - : public virtual POA_Quoter::Stock, - public virtual PortableServer::RefCountServantBase + : public virtual POA_Quoter::Stock { public: Quoter_Stock_i (const char *symbol, diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index b58c313ebe5..550f5082ff8 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -36,8 +36,8 @@ ACE_RCSID(Adapter_Activator, server, "$Id$") # pragma warning (disable : 4250) #endif /* _MSC_VER */ -class reference_counted_test_i : public virtual PortableServer::RefCountServantBase, - public virtual test_i +class reference_counted_test_i : + public virtual test_i { public: reference_counted_test_i (CORBA::ORB_ptr orb, diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp index 1c8c318099f..5c3bcb3b2b0 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp +++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp @@ -32,8 +32,8 @@ ACE_RCSID(Reference_Counted_Servant, server, "$Id$") # pragma warning (disable : 4250) #endif /* _MSC_VER */ -class reference_counted_test_i : public virtual PortableServer::RefCountServantBase, - public virtual test_i +class reference_counted_test_i : + public virtual test_i { public: reference_counted_test_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index 73311b2af45..a8a3ae630dc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -14,8 +14,7 @@ #endif /* _MSC_VER */ class TAO_CosEC_PushSupplierWrapper : - public virtual POA_RtecEventComm::PushSupplier, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecEventComm::PushSupplier { // = TITLE // A Wrapper for the Rtec PushSupplier. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 52c99def13d..88d88a3d640 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -13,8 +13,7 @@ #endif /* _MSC_VER */ class TAO_CosEC_PushConsumerWrapper : - public POA_RtecEventComm::PushConsumer, - public virtual PortableServer::RefCountServantBase + public POA_RtecEventComm::PushConsumer { // = TITLE // Wrapper class for the Rtec PushConsumer. diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index e4b38ef7e45..5864e974d00 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -15,7 +15,6 @@ using namespace PortableServer; class SvcConf : public POA_ServiceConfigurator - , public PortableServer::RefCountServantBase { ACE_Service_Config& asc_; public: diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 60c8dc9f288..6fa58c9c6db 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -6,8 +6,8 @@ -class Time_impl : public POA_TimeModule::Time, - virtual public PortableServer::RefCountServantBase +class Time_impl : + public POA_TimeModule::Time { public: virtual TimeModule::TimeOfDay diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index d04907a35f1..6d81936beb4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -7,8 +7,7 @@ #include "orbsvcs/RtecEventCommS.h" class EC_Consumer: - public POA_RtecEventComm::PushConsumer, - public PortableServer::RefCountServantBase + public POA_RtecEventComm::PushConsumer { public: diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 5e8d479e004..7b95c67318f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -7,8 +7,7 @@ #include "orbsvcs/RtecEventCommS.h" class EC_Consumer: - public POA_RtecEventComm::PushConsumer, - public PortableServer::RefCountServantBase + public POA_RtecEventComm::PushConsumer { public: diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index fabc0999002..ce7c85cdd95 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -37,7 +37,6 @@ int destroy_ec_flag = 0; * heartbeats and shuts down. */ class Heartbeat_Application : - public virtual PortableServer::RefCountServantBase, public POA_RtecEventComm::PushConsumer, public TAO_EC_Deactivated_Object { diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index b8028055ac3..8b6792d7aac 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -13,7 +13,6 @@ class test_i : public virtual POA_test - , PortableServer::RefCountServantBase { int n_; CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 154ac5b6a8a..589911752f2 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -32,7 +32,6 @@ ACE_RCSID (Simple_Naming, #endif /* _MSC_VER */ class My_Test_Object : - public virtual PortableServer::RefCountServantBase, public virtual POA_Test_Object { public: diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index 1279dee82b7..904a68a489b 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -29,7 +29,6 @@ ACE_RCSID(Simple_Naming, client, "$Id$") #endif /* _MSC_VER */ class My_Test_Object : - public virtual PortableServer::RefCountServantBase, public virtual POA_Test_Object { public: diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 1279dee82b7..904a68a489b 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -29,7 +29,6 @@ ACE_RCSID(Simple_Naming, client, "$Id$") #endif /* _MSC_VER */ class My_Test_Object : - public virtual PortableServer::RefCountServantBase, public virtual POA_Test_Object { public: diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h index 1765310d753..fbabce99373 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::AMH_Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/AMI/Roundtrip.h +++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h index 4557c6d7c1e..4c944306dbb 100644 --- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h +++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h @@ -17,7 +17,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip_Handler : public virtual POA_Test::AMI_RoundtripHandler - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h +++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/DII/Roundtrip.h +++ b/TAO/performance-tests/Latency/DII/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.h b/TAO/performance-tests/Latency/DSI/Roundtrip.h index ca1ff2b246a..d98fa730f1f 100644 --- a/TAO/performance-tests/Latency/DSI/Roundtrip.h +++ b/TAO/performance-tests/Latency/DSI/Roundtrip.h @@ -18,7 +18,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual PortableServer::DynamicImplementation - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h +++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h index cfe87b3952b..4beb6b62d87 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h +++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Memory/IORsize/Foo_i.h b/TAO/performance-tests/Memory/IORsize/Foo_i.h index 616f407510b..7640b9d7579 100644 --- a/TAO/performance-tests/Memory/IORsize/Foo_i.h +++ b/TAO/performance-tests/Memory/IORsize/Foo_i.h @@ -15,7 +15,6 @@ /// Implement the Test::Hello interface class Foo_i : public virtual POA_Test::Foo - , public virtual PortableServer::RefCountServantBase { public: Foo_i (CORBA::ORB_ptr p) diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h index b8003af4a81..f1f2b5646af 100644 --- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h +++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h @@ -16,7 +16,6 @@ /// Implement the Test::Hello interface class Memory_Growth : public virtual POA_Test::Memory_Growth - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h index 496c92187fa..9f4ae96b84d 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h +++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h @@ -16,7 +16,6 @@ /// Implement the Test::Hello interface class Memory_Growth : public virtual POA_Test::Memory_Growth - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h index 7a451ab1e81..d7bc357d313 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h +++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h @@ -16,7 +16,6 @@ /// Implement the Test::Factory interface class Factory : public virtual POA_Test::Factory - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h index e2f46f7e296..7257648e605 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h +++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h @@ -16,7 +16,6 @@ /// Implement the Test::Simple interface class Simple : public virtual POA_Test::Simple - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index 359eb98b910..07f49bbd3e0 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -14,8 +14,7 @@ ACE_RCSID(Thread_Pools, server, "$Id$") class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: test_i (CORBA::ORB_ptr orb, diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h index 1d887ee1c76..967b876ff5d 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::AMH_Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h index ec31afb8fae..a2c066ceda6 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h index 7e90cd19900..0589a8007ac 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h +++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h @@ -17,7 +17,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip_Handler : public virtual POA_Test::AMI_RoundtripHandler - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h index ec31afb8fae..a2c066ceda6 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h index ca1ff2b246a..d98fa730f1f 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h @@ -18,7 +18,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual PortableServer::DynamicImplementation - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h index ec31afb8fae..a2c066ceda6 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h index ec31afb8fae..a2c066ceda6 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h index 367598608e2..5b1758055af 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h index 367598608e2..5b1758055af 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h @@ -16,7 +16,6 @@ /// Implement the Test::Roundtrip interface class Roundtrip : public virtual POA_Test::Roundtrip - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h index 1cf10f07b25..ee6ba542224 100644 --- a/TAO/performance-tests/Throughput/Receiver.h +++ b/TAO/performance-tests/Throughput/Receiver.h @@ -17,7 +17,6 @@ /// Implement the Test::Receiver interface class Receiver : public virtual POA_Test::Receiver - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h index 770a6d37bd7..b7f7ad8a1ef 100644 --- a/TAO/performance-tests/Throughput/Receiver_Factory.h +++ b/TAO/performance-tests/Throughput/Receiver_Factory.h @@ -16,7 +16,6 @@ /// Implement the Test::Receiver_Factory interface class Receiver_Factory : public virtual POA_Test::Receiver_Factory - , public virtual PortableServer::RefCountServantBase { public: /// Constructor diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h index e1266d1e8db..9ec22271d12 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.h +++ b/TAO/tao/ImR_Client/ServerObject_i.h @@ -32,8 +32,7 @@ * **/ class TAO_IMR_Client_Export ServerObject_i - : public POA_ImplementationRepository::ServerObject, - public PortableServer::RefCountServantBase + : public POA_ImplementationRepository::ServerObject { public: /// Constructor. diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index b2919984963..a7f3f3badbc 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -629,9 +629,20 @@ CORBA::Object::_validate_connection ( CORBA::ORB_ptr -CORBA::Object::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Object::_get_orb (ACE_ENV_SINGLE_ARG_DECL) { - return CORBA::ORB::_duplicate (this->protocol_proxy_->orb_core ()->orb ()); + if (orb_core_ != 0) + { + return CORBA::ORB::_duplicate (orb_core_->orb ()); + } + else + { + TAO_OBJECT_IOR_EVALUATE_RETURN; + if (this->protocol_proxy_) + return CORBA::ORB::_duplicate (this->protocol_proxy_->orb_core ()->orb ()); + else + ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::ORB::_nil()); + } } /***************************************************************** diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 0620fdff8cb..051065a4931 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -379,6 +379,18 @@ namespace CORBA IOP::IOR_var ior_; /// Cached pointer of our ORB_Core + /** + * Be aware that this pointer can be zero or not. In fact there are two + * ways to get this pointer filled: + * - If CORBA::Object is constructed through one of the constructors with a + * stub and null ORB_Core, we use the orb_core from the stub to fill + * this pointer + * - If the other constructor, which uses IOP::IOR is used, a stub + * needs to be created first (i.e., the IOR needs to be evaluated first), + * in which case the ORB_Core would be null. The orb_core pointer then + * needs to be accessed from the stub and passed back as part of + * _get_orb(). + */ TAO_ORB_Core *orb_core_; /** diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 5b8d085fef6..1dd155c7e51 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -902,7 +902,7 @@ STANDARD_EXCEPTION_LIST CORBA::Exception * \ CORBA::name ::_tao_duplicate (void) const \ { \ - CORBA::Exception * result; \ + CORBA::Exception * result = 0; \ ACE_NEW_RETURN (result, CORBA::name (*this), 0); \ return result; \ } @@ -914,7 +914,7 @@ STANDARD_EXCEPTION_LIST CORBA::SystemException * \ CORBA::name ::_tao_create (void) \ { \ - CORBA::name *result; \ + CORBA::name *result = 0; \ ACE_NEW_RETURN (result, CORBA::name (), 0); \ return result; \ } diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index f3721e68cb0..05d82934074 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -9,7 +9,6 @@ class ST_AMH_Servant : public virtual POA_Test::AMH_Roundtrip - , public virtual PortableServer::RefCountServantBase { public: ST_AMH_Servant (CORBA::ORB_ptr orb); diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 98b960f76f7..7d75444d7fb 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -36,7 +36,6 @@ parse_args (int argc, char *argv[]) class ST_AMH_Servant : public virtual POA_Test::AMH_Roundtrip - , public virtual PortableServer::RefCountServantBase { public: ST_AMH_Servant (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index 1926fe0a556..fce73b267a5 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -23,7 +23,6 @@ ACE_RCSID(Bug_1568_Regression, server, "$Id$") */ class Simple_C : public virtual POA_Baz::AMH_C - , public virtual PortableServer::RefCountServantBase { public: Simple_C (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index 20032cea31b..ca6e5d7aebb 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -23,7 +23,6 @@ ACE_RCSID(Bug_1670_Regression, server, "$Id$") */ class Simple_C : public virtual POA_Baz::AMH_C - , public virtual PortableServer::RefCountServantBase { public: Simple_C (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 2e4059c9d73..2ae48bba371 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -11,7 +11,6 @@ ACE_RCSID(Collocation_Opportunities, Collocation_Opportunities, "$Id$") class test_i : public POA_test, - public PortableServer::RefCountServantBase { public: diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index a1eddc9e280..154b36ae553 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -73,8 +73,7 @@ private: // The ORB }; -class Middle_i : public virtual POA_Simple_Server, - public virtual PortableServer::RefCountServantBase +class Middle_i : public virtual POA_Simple_Server { // = TITLE // Another implementation of the simple server... diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 77116586026..3890ff162fb 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -5,7 +5,7 @@ /// Implement the Server Interface class ServerServant : - public POA_Server, public PortableServer::RefCountServantBase + public POA_Server { public: /// Ctor diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 83cc5e042d1..0c58814b6ab 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -35,8 +35,8 @@ public: } }; -class test_i_with_reference_counting : public virtual PortableServer::RefCountServantBase, - public virtual POA_test +class test_i_with_reference_counting : + public virtual POA_test { public: void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 8b610369a02..17ad5ce90b5 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -22,8 +22,8 @@ #include "ace/Auto_Event.h" #include "tao/PortableServer/ServantLocatorC.h" -class test_i : public virtual PortableServer::RefCountServantBase, - public virtual POA_test +class test_i : + public virtual POA_test { public: diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 7fc8aa22d9c..70b54317789 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -22,8 +22,8 @@ #include "ace/Auto_Event.h" #include "tao/PortableServer/ServantActivatorC.h" -class test_i : public virtual PortableServer::RefCountServantBase, - public virtual POA_test +class test_i : + public virtual POA_test { public: diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index 03b885a0f04..11aa293619d 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -27,8 +27,8 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ -class test_i : public virtual PortableServer::RefCountServantBase, - public virtual POA_test +class test_i : + public virtual POA_test { public: test_i (test_i *other); diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 8a28b12dd3f..b7fdd45d0e4 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -24,8 +24,8 @@ ACE_RCSID(Explicit_Activation, server, "$Id$") -class test_i : public virtual PortableServer::RefCountServantBase, - public virtual POA_test +class test_i : + public virtual POA_test { public: test_i (CORBA::ORB_ptr orb_ptr, diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index 4c603dfdb2e..c2844874ab1 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -29,8 +29,7 @@ setup_test_parameters (Test_Object_And_Servant *test, CORBA::ORB_ptr orb ACE_ENV_ARG_DECL); class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: test_i (CORBA::ORB_ptr orb, diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index bc27b1b2bfb..9129c0f3ee9 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -9,8 +9,7 @@ #include "../common_args.cpp" class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: test_i (CORBA::ORB_ptr orb, diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index a56182609fd..8cf8cfb2c7c 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -7,8 +7,7 @@ #include "ace/OS_NS_string.h" class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: test_i (CORBA::ORB_ptr orb, diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 35745ae921f..db378d994bd 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -8,8 +8,7 @@ #include "../check_supported_priorities.cpp" class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: test_i (CORBA::ORB_ptr orb, diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 9add1db76e0..234e6d3ef58 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -24,8 +24,7 @@ static const char *bands_file = "empty_file"; static const char *lanes_file = "empty_file"; class test_i : - public POA_test, - public PortableServer::RefCountServantBase + public POA_test { public: test_i (CORBA::ORB_ptr orb, diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 4041daf44d0..2beb08f85fa 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -110,8 +110,7 @@ test_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL) } class test_factory_i : - public POA_test_factory, - public PortableServer::RefCountServantBase + public POA_test_factory { public: |