[openrtm-commit:01816] r683 - trunk/OpenRTM-aist-Python/OpenRTM_aist

openrtm @ openrtm.org openrtm @ openrtm.org
2016年 3月 6日 (日) 22:25:33 JST


Author: miyamoto
Date: 2016-03-06 22:25:33 +0900 (Sun, 06 Mar 2016)
New Revision: 683

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
Log:
[compat,bugfix,->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2016-03-04 16:25:06 UTC (rev 682)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2016-03-06 13:25:33 UTC (rev 683)
@@ -298,9 +298,10 @@
   # @if jp
   #
   # @brief rtcname形式でRTCのオブジェクトリファレンスを取得する
-  # 
-  # @return RTCのオブジェクトリファレンス
   #
+  # @param name RTC名
+  # @return RTCのオブジェクトリファレンスのリスト
+  #
   # @else
   #
   # @brief 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2016-03-04 16:25:06 UTC (rev 682)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2016-03-06 13:25:33 UTC (rev 683)
@@ -224,7 +224,7 @@
     self._shm_address = shm_address
     if self._shmem is None:
       if platform.system() == "Windows":
-        self._shmem = mmap.mmap(0, self._memory_size, self._shm_address, mmap.ACCESS_READ)
+        self._shmem = mmap.mmap(0, self._memory_size, self._shm_address, mmap.ACCESS_WRITE)
       else:
         O_RDWR = 2
         self.fd = self.rt.shm_open(self._shm_address,O_RDWR,0)



More information about the openrtm-commit mailing list