[openrtm-commit:03385] r3453 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-12-06 16:11:46 +0900 (Thu, 06 Dec 2018)
New Revision: 3453

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
Log:
[compat, bugfix]

Modified: trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp	2018-11-26 00:03:27 UTC (rev 3452)
+++ trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp	2018-12-06 07:11:46 UTC (rev 3453)
@@ -160,7 +160,12 @@
       {
 
         Member& member(*it);
-		size_t len = std::max(strlen(id), strlen(member.profile_->instance_name));
+		size_t len = strlen(id);
+		if (len < strlen(member.profile_->instance_name))
+		{
+			len = strlen(member.profile_->instance_name);
+		}
+		//size_t len = (std::max)(strlen(id), strlen(member.profile_->instance_name));
         if (strncmp(id, member.profile_->instance_name, len))
           {
             ++it;