diff options
35 files changed, 126 insertions, 78 deletions
diff --git a/CIAO/CIAO_TAO.mwc b/CIAO/CIAO_TAO.mwc index 76b40c9019e..3066f62040f 100644 --- a/CIAO/CIAO_TAO.mwc +++ b/CIAO/CIAO_TAO.mwc @@ -8,6 +8,8 @@ workspace { $(ACE_ROOT)/ACEXML/parser/parser $(ACE_ROOT)/ACEXML/apps/svcconf $(ACE_ROOT)/contrib + $(ACE_ROOT)/ETCL + $(ACE_ROOT)/Monitoring $(TAO_ROOT)/tao $(TAO_ROOT)/TAO_IDL $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent.mpc diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc index f8cd4d7ea71..7efd7386c75 100644 --- a/CIAO/CIAO_TAO_DAnCE.mwc +++ b/CIAO/CIAO_TAO_DAnCE.mwc @@ -9,6 +9,8 @@ workspace { $(ACE_ROOT)/ACEXML/parser/parser $(ACE_ROOT)/ACEXML/apps/svcconf $(ACE_ROOT)/contrib + $(ACE_ROOT)/ETCL + $(ACE_ROOT)/Monitoring $(TAO_ROOT)/TAO_IDL $(TAO_ROOT)/tao/tao.mpc $(TAO_ROOT)/tao/PortableServer.mpc @@ -42,7 +44,7 @@ workspace { ciaosvcs DAnCE tools/Config_Handlers - + exclude { DAnCE/tests } diff --git a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp index 1f3f27ede57..978225c4aa4 100644 --- a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp +++ b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp @@ -44,7 +44,7 @@ namespace << i.name () << "_exec_i" << endl << " : public virtual " << i.scoped_name ().scope_name () << "::CCM_" << i.name () << "," << endl - << " public virtual TAO_Local_RefCounted_Object" << endl + << " public virtual ::CORBA::LocalObject" << endl << "{" << "public:" << endl << i.name () << "_exec_i (void);" diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 60655dbd19a..d4494990e7c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,47 @@ +Mon Apr 28 14:27:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Context_Impl_T.h + * ciao/Dynamic_Component_Activator.h + * ciao/Servant_Activator.h + * CIDLC/ExecImplHeaderGenerator.cpp + * DAnCE/TargetManager/TargetManager_exec.h + * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h + * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h + * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h + * examples/BasicSP/BasicSP_exec.h + * examples/BasicSP/BMClosedED/BMClosedED_exec.h + * examples/BasicSP/BMDevice/BMDevice_exec.h + * examples/BasicSP/BMDisplay/BMDisplay_exec.h + * examples/BasicSP/EC/EC_exec.h + * examples/Display/GPS/GPS_exec.h + * examples/Display/GPS/GPS_tracing_exec.h + * examples/Display/NavDisplay/NavDisplay_exec.h + * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h + * examples/Display/RateGen/RateGen_exec.h + * examples/Hello/Receiver/Receiver_exec.h + * examples/Hello/Sender/Sender_exec.h + * examples/Null_Component/Null_Component_exec.h + * examples/Swapping/Receiver/Receiver_exec.h + * examples/Swapping/Sender/Sender_exec.h + * examples/Swapping/Sender/Sender_exec_1.h + * examples/Swapping/Sender/Sender_exec_2.h + * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h + * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h + * performance-tests/Protocols/Receiver/Receiver_exec.h + * performance-tests/Protocols/Sender/Sender_exec.h + * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h + * tests/Minimum/Receiver/Receiver_exec.h + * tests/Minimum/Sender/Sender_exec.h + Don't use TAO_Local_RefCounted_Object but ::CORBA::LocalObject now + LocalObject is also refcounted. Users can still sue TAO_Local_RefCounted_Object, + it just does nothing, actions have been takin in LocalObject.h + to prevent the usage of TAO_Local_RefCounted_Object in the + TAO distribution itself + + * CIAO_TAO.mwc + * CIAO_TAO_DAnCE.mwc + Added ETCL and monitoring + Wed Apr 23 01:53:32 CDT 2008 Johnny Willemsen <jwillemsen@remedy.nl> * CIAO version 0.6.4 released. @@ -6,9 +50,9 @@ Thu Mar 27 18:51:13 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * CIAO_TAO.mwc: * CIAO_TAO_DAnCE.mwc: - + Added minizip in ACE/contrib for RM. - + Thu Mar 27 14:12:41 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * MPC/config/ciaocidldefaults.mpb: diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h index 0e1b32ea68b..d5be7825132 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h +++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h @@ -33,7 +33,7 @@ namespace CIDL_TargetManager_i class TARGETMANAGER_EXEC_Export TargetManagerImpl_exec_i : public virtual TargetManagerImpl_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: TargetManagerImpl_exec_i (void); @@ -73,7 +73,7 @@ namespace CIDL_TargetManager_i }; class TARGETMANAGER_EXEC_Export TargetManager_exec_i : public virtual ::Deployment::CCM_TargetManager, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: TargetManager_exec_i (TargetManagerImpl_exec_i* exec, @@ -121,7 +121,7 @@ namespace CIDL_TargetManager_i class TARGETMANAGER_EXEC_Export TargetManagerHome_exec_i : public virtual TargetManagerHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: TargetManagerHome_exec_i (void); diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h index 7e9916e14cc..d3ac7acd995 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h +++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h @@ -30,7 +30,7 @@ namespace CIDL_RoundTrip_Impl class NODEAPPTEST_ROUNDTRIP_EXEC_Export RoundTrip_exec_i : public virtual NodeAppTest::LatencyTest, public virtual RoundTrip_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -83,7 +83,7 @@ namespace CIDL_RoundTrip_Impl // // class LatencyTest_Impl : public virtual NodeAppTest::CCM_LatencyTest, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: LatencyTest_Impl () @@ -100,7 +100,7 @@ namespace CIDL_RoundTrip_Impl */ class NODEAPPTEST_ROUNDTRIP_EXEC_Export RoundTripHome_exec_i : public virtual RoundTripHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/ciao/Context_Impl_T.h b/CIAO/ciao/Context_Impl_T.h index d4e0deb4cba..0382e644398 100644 --- a/CIAO/ciao/Context_Impl_T.h +++ b/CIAO/ciao/Context_Impl_T.h @@ -69,7 +69,7 @@ namespace CIAO typename COMP> class Context_Impl : public virtual BASE_CTX, public virtual Context_Impl_Base, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Context_Impl (Components::CCMHome_ptr the_home, diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h index 577be605910..06757a30a18 100644 --- a/CIAO/ciao/Dynamic_Component_Activator.h +++ b/CIAO/ciao/Dynamic_Component_Activator.h @@ -48,7 +48,7 @@ namespace CIAO */ class CIAO_SERVER_Export Dynamic_Component_Activator : public virtual PortableServer::ServantActivator, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Dynamic_Component_Activator (CORBA::ORB_ptr o); diff --git a/CIAO/ciao/Servant_Activator.h b/CIAO/ciao/Servant_Activator.h index 2da55de5d78..c5211ee1022 100644 --- a/CIAO/ciao/Servant_Activator.h +++ b/CIAO/ciao/Servant_Activator.h @@ -50,7 +50,7 @@ namespace CIAO */ class CIAO_SERVER_Export Servant_Activator : public virtual PortableServer::ServantActivator, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Servant_Activator (CORBA::ORB_ptr o); diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h index f6e7bae6c1d..b89e30ec48a 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h +++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h @@ -47,7 +47,7 @@ namespace CIDL_StockBroker_Impl */ class STOCKBROKER_EXEC_Export StockBroker_exec_i : public virtual StockBroker_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: StockBroker_exec_i (void); @@ -65,7 +65,7 @@ namespace CIDL_StockBroker_Impl // Attribute operations. // Port operations. - + virtual void push_notify_in (::Stock::StockName *ev); @@ -99,7 +99,7 @@ namespace CIDL_StockBroker_Impl */ class STOCKBROKER_EXEC_Export StockBrokerHome_exec_i : public virtual StockBrokerHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: StockBrokerHome_exec_i (void); @@ -114,7 +114,7 @@ namespace CIDL_StockBroker_Impl // Attribute operations. // Implicit operations. - + virtual ::Components::EnterpriseComponent_ptr create (); }; diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h index c4f039cc10a..08b14272f70 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h +++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h @@ -48,7 +48,7 @@ namespace CIDL_StockDistributor_Impl */ class STOCKDISTRIBUTOR_EXEC_Export StockQuoter_exec_i : public virtual ::Stock::CCM_StockQuoter, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: StockQuoter_exec_i (StockDistributor_exec_i &distributor) @@ -129,7 +129,7 @@ namespace CIDL_StockDistributor_Impl */ class STOCKDISTRIBUTOR_EXEC_Export StockDistributor_exec_i : public virtual StockDistributor_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: StockDistributor_exec_i (void); @@ -179,7 +179,7 @@ namespace CIDL_StockDistributor_Impl private: ::Stock::CCM_StockDistributor_Context_var context_; - + /// User defined members public: @@ -212,12 +212,12 @@ namespace CIDL_StockDistributor_Impl */ class STOCKDISTRIBUTOR_EXEC_Export StockDistributorHome_exec_i : public virtual StockDistributorHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: StockDistributorHome_exec_i (void); virtual ~StockDistributorHome_exec_i (void); - + // Supported or inherited operations. // Home operations. @@ -226,7 +226,7 @@ namespace CIDL_StockDistributor_Impl // Attribute operations. - // Implicit operations. + // Implicit operations. virtual ::Components::EnterpriseComponent_ptr create (); diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h index 7989000a6b6..508b5d99d06 100644 --- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h +++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h @@ -31,7 +31,7 @@ namespace MyImpl public virtual CIDL_BMClosedED_Impl::BMClosedED_Exec, // CIAO container implementation depends on correct reference // counting of local interfaces, so we take a short cut to - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -84,7 +84,7 @@ namespace MyImpl */ class BMCLOSEDED_EXEC_Export BMClosedEDHome_exec_i : public virtual CIDL_BMClosedED_Impl::BMClosedEDHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h index b0f22af8d88..5a8b7a09004 100644 --- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h +++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h @@ -29,7 +29,7 @@ namespace MyImpl */ class BMDEVICE_EXEC_Export BMDevice_exec_i : public virtual CIDL_BMDevice_Impl::BMDevice_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -81,7 +81,7 @@ namespace MyImpl */ class BMDEVICE_EXEC_Export BMDeviceHome_exec_i : public virtual CIDL_BMDevice_Impl::BMDeviceHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h index 63840425cdf..8783b52ff4d 100644 --- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h +++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h @@ -26,7 +26,7 @@ namespace MyImpl */ class BMDISPLAY_EXEC_Export BMDisplay_exec_i : public virtual CIDL_BMDisplay_Impl::BMDisplay_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -71,7 +71,7 @@ namespace MyImpl */ class BMDISPLAY_EXEC_Export BMDisplayHome_exec_impl : public virtual CIDL_BMDisplay_Impl::BMDisplayHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/BasicSP/BasicSP_exec.h b/CIAO/examples/BasicSP/BasicSP_exec.h index 9eee9cc87a8..a81ee47e8b1 100644 --- a/CIAO/examples/BasicSP/BasicSP_exec.h +++ b/CIAO/examples/BasicSP/BasicSP_exec.h @@ -41,7 +41,7 @@ namespace MyImpl */ class BASICSP_EXEC_Export ReadData_Impl : public virtual ::BasicSP::CCM_ReadData, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Constructor diff --git a/CIAO/examples/BasicSP/EC/EC_exec.h b/CIAO/examples/BasicSP/EC/EC_exec.h index 6c1bf95fad7..4b91f72a2d3 100644 --- a/CIAO/examples/BasicSP/EC/EC_exec.h +++ b/CIAO/examples/BasicSP/EC/EC_exec.h @@ -77,7 +77,7 @@ namespace MyImpl */ class EC_EXEC_Export EC_exec_i : public virtual CIDL_EC_Impl::EC_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -140,7 +140,7 @@ namespace MyImpl */ class EC_EXEC_Export ECHome_exec_i : public virtual CIDL_EC_Impl::ECHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Display/GPS/GPS_exec.h b/CIAO/examples/Display/GPS/GPS_exec.h index b6bd23a283b..4af001a983d 100644 --- a/CIAO/examples/Display/GPS/GPS_exec.h +++ b/CIAO/examples/Display/GPS/GPS_exec.h @@ -25,7 +25,7 @@ namespace MyImpl */ class GPS_EXEC_Export GPS_exec_i : public virtual CIDL_GPS_Impl::GPS_exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -74,7 +74,7 @@ namespace MyImpl */ class GPS_EXEC_Export GPSHome_exec_i : public virtual HUDisplay::CCM_GPSHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. @@ -89,7 +89,7 @@ namespace MyImpl class Position_Impl : public virtual HUDisplay::CCM_position, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Position_Impl (GPS_exec_i& component) diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.h b/CIAO/examples/Display/GPS/GPS_tracing_exec.h index 6b03e2d1288..4e39719ff6e 100644 --- a/CIAO/examples/Display/GPS/GPS_tracing_exec.h +++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.h @@ -24,7 +24,7 @@ namespace MyImpl */ class GPS_EXEC_Export GPS_tracing_exec_i : public virtual HUDisplay::GPS_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -88,7 +88,7 @@ namespace MyImpl */ class GPS_EXEC_Export GPSHome_tracing_exec_i : public virtual HUDisplay::CCM_GPSHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h index d9aaa0165e4..a23e570dcc0 100644 --- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h +++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h @@ -25,7 +25,7 @@ namespace MyImpl */ class NAVDISPLAY_EXEC_Export NavDisplay_exec_impl : public virtual CIDL_NavDisplay_Impl::NavDisplay_exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -69,7 +69,7 @@ namespace MyImpl */ class NAVDISPLAY_EXEC_Export NavDisplayHome_exec_impl : public virtual HUDisplay::CCM_NavDisplayHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h index cbf2a3d3918..587bd699b94 100644 --- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h +++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h @@ -29,7 +29,7 @@ namespace MyImpl */ class NAVDISPLAY_EXEC_Export NavDisplayGUI_exec_impl : public virtual CIDL_NavDisplay_Impl::NavDisplay_exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -78,7 +78,7 @@ namespace MyImpl */ class NAVDISPLAY_EXEC_Export NavDisplayGUIHome_exec_impl : public virtual HUDisplay::CCM_NavDisplayHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.h b/CIAO/examples/Display/RateGen/RateGen_exec.h index 9e92a0c5095..0599f81b83a 100644 --- a/CIAO/examples/Display/RateGen/RateGen_exec.h +++ b/CIAO/examples/Display/RateGen/RateGen_exec.h @@ -75,7 +75,7 @@ namespace MyImpl */ class RATEGEN_EXEC_Export RateGen_exec_i : public virtual CIDL_RateGen_Impl::RateGen_exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default constructor. @@ -137,7 +137,7 @@ namespace MyImpl */ class RATEGEN_EXEC_Export RateGenHome_exec_i : public virtual HUDisplay::CCM_RateGenHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h index c54c5675c2a..2e1d473a34a 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.h +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h @@ -41,7 +41,7 @@ namespace CIDL_Receiver_Impl */ class RECEIVER_EXEC_Export Receiver_exec_i : public virtual Receiver_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -84,7 +84,7 @@ namespace CIDL_Receiver_Impl */ class RECEIVER_EXEC_Export ReceiverHome_exec_i : public virtual ReceiverHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: ReceiverHome_exec_i (void); diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h index e31b00e3dd5..1a3d186dfc5 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.h +++ b/CIAO/examples/Hello/Sender/Sender_exec.h @@ -41,7 +41,7 @@ namespace CIDL_Sender_Impl */ class SENDER_EXEC_Export Sender_exec_i : public virtual Sender_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -124,7 +124,7 @@ namespace CIDL_Sender_Impl // // class Message_Impl : public virtual Hello::CCM_ReadMessage, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Message_Impl (Sender_exec_i& component) @@ -146,7 +146,7 @@ namespace CIDL_Sender_Impl */ class SENDER_EXEC_Export SenderHome_exec_i : public virtual SenderHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: SenderHome_exec_i (void); diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h index 277a215bcfa..6a74d2e073d 100644 --- a/CIAO/examples/Null_Component/Null_Component_exec.h +++ b/CIAO/examples/Null_Component/Null_Component_exec.h @@ -36,7 +36,7 @@ namespace CIDL_Null_Component_Impl { class NULL_COMPONENT_EXEC_Export Null_Interface_exec_i : public virtual ::CCM_Null_Interface, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Null_Interface_exec_i (void); @@ -50,7 +50,7 @@ namespace CIDL_Null_Component_Impl class NULL_COMPONENT_EXEC_Export Null_Component_exec_i : public virtual Null_Component_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Null_Component_exec_i (void); @@ -87,7 +87,7 @@ namespace CIDL_Null_Component_Impl class NULL_COMPONENT_EXEC_Export Null_ComponentHome_exec_i : public virtual Null_ComponentHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Null_ComponentHome_exec_i (void); diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h index 0a605e7ec26..7ca299a6bb7 100644 --- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h +++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h @@ -26,7 +26,7 @@ namespace CIDL_Receiver_Impl class RECEIVER_EXEC_Export ReceiverSwap_exec_i : public virtual CIAO::Swap_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: ReceiverSwap_exec_i (); @@ -42,7 +42,7 @@ namespace CIDL_Receiver_Impl class RECEIVER_EXEC_Export Receiver_exec_i : public virtual Receiver_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -84,7 +84,7 @@ namespace CIDL_Receiver_Impl */ class RECEIVER_EXEC_Export ReceiverHome_exec_i : public virtual ReceiverHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h index 734991a1311..6f73580bda3 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec.h @@ -21,7 +21,7 @@ namespace CIDL_Sender_Impl { class SENDER_EXEC_Export Sender_exec_i : public virtual Sender_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -87,7 +87,7 @@ namespace CIDL_Sender_Impl // // class Message_Impl : public virtual Hello::CCM_ReadMessage, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Message_Impl (Sender_exec_i& component) @@ -115,7 +115,7 @@ namespace CIDL_Sender_Impl class SENDER_EXEC_Export SenderSwap_exec_i : public virtual CIAO::Swap_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: SenderSwap_exec_i (); @@ -146,7 +146,7 @@ namespace CIDL_Sender_Impl class SENDER_EXEC_Export SenderHome_exec_i : public virtual SenderHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h index a86088af781..31447d5b556 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h @@ -22,7 +22,7 @@ namespace CIDL_Sender_Impl class SENDER_EXEC_1_Export Sender_exec_1_i : public virtual Sender_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -91,7 +91,7 @@ namespace CIDL_Sender_Impl }; class Message_Impl_1 : public virtual Hello::CCM_ReadMessage, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Message_Impl_1 (Sender_exec_1_i& component) diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h index a1184736587..9886f4fd141 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h @@ -21,7 +21,7 @@ namespace CIDL_Sender_Impl class SENDER_EXEC_2_Export Sender_exec_2_i : public virtual Sender_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -92,7 +92,7 @@ namespace CIDL_Sender_Impl }; class Message_Impl_2 : public virtual Hello::CCM_ReadMessage, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Message_Impl_2 (Sender_exec_2_i& component) diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h index c4881d7515f..158499f3163 100644 --- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h +++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h @@ -32,7 +32,7 @@ namespace MyImpl class ROUNDTRIP_EXEC_Export RoundTrip_exec_i : public virtual Benchmark::RoundTrip_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -79,7 +79,7 @@ namespace MyImpl */ class ROUNDTRIP_EXEC_Export RoundTripHome_exec_i : public virtual Benchmark::CCM_RoundTripHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h index c718d8ab2c2..0b768832dda 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h @@ -29,7 +29,7 @@ namespace MyImpl class ROUNDTRIPCLIENT_EXEC_Export RoundTripClient_exec_i : public virtual Benchmark::RoundTripClient_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -71,7 +71,7 @@ namespace MyImpl */ class ROUNDTRIPCLIENT_EXEC_Export RoundTripClientHome_exec_i : public virtual Benchmark::CCM_RoundTripClientHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Default ctor. diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h index ace268a7786..1a05fc758de 100644 --- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h +++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h @@ -11,7 +11,7 @@ namespace CIDL_ReceiverImpl { class RECEIVER_EXEC_Export ReceiverExec_i : public virtual ReceiverExec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -43,7 +43,7 @@ namespace CIDL_ReceiverImpl class RECEIVER_EXEC_Export test_i : public virtual Protocols::CCM_test, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -84,7 +84,7 @@ namespace CIDL_ReceiverImpl class RECEIVER_EXEC_Export ReceiverHomeExec_i : public virtual ReceiverHomeExec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h index 8c7b786d7c9..fa32784a34c 100644 --- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h +++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h @@ -10,7 +10,7 @@ namespace CIDL_SenderImpl { class SENDER_EXEC_Export SenderExec_i : public virtual SenderExec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -53,7 +53,7 @@ namespace CIDL_SenderImpl class SENDER_EXEC_Export SenderHomeExec_i : public virtual SenderHomeExec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h index e3a8400ca8a..abe95b78756 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h @@ -57,7 +57,7 @@ namespace Impl class TSEC_Session_impl : public virtual POA_ENW::TSession, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: @@ -104,7 +104,7 @@ namespace Impl class TSEC_CHECKPOINT_EXEC_Export TSEC_CheckPoint_exec_i : public virtual ENW::TSEC_CheckPoint_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: TSEC_CheckPoint_exec_i(); @@ -224,7 +224,7 @@ namespace Impl */ class TSEC_CHECKPOINT_EXEC_Export TSEC_CheckPointHome_exec_i : public virtual ENW::CCM_TSEC_CheckPointHome, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h index 04189919a95..c32e9dd6028 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h +++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h @@ -36,7 +36,7 @@ namespace CIDL_Receiver_Impl { class RECEIVER_EXEC_Export Receiver_exec_i : public virtual Receiver_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Receiver_exec_i (void); @@ -70,7 +70,7 @@ namespace CIDL_Receiver_Impl class RECEIVER_EXEC_Export ReceiverHome_exec_i : public virtual ReceiverHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: ReceiverHome_exec_i (void); diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h index 69e45926f59..833352ec0d0 100644 --- a/CIAO/tests/Minimum/Sender/Sender_exec.h +++ b/CIAO/tests/Minimum/Sender/Sender_exec.h @@ -36,7 +36,7 @@ namespace CIDL_Sender_Impl { class SENDER_EXEC_Export Sender_exec_i : public virtual Sender_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: Sender_exec_i (void); @@ -73,7 +73,7 @@ namespace CIDL_Sender_Impl class SENDER_EXEC_Export SenderHome_exec_i : public virtual SenderHome_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: SenderHome_exec_i (void); |