[openrtm-commit:01981] r2749 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/coil/posix/coil src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-06-04 09:58:09 +0900 (Sat, 04 Jun 2016)
New Revision: 2749

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
Log:
Merged r2747, r2748.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734,2738-2739,2743
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734,2738-2739,2743,2747-2748

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h	2016-06-04 00:44:52 UTC (rev 2748)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h	2016-06-04 00:58:09 UTC (rev 2749)
@@ -142,7 +142,7 @@
           {
             const char* globc(glob_str);
             std::string fname(ent->d_name);
-            for (size_t i(0); i < fname.size() && globc != '\0'; ++i, ++globc)
+            for (size_t i(0); i < fname.size() && *globc != '\0'; ++i, ++globc)
               {
                 if (*globc == '*')
                   {

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h	2016-06-04 00:44:52 UTC (rev 2748)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h	2016-06-04 00:58:09 UTC (rev 2749)
@@ -138,7 +138,7 @@
 #endif
         m_value(value), m_onWrite(0), m_onWriteConvert(0)
     {
-      addProperty("dataport.data_value", m_value);
+      addProperty("dataport.data_value", 0);
       m_propValueIndex = NVUtil::find_index(m_profile.properties, "dataport.data_value");
     }