diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-17 14:25:41 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-17 14:25:41 +0100 |
| commit | 5b15b048b81764d2519877337c1967f855c6a1da (patch) | |
| tree | a931b51e0c2f7e5692469a1ec62a0691e377e626 | |
| parent | 6e71c039a2d09ef7a49e5fbf13055eb24f942b13 (diff) | |
| download | ATCD-5b15b048b81764d2519877337c1967f855c6a1da.tar.gz | |
Fixed compile errors
* TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h:
* TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp:
* TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 3040d61ff41..d0bfcaf73f8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -12,7 +12,6 @@ #include /**/ "orbsvcs/Event/event_serv_export.h" #include "orbsvcs/RtecUDPAdminS.h" #include "orbsvcs/Event/EC_Lifetime_Utils.h" -#include "ace/Auto_Ptr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index d60e247ffd4..df321abb0ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) :allocator_ (0), - dispatcher_ (0), + dispatcher_ (nullptr), lanes_setup_ (0), disp_sched_policy_ (sched_policy), disp_sched_scope_ (sched_scope) @@ -89,7 +89,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes () // Create Kokyu::Dispatcher using factory Kokyu::Dispatcher_Auto_Ptr tmp(Kokyu::Dispatcher_Factory::create_dispatcher(attrs)); - this->dispatcher_ = tmp; + this->dispatcher_ = std::move(tmp); this->lanes_setup_ = 1; //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 33e4df630d4..8d4f163f452 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -11,8 +11,6 @@ #include "orbsvcs/Event/EC_ObserverStrategy.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy () |