[openrtm-commit:02225] r2838 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/common coil/posix/coil coil/win32/coil rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 16日 (月) 15:09:20 JST
Author: sec_fukai
Date: 2017-01-16 15:09:20 +0900 (Mon, 16 Jan 2017)
New Revision: 2838
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
Log:
[incompat,->DEV_IQ_2016] Delete not used parameter. refs #3802
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h 2017-01-16 06:09:20 UTC (rev 2838)
@@ -62,10 +62,6 @@
*/
struct Statistics
{
- double max_interval;
- double min_interval;
- double mean_interval;
- double std_deviation;
};
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-16 06:09:20 UTC (rev 2838)
@@ -127,7 +127,6 @@
struct dirent* ent;
coil::vstring flist;
bool has_glob(false);
- std::string pattern;
if (path == 0) { return flist; }
if (glob_str[0] != '\0') { has_glob = true; }
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -78,7 +78,6 @@
"ip route get ");
const char* match_str = "dev ";
const char* delimiter = " ";
- size_t ifname_pos(2);
cmd += dest_addr;
cmd += " 2> /dev/null";
#endif // COIL_OS_IS_LINUX
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -176,8 +176,7 @@
void* Task::svc_run(void* args)
{
Task* t = (coil::Task*)args;
- int status;
- status = t->svc();
+ t->svc();
t->finalize();
return 0;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2017-01-16 06:09:20 UTC (rev 2838)
@@ -383,7 +383,6 @@
struct dirent* ent;
coil::vstring flist;
bool has_glob(false);
- std::string pattern;
if (path == 0) { return flist; }
if (glob_str[0] != '\0') { has_glob = true; }
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -50,8 +50,7 @@
public:
Winsock() {
WSADATA wsaData;
- int iResult;
- iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+ WSAStartup(MAKEWORD(2, 2), &wsaData);
}
virtual ~Winsock()
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -178,8 +178,7 @@
unsigned int WINAPI Task::svc_run(void* args)
{
Task* t = (coil::Task*)args;
- int status;
- status = t->svc();
+ t->svc();
t->finalize();
return 0;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2017-01-16 06:09:20 UTC (rev 2838)
@@ -1380,7 +1380,6 @@
for (CorbaConsumerList::iterator it(m_consumers.begin());
it != m_consumers.end(); ++it)
{
- std::string name(nv.name);
if (it->descriptor() == (const char*)nv.name)
{
it->releaseObject();
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -422,7 +422,6 @@
{ RTC_ERROR(("%s not found.", comp0_name.c_str())); continue; }
if (comp1 == NULL)
{ RTC_ERROR(("%s not found.", comp1_name.c_str())); continue; }
- std::string port0 = comp_ports[0];
std::string port1 = comp_ports[1];
PortServiceList_var ports0 = comp0->get_ports();
@@ -463,7 +462,6 @@
continue;
}
ConnectorProfile conn_prof;
- std::string prof_name;
conn_prof.name = CORBA::string_dup(connectors[i].c_str());
conn_prof.connector_id = CORBA::string_dup("");
conn_prof.ports.length(2);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -535,7 +535,6 @@
{
std::string l = "manager.modules." + lang;
coil::Properties& lprop(Manager::instance().getConfig().getNode(l));
- std::vector<coil::Properties> prop;
for (size_t i(0), len(modules.size()); i < len; ++i)
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -409,7 +409,6 @@
RTC_TRACE(("addPort(%s)", ::coil::flatten(portlist).c_str()));
if (portlist.size() == 0) { return; }
- std::string comp_name(member.profile_->instance_name);
#ifndef ORB_IS_RTORB
::RTC::PortProfileList& plist(member.profile_->port_profiles);
#else // ORB_IS_RTORB
@@ -459,7 +458,6 @@
RTC_TRACE(("removePort(%s)", coil::flatten(portlist).c_str()));
if (portlist.size() == 0) { return; }
- std::string comp_name(member.profile_->instance_name);
#ifndef ORB_IS_RTORB
::RTC::PortProfileList& plist(member.profile_->port_profiles);
#else // ORB_IS_RTORB
@@ -652,7 +650,7 @@
::RTC::Manager& mgr(::RTC::Manager::instance());
- std::vector<RTObject_impl*> comps = mgr.getComponents();
+ mgr.getComponents();
::SDOPackage::SDOList sdos;
for (int i(0), len(m_members.size()); i < len; ++i)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2017-01-16 05:48:57 UTC (rev 2837)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2017-01-16 06:09:20 UTC (rev 2838)
@@ -917,7 +917,6 @@
delete clist;
#endif // ORB_IS_RTORB
}
- std::vector<std::string>::iterator it, it_end;
for (std::vector<std::string>::iterator it(connector_ids.begin());
it != connector_ids.end(); ++it)
More information about the openrtm-commit
mailing list