[openrtm-commit:03070] r3165 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-17 15:46:09 +0900 (Wed, 17 Jan 2018)
New Revision: 3165

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h
Log:
[compat, bugfix, ->RELENG_1_2] bug fix.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-17 02:12:40 UTC (rev 3164)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-17 06:46:09 UTC (rev 3165)
@@ -2537,9 +2537,9 @@
     return;
   }
 
-};
 
 
+
   /*!
   * @if jp
   * @brief µ¯Æ°»þ¤Ërtc.conf¤Ç»ØÄꤷ¤¿¥Ý¡¼¥È¤òÀܳ¤¹¤ë

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h	2018-01-17 02:12:40 UTC (rev 3164)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h	2018-01-17 06:46:09 UTC (rev 3165)
@@ -1142,17 +1142,6 @@
      * @endif
      */
     RTM::ManagerServant& getManagerServant();
-    /*!
-     * @if jp
-     * @brief ManagerServant¤ò¼èÆÀ¤¹¤ë
-     *
-     * @else
-     *
-     * @brief Getting ManagerServant
-     *
-     * @endif
-     */
-    RTM::ManagerServant& getManagerServant();
 
     /*!
      * @if jp