summaryrefslogtreecommitdiff
path: root/TAO/tao/RTScheduling/RTScheduler_Manager.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-12-29 09:16:03 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-12-29 09:16:03 +0100
commit1d1caa2f5340920a93898f9e34cd1c5477400320 (patch)
treee15c34bf9476ee1687965b1eccd78bc316223813 /TAO/tao/RTScheduling/RTScheduler_Manager.inl
parent76c3b5473a9d0aa75e8f36522eff1a1307f89cf2 (diff)
parentdaabeb9bb2388926f610f93c987563ce596e091f (diff)
downloadATCD-1d1caa2f5340920a93898f9e34cd1c5477400320.tar.gz
Merge branch 'master' into test-corba-is-nil
Diffstat (limited to 'TAO/tao/RTScheduling/RTScheduler_Manager.inl')
-rw-r--r--TAO/tao/RTScheduling/RTScheduler_Manager.inl3
1 files changed, 1 insertions, 2 deletions
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
index 06c377c6a36..8247beea3a8 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
@@ -217,8 +217,7 @@ TAO_RTScheduler_Manager::rtscheduler (void)
}
ACE_INLINE void
-TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
- )
+TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler)
{
this->rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler);
this->orb_->orb ()->register_initial_reference (