[openrtm-commit:03383] r3451 - in trunk/OpenRTM-aist/src/lib: coil rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-11-26 08:58:30 +0900 (Mon, 26 Nov 2018)
New Revision: 3451

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

Modified: trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt	2018-11-21 03:06:12 UTC (rev 3450)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt	2018-11-25 23:58:30 UTC (rev 3451)
@@ -63,6 +63,7 @@
 #endif()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_coil_cmake.h.in ${PROJECT_BINARY_DIR}/config_coil.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_coil_cmake.h.in ${COIL_OS_DIR}/coil/config_coil.h)
 
 
 set(coil_headers

Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-11-21 03:06:12 UTC (rev 3450)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-11-25 23:58:30 UTC (rev 3451)
@@ -125,14 +125,14 @@
 
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_rtc_cmake.h.in ${PROJECT_BINARY_DIR}/config_rtc.h)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version_cmake.h.in ${PROJECT_BINARY_DIR}/version.h)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_rtc_cmake.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config_rtc.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version_cmake.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
 
 
 
 
-
 if(VXWORKS)
 else(VXWORKS)
 	link_directories(${ORB_LINK_DIR})

Modified: trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp	2018-11-21 03:06:12 UTC (rev 3450)
+++ trunk/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp	2018-11-25 23:58:30 UTC (rev 3451)
@@ -160,7 +160,7 @@
       {
 
         Member& member(*it);
-		size_t len = max(strlen(id), 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;