diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp')
-rw-r--r-- | TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
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 10672a7a5a2..7528c70dfe3 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -5,7 +5,7 @@ #include "orbsvcs/CosEventCommS.h" #include "orbsvcs/RtecEventCommS.h" #include "ProxyPushSupplier_i.h" -#include "ace/Auto_Ptr.h" +#include <memory> #if defined(_MSC_VER) #pragma warning(disable:4250) @@ -25,13 +25,13 @@ public: TAO_CosEC_PushConsumerWrapper (CosEventComm::PushConsumer_ptr consumer); // Constructor. - ~TAO_CosEC_PushConsumerWrapper (void); + ~TAO_CosEC_PushConsumerWrapper () = default; // Destructor. - virtual void push (const RtecEventComm::EventSet & data); + void push (const RtecEventComm::EventSet & data) override; // This method is called by the RTEvent Channel to supply data. - virtual void disconnect_push_consumer (void); + void disconnect_push_consumer () override; // Disconnects the consumer from the event channel. private: @@ -47,12 +47,6 @@ TAO_CosEC_PushConsumerWrapper::TAO_CosEC_PushConsumerWrapper (CosEventComm::PushConsumer_ptr consumer) : consumer_ (CosEventComm::PushConsumer::_duplicate (consumer)) { - // No-Op. -} - -TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper () -{ - // No-Op. } void @@ -98,12 +92,6 @@ TAO_CosEC_ProxyPushSupplier_i::TAO_CosEC_ProxyPushSupplier_i pps_ (RtecEventChannelAdmin::ProxyPushSupplier::_duplicate (pps)), wrapper_ (0) { - // No-Op. -} - -TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void) -{ - // No-Op. } void @@ -138,7 +126,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer TAO_CosEC_PushConsumerWrapper (push_consumer), CORBA::NO_MEMORY ()); - auto_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper); + std::unique_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper); // @@ This code is not exception safe. RtecEventComm::PushConsumer_ptr rtecpushconsumer = |