[openrtm-commit:02105] r2798 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-11-14 12:04:43 +0900 (Mon, 14 Nov 2016)
New Revision: 2798

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
   trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
Log:
[incompat,bugfix,EC]Modified for ExtTrigExecutionContext. #3697

Modified: trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp	2016-11-11 10:14:38 UTC (rev 2797)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp	2016-11-14 03:04:43 UTC (rev 2798)
@@ -392,6 +392,33 @@
       }
     return RTC::RTC_OK;
   }
+  // template virtual functions adding/removing component
+  /*!
+   * @brief onAddedComponent() template function
+   */
+  RTC::ReturnCode_t ExtTrigExecutionContext::
+  onAddedComponent(RTC::LightweightRTObject_ptr rtobj)
+  {
+    Guard guard(m_worker.mutex_);
+    if (m_worker.ticked_ == false)
+      {
+        ExecutionContextBase::m_worker.updateComponentList();
+      }
+    return RTC::RTC_OK;
+  }
+  /*!
+   * @brief onRemovedComponent() template function
+   */
+  RTC::ReturnCode_t ExtTrigExecutionContext::
+  onRemovedComponent(RTC::LightweightRTObject_ptr rtobj)
+  {
+    Guard guard(m_worker.mutex_);
+    if (m_worker.ticked_ == false)
+      {
+        ExecutionContextBase::m_worker.updateComponentList();
+      }
+    return RTC::RTC_OK;
+  }
 
   /*!
    * @brief onWaitingActivated() template function

Modified: trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h	2016-11-11 10:14:38 UTC (rev 2797)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h	2016-11-14 03:04:43 UTC (rev 2798)
@@ -589,6 +589,17 @@
      * @brief onStarted() template function
      */
     virtual RTC::ReturnCode_t onStarted();
+    // template virtual functions adding/removing component	
+    /*!	
+     * @brief onAddedComponent() template function	
+     */	
+     virtual RTC::ReturnCode_t	
+     onAddedComponent(RTC::LightweightRTObject_ptr rtobj);	
+    /*!	
+     * @brief onRemovedComponent() template function	
+     */	
+    virtual RTC::ReturnCode_t	
+    onRemovedComponent(RTC::LightweightRTObject_ptr rtobj);
     /*!
      * @brief onWaitingActivated() template function
      */