[openrtm-commit:03098] r3182 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2018-01-23 06:28:14 +0900 (Tue, 23 Jan 2018)
New Revision: 3182

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_RTCUtil.cpp
Log:
[compat,->trunk] Some implicit type conversion which not allowed by gcc are corrected.. refs #3270

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_RTCUtil.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_RTCUtil.cpp	2018-01-22 21:22:26 UTC (rev 3181)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_RTCUtil.cpp	2018-01-22 21:28:14 UTC (rev 3182)
@@ -539,7 +539,7 @@
     for (unsigned int i = 0; i < ports.length(); i++)
       {
         RTC::PortProfile* pp = ports[i]->get_port_profile();
-        std::string s = pp->name;
+        std::string s(static_cast<char*>(pp->name));
         names.push_back(s);
       }
     return names;
@@ -572,7 +572,7 @@
 
         if (prop["port.port_type"] == "DataInPort")
           {
-            std::string s = pp->name;
+            std::string s(static_cast<char*>(pp->name));
             names.push_back(s);
           }
       }
@@ -606,7 +606,7 @@
 
         if (prop["port.port_type"] == "DataOutPort")
           {
-            std::string s = pp->name;
+            std::string s(static_cast<char*>(pp->name));
             names.push_back(s);
           }
       }
@@ -642,7 +642,7 @@
 
         if (prop["port.port_type"] == "CorbaPort")
           {
-            std::string s = pp->name;
+            std::string s(static_cast<char*>(pp->name));
             names.push_back(s);
           }
       }
@@ -1286,7 +1286,7 @@
   {
     SDOPackage::Configuration_ptr conf = rtc->get_configuration();
     SDOPackage::ConfigurationSet* confset = conf->get_active_configuration_set();
-    return confset->id;
+    return static_cast<char*>(confset->id);
   }
   /*!
    * @if jp