[openrtm-commit:03117] r3192 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-23 17:35:59 +0900 (Tue, 23 Jan 2018)
New Revision: 3192

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PortBase.cpp
Log:
[compat, bugfix, ->RELENG_1_2] fixed bug.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp	2018-01-23 08:06:11 UTC (rev 3191)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp	2018-01-23 08:35:59 UTC (rev 3192)
@@ -18,7 +18,7 @@
  */
 
 #include <rtm/InPortConnector.h>
-#include <rtm/OutPort.h>
+#include <rtm/OutPortBase.h>
 
 namespace RTC
 {

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-23 08:06:11 UTC (rev 3191)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp	2018-01-23 08:35:59 UTC (rev 3192)
@@ -2585,7 +2585,7 @@
             comp0 = getComponent(comp0_name.c_str());
             if (comp0 == NULL)
               {
-                RTC_ERROR(("%s not found.", comp0_name));
+                RTC_ERROR(("%s not found.", comp0_name.c_str()));
                 continue;
               }
             comp0_ref = comp0->getObjRef();
@@ -2595,7 +2595,7 @@
             RTC::RTCList rtcs = m_namingManager->string_to_component(comp0_name);
             if (rtcs.length() == 0)
               {
-                RTC_ERROR(("%s not found.", comp0_name));
+                RTC_ERROR(("%s not found.", comp0_name.c_str()));
                 continue;
               }
             comp0_ref = rtcs[0];
@@ -2607,7 +2607,7 @@
 
 		  if (CORBA::is_nil(port0_var))
 		  {
-			  RTC_DEBUG(("port %s found: " ,comp_ports[0]));
+			  RTC_DEBUG(("port %s found: " ,comp_ports[0].c_str()));
 			  continue;
 		  }
 
@@ -2624,7 +2624,7 @@
 			  comp1 = getComponent(comp1_name.c_str());
 			  if (comp1 == NULL)
 			  {
-				  RTC_ERROR(("%s not found.", comp1_name));
+				  RTC_ERROR(("%s not found.", comp1_name.c_str()));
 				  continue;
 			  }
 			  comp1_ref = comp1->getObjRef();
@@ -2634,7 +2634,7 @@
 			  RTC::RTCList rtcs = m_namingManager->string_to_component(comp1_name);
 			  if (rtcs.length() == 0)
 			  {
-				  RTC_ERROR(("%s not found.", comp1_name));
+				  RTC_ERROR(("%s not found.", comp1_name.c_str()));
 				  continue;
 			  }
 			  comp1_ref = rtcs[0];
@@ -2648,7 +2648,7 @@
 
 		  if (CORBA::is_nil(port1_var))
 		  {
-			  RTC_DEBUG(("port %s found: ", comp_ports[1]));
+			  RTC_DEBUG(("port %s found: ", comp_ports[1].c_str()));
 			  continue;
 		  }
 
@@ -2672,7 +2672,7 @@
 		  
 		  if (RTC::RTC_OK != CORBA_RTCUtil::connect(connectors[i], prop, port0_var, port1_var))
 		  {
-			  RTC_ERROR(("Connection error: %s", connectors[i]));
+			  RTC_ERROR(("Connection error: %s", connectors[i].c_str()));
 		  }
 	  }
   }
@@ -2718,7 +2718,7 @@
 				  RTC::RTCList rtcs = m_namingManager->string_to_component(comps[i]);
 				  if (rtcs.length() == 0)
 				  {
-					  RTC_ERROR(("%s not found.", comps[i]));
+					  RTC_ERROR(("%s not found.", comps[i].c_str()));
 					  continue;
 				  }
 				  comp_ref = rtcs[0];
@@ -2728,11 +2728,11 @@
 			  RTC::ReturnCode_t ret = CORBA_RTCUtil::activate(comp_ref);
 			  if (ret != RTC::RTC_OK)
 			  {
-				  RTC_ERROR(("%s activation filed.", comps[i]));
+				  RTC_ERROR(("%s activation filed.", comps[i].c_str()));
 			  }
 			  else
 			  {
-				  RTC_INFO(("%s activated.", comps[i]));
+				  RTC_INFO(("%s activated.", comps[i].c_str()));
 			  }
 		  }
 		  

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp	2018-01-23 08:06:11 UTC (rev 3191)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/NamingManager.cpp	2018-01-23 08:35:59 UTC (rev 3192)
@@ -512,7 +512,7 @@
 		  CORBA::Object_ptr  mobj = m_orb->string_to_object(mgrloc.c_str());
 		  RTM::Manager_ptr mgr = RTM::Manager::_narrow(mobj);
 
-		  RTC_DEBUG(("corbaloc: %s", mgrloc));
+		  RTC_DEBUG(("corbaloc: %s", mgrloc.c_str()));
 
 		  return mgr;
 	  }

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h	2018-01-23 08:06:11 UTC (rev 3191)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h	2018-01-23 08:35:59 UTC (rev 3192)
@@ -34,6 +34,7 @@
 #include <rtm/CdrBufferBase.h>
 #include <rtm/PortCallback.h>
 #include <rtm/OutPortConnector.h>
+#include <rtm/Timestamp.h>
 
 /*!
  * @if jp

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PortBase.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PortBase.cpp	2018-01-23 08:06:11 UTC (rev 3191)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PortBase.cpp	2018-01-23 08:35:59 UTC (rev 3192)
@@ -241,7 +241,7 @@
 
 	if (!coil::toBool(prop.getProperty("dataport.allow_dup_connection"), "YES", "NO", default_value))
 	{
-		for (int i = 0; i < connector_profile.ports.length(); i++)
+		for (unsigned int i = 0; i < connector_profile.ports.length(); i++)
 		{
 			if (!getPortRef()->_is_equivalent(connector_profile.ports[i]))
 			{