[openrtm-commit:03018] r3146 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-12-13 17:57:04 +0900 (Wed, 13 Dec 2017)
New Revision: 3146

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[merge] r3145 has been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-12-13 08:46:22 UTC (rev 3145)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-12-13 08:57:04 UTC (rev 3146)
@@ -24,6 +24,7 @@
 #include <rtm/NamingManager.h>
 #include <rtm/RTC.h>
 #include <rtm/PeriodicExecutionContext.h>
+#include <rtm/SimulatorExecutionContext.h>
 #include <rtm/ExtTrigExecutionContext.h>
 #include <rtm/OpenHRPExecutionContext.h>
 #include <rtm/PeriodicECSharedComposite.h>
@@ -1900,7 +1901,7 @@
     PeriodicExecutionContextInit(this);
     ExtTrigExecutionContextInit(this);
     OpenHRPExecutionContextInit(this);
-
+    SimulatorExecutionContextInit(this);
     // initialize CPU affinity
 #ifdef RTM_OS_LINUX
     initCpuAffinity();