[openrtm-commit:02559] r2979 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-04-06 19:40:59 +0900 (Thu, 06 Apr 2017)
New Revision: 2979

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
   trunk/OpenRTM-aist/src/lib/rtm/Manager.h
Log:
[incompt,newfunc] getManagerServant() and getNamingManager() have been added. refs #3273

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-04-05 08:46:15 UTC (rev 2978)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-04-06 10:40:59 UTC (rev 2979)
@@ -1791,7 +1791,19 @@
     m_namingManager->unbindAll();
     delete m_namingManager;
   }
-  
+
+  /*!
+   * @if jp
+   * @brief NamingManagerを取得する
+   * @else
+   * @brief Getting NamingManager
+   * @endif
+   */
+  NamingManager& Manager::getNamingManager()
+  {
+    return *m_namingManager;
+  }
+
   //============================================================
   // Naming initialization and finalization
   //============================================================
@@ -1937,7 +1949,19 @@
 
     return true;
   }
-  
+
+  /*!
+   * @if jp
+   * @brief ManagerServantを取得する
+   * @else
+   * @brief Getting ManagerServant
+   * @endif
+   */
+  RTM::ManagerServant& Manager::getManagerServant()
+  {
+    return *m_mgrservant;
+  }
+
   bool Manager::initLocalService()
   {
     RTC_TRACE(("Manager::initLocalService()"));

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.h	2017-04-05 08:46:15 UTC (rev 2978)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.h	2017-04-06 10:40:59 UTC (rev 2979)
@@ -396,7 +396,7 @@
      * @endif
      */
     void runManager(bool no_block = false);
-    
+
     //============================================================
     // Module management
     //============================================================
@@ -1381,6 +1381,18 @@
      * @endif
      */
     void shutdownNaming();
+
+    /*!
+     * @if jp
+     * @brief NamingManagerを取得する
+     *
+     * @else
+     *
+     * @brief Getting NamingManager
+     *
+     * @endif
+     */
+     NamingManager& getNamingManager();
     
     //============================================================
     // Component management
@@ -1624,6 +1636,18 @@
 
     /*!
      * @if jp
+     * @brief ManagerServantを取得する
+     *
+     * @else
+     *
+     * @brief Getting ManagerServant
+     *
+     * @endif
+     */
+    RTM::ManagerServant& getManagerServant();
+
+    /*!
+     * @if jp
      * @brief LocalService の初期化
      *
      * @return Timer 初期化処理実行結果(初期化成功:true、初期化失敗:false)