diff options
Diffstat (limited to 'TAO/CIAO/examples')
6 files changed, 20 insertions, 38 deletions
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h index 93e43077166..a7d4667de57 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED_svnt.h @@ -41,9 +41,8 @@ namespace CIAO_GLUE_BasicSP { - class BMCLOSEDED_SVNT_Export ReadData_Servant - : public virtual POA_BasicSP::ReadData, - public virtual PortableServer::RefCountServantBase + class BMCLOSEDED_SVNT_Export ReadData_Servant : + public virtual POA_BasicSP::ReadData { public: ReadData_Servant ( @@ -252,8 +251,7 @@ namespace CIAO_GLUE_BasicSP }; class BMCLOSEDED_SVNT_Export BMClosedED_Servant - : public virtual POA_BasicSP::BMClosedED, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMClosedED { public: BMClosedED_Servant ( @@ -305,8 +303,7 @@ namespace CIAO_GLUE_BasicSP // Servant class for the in_avail consumer. class BMCLOSEDED_SVNT_Export DataAvailableConsumer_in_avail_Servant - : public virtual POA_BasicSP::DataAvailableConsumer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::DataAvailableConsumer { public: DataAvailableConsumer_in_avail_Servant ( @@ -608,8 +605,7 @@ namespace CIAO_GLUE_BasicSP }; class BMCLOSEDED_SVNT_Export BMClosedEDHome_Servant - : public virtual POA_BasicSP::BMClosedEDHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMClosedEDHome { public: BMClosedEDHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h index 5d10773311c..8db002f8033 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice_svnt.h @@ -42,8 +42,7 @@ namespace CIAO_GLUE_BasicSP { class BMDEVICE_SVNT_Export ReadData_Servant - : public virtual POA_BasicSP::ReadData, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::ReadData { public: ReadData_Servant ( @@ -229,8 +228,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDEVICE_SVNT_Export BMDevice_Servant - : public virtual POA_BasicSP::BMDevice, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDevice { public: BMDevice_Servant ( @@ -263,8 +261,7 @@ namespace CIAO_GLUE_BasicSP // Servant class for the timeout consumer. class BMDEVICE_SVNT_Export TimeOutConsumer_timeout_Servant - : public virtual POA_BasicSP::TimeOutConsumer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::TimeOutConsumer { public: TimeOutConsumer_timeout_Servant ( @@ -566,8 +563,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDEVICE_SVNT_Export BMDeviceHome_Servant - : public virtual POA_BasicSP::BMDeviceHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDeviceHome { public: BMDeviceHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h index fb6a2041366..b78c7750d39 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay_svnt.h @@ -145,8 +145,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDISPLAY_SVNT_Export BMDisplay_Servant - : public virtual POA_BasicSP::BMDisplay, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDisplay { public: BMDisplay_Servant ( @@ -158,8 +157,7 @@ namespace CIAO_GLUE_BasicSP // Servant class for the data_ready consumer. class BMDISPLAY_SVNT_Export DataAvailableConsumer_data_ready_Servant - : public virtual POA_BasicSP::DataAvailableConsumer, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::DataAvailableConsumer { public: DataAvailableConsumer_data_ready_Servant ( @@ -468,8 +466,7 @@ namespace CIAO_GLUE_BasicSP }; class BMDISPLAY_SVNT_Export BMDisplayHome_Servant - : public virtual POA_BasicSP::BMDisplayHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::BMDisplayHome { public: BMDisplayHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h index 01d6e183389..4b0f13c5067 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC_svnt.h @@ -195,8 +195,7 @@ namespace CIAO_GLUE_BasicSP }; class EC_SVNT_Export EC_Servant - : public virtual POA_BasicSP::EC, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::EC { public: EC_Servant ( @@ -256,7 +255,7 @@ namespace CIAO_GLUE_BasicSP ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void + virtual void hertz ( ::CORBA::Long ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -497,8 +496,7 @@ namespace CIAO_GLUE_BasicSP }; class EC_SVNT_Export ECHome_Servant - : public virtual POA_BasicSP::ECHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::ECHome { public: ECHome_Servant ( diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h index faf3634d317..a69cc0ef738 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_exec.h @@ -155,8 +155,7 @@ namespace MyImpl }; class RTEVENTSERVICE_EXEC_Export RTEventServiceSupplier_impl : - public virtual POA_RtecEventComm::PushSupplier, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecEventComm::PushSupplier { public: @@ -172,8 +171,7 @@ namespace MyImpl }; class RTEVENTSERVICE_EXEC_Export RTEventServiceConsumer_impl : - public virtual POA_RtecEventComm::PushConsumer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecEventComm::PushConsumer { public: diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h index a2915e7cbfa..43b6b85ba82 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService_svnt.h @@ -37,8 +37,7 @@ namespace CIAO_GLUE_RtecEventChannelAdmin { class RTEVENTSERVICE_SVNT_Export EventChannel_Servant - : public virtual POA_RtecEventChannelAdmin::EventChannel, - public virtual PortableServer::RefCountServantBase + : public virtual POA_RtecEventChannelAdmin::EventChannel { public: EventChannel_Servant ( @@ -184,8 +183,7 @@ namespace CIAO_GLUE_BasicSP }; class RTEVENTSERVICE_SVNT_Export RTEventService_Servant - : public virtual POA_BasicSP::RTEventService, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::RTEventService { public: RTEventService_Servant ( @@ -438,8 +436,7 @@ namespace CIAO_GLUE_BasicSP }; class RTEVENTSERVICE_SVNT_Export RTEventServiceHome_Servant - : public virtual POA_BasicSP::RTEventServiceHome, - public virtual PortableServer::RefCountServantBase + : public virtual POA_BasicSP::RTEventServiceHome { public: RTEventServiceHome_Servant ( |