summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-12-23 18:51:35 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-12-23 18:51:35 +0100
commitdaabeb9bb2388926f610f93c987563ce596e091f (patch)
treeffcf4a0d565edc014c7c6e93c2387f1eaa77a8f5
parent9bd356a9b97bc0540c9bd2e9cb27a9c903a4ba4a (diff)
parentc6d563ffd9bf667ece0348a6ce830fe0e20a24c1 (diff)
downloadATCD-daabeb9bb2388926f610f93c987563ce596e091f.tar.gz
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index ba3caeee9c2..a78ae87523a 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -74,7 +74,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
Kokyu::DSRT_Dispatcher_Factory<FP_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
tmp( Kokyu::DSRT_Dispatcher_Factory<FP_Scheduler_Traits>::
create_DSRT_dispatcher (config) );
- kokyu_dispatcher_ = tmp;
+ kokyu_dispatcher_ = std::move(tmp);
CORBA::Object_var object =
orb->resolve_initial_references ("RTScheduler_Current");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 0639728d996..e46604a305c 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -74,7 +74,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
Kokyu::DSRT_Dispatcher_Factory<MIF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
tmp( Kokyu::DSRT_Dispatcher_Factory<MIF_Scheduler_Traits>::
create_DSRT_dispatcher (config) );
- kokyu_dispatcher_ = tmp;
+ kokyu_dispatcher_ = std::move(tmp);
CORBA::Object_var object =
orb->resolve_initial_references ("RTScheduler_Current");
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 5193fbbae92..2972bb05325 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -74,7 +74,7 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
Kokyu::DSRT_Dispatcher_Factory<MUF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
tmp( Kokyu::DSRT_Dispatcher_Factory<MUF_Scheduler_Traits>::
create_DSRT_dispatcher (config) );
- kokyu_dispatcher_ = tmp;
+ kokyu_dispatcher_ = std::move(tmp);
CORBA::Object_var object =
orb->resolve_initial_references ("RTScheduler_Current");