[openrtm-commit:02482] r2955 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-02-24 16:37:25 +0900 (Fri, 24 Feb 2017)
New Revision: 2955

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

Modified: trunk/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp	2017-02-22 05:59:04 UTC (rev 2954)
+++ trunk/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp	2017-02-24 07:37:25 UTC (rev 2955)
@@ -289,6 +289,33 @@
   {
     return ExecutionContextBase::getProfile();
   }
+
+
+  // template virtual functions adding/removing component
+  /*!
+  * @brief onAddedComponent() template function
+  */
+  RTC::ReturnCode_t OpenHRPExecutionContext::
+	  onAddedComponent(RTC::LightweightRTObject_ptr rtobj)
+  {
+	  Guard guard(m_tickmutex);
+
+	  ExecutionContextBase::m_worker.updateComponentList();
+
+	  return RTC::RTC_OK;
+  }
+  /*!
+  * @brief onRemovedComponent() template function
+  */
+  RTC::ReturnCode_t OpenHRPExecutionContext::
+	  onRemovedComponent(RTC::LightweightRTObject_ptr rtobj)
+  {
+	  Guard guard(m_tickmutex);
+
+	  ExecutionContextBase::m_worker.updateComponentList();
+
+	  return RTC::RTC_OK;
+  }
 };
 
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.h	2017-02-22 05:59:04 UTC (rev 2954)
+++ trunk/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.h	2017-02-24 07:37:25 UTC (rev 2955)
@@ -487,7 +487,18 @@
      */
     virtual RTC::ExecutionContextProfile* get_profile(void)
       throw (CORBA::SystemException);
-
+  protected:
+	// 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);
   private:
     /*!
      * @if jp