[openrtm-commit:02265] r2870 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/common rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 18日 (水) 19:15:28 JST
Author: sec_fukai
Date: 2017-01-18 19:15:28 +0900 (Wed, 18 Jan 2017)
New Revision: 2870
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3816
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -161,7 +161,10 @@
else if (c == '\\') str += "\\\\";
// else if (c == '\"') str += "\\\"";
// else if (c == '\'') str += "\\\'";
- else str.push_back(c);
+ else
+ {
+ str.push_back(c);
+ }
}
std::string str;
};
@@ -209,7 +212,10 @@
else if (c == 'r') str.push_back('\r');
else if (c == '\"') str.push_back('\"');
else if (c == '\'') str.push_back('\'');
- else str.push_back(c);
+ else
+ {
+ str.push_back(c);
+ }
}
else
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -373,7 +373,8 @@
void
ConfigAdmin::setOnRemoveConfigurationSet(OnRemoveConfigurationSetCallback* cb)
{
- std::cerr << "setOnRemoveConfigurationSet function is obsolete." <<std::endl;
+ std::cerr <<
+ "setOnRemoveConfigurationSet function is obsolete." <<std::endl;
std::cerr << "Use addConfigurationSetNameListener instead." << std::endl;
m_listeners.configsetname_[ON_REMOVE_CONFIG_SET].addListener(cb, false);
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -347,7 +347,10 @@
return ret;
}
RTC_impl::RTObjectStateMachine* rtobj;
- ret = m_worker.activateComponent(comp, rtobj); // Actual activateComponent()
+
+ // Actual activateComponent()
+ ret = m_worker.activateComponent(comp, rtobj);
+
if (ret != RTC::RTC_OK) { return ret; }
if (!m_syncActivation) // Asynchronous activation mode
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -131,7 +131,8 @@
{
RTC_PARANOID(("Period: %f [s]", static_cast<double>(period)));
RTC_PARANOID(("Execution: %f [s]", static_cast<double>(t1 - t0)));
- RTC_PARANOID(("Sleep: %f [s]", static_cast<double>(period - (t1 - t0))));
+ RTC_PARANOID(("Sleep: %f [s]",
+ static_cast<double>(period - (t1 - t0))));
}
coil::TimeValue t2(coil::gettimeofday());
if (period > (t1 - t0))
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-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -1920,10 +1920,12 @@
{
try {
PortableServer::RefCountServantBase* servant;
- servant = dynamic_cast<PortableServer::RefCountServantBase*>(m_ecs[i]);
+ servant =
+ dynamic_cast<PortableServer::RefCountServantBase*>(m_ecs[i]);
if (servant == NULL)
{
- RTC_ERROR(("Invalid dynamic cast. EC->RefCountServantBase failed."));
+ RTC_ERROR(
+ ("Invalid dynamic cast. EC->RefCountServantBase failed."));
return;
}
PortableServer::ObjectId_var oid = m_pPOA->servant_to_id(servant);
@@ -2255,7 +2257,10 @@
else if (c == 'h') str += m_config["os.hostname"];
else if (c == 'M') str += m_config["manager.name"];
else if (c == 'p') str += m_config["manager.pid"];
- else str.push_back(c);
+ else
+ {
+ str.push_back(c);
+ }
}
else
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -789,7 +789,8 @@
#ifndef ORB_IS_RTORB
obj = m_mgr.theORB()->resolve_initial_references("omniINSPOA");
#else // ROB_IS_RTORB
- obj = m_mgr.theORB()->resolve_initial_references(const_cast<char*>("omniINSPOA"));
+ obj = m_mgr.theORB()->resolve_initial_references(
+ const_cast<char*>("omniINSPOA"));
#endif // ORB_IS_RTORB
PortableServer::POA_ptr poa = PortableServer::POA::_narrow(obj);
poa->the_POAManager()->activate();
@@ -800,8 +801,8 @@
#ifndef ORB_IS_RTORB
id = PortableServer::string_to_ObjectId(config["manager.name"].c_str());
#else // ORB_IS_RTORB
- id = PortableServer::
- string_to_ObjectId(reinterpret_cast<char*>(config["manager.name"].c_str()));
+ id = PortableServer::string_to_ObjectId(
+ reinterpret_cast<char*>(config["manager.name"].c_str()));
#endif // ORB_IS_RTORB
// Object activation
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -89,7 +89,8 @@
RTC_PARANOID(("Period: %f [s]", static_cast<double>(period)));
RTC_PARANOID(("Exec-Do: %f [s]", static_cast<double>(t1 - t0)));
RTC_PARANOID(("Exec-PostDo: %f [s]", static_cast<double>(t2 - t1)));
- RTC_PARANOID(("Sleep: %f [s]", static_cast<double>(period - (t2 - t0))));
+ RTC_PARANOID(("Sleep: %f [s]",
+ static_cast<double>(period - (t2 - t0))));
}
coil::TimeValue t3(coil::gettimeofday());
if (period > (t2 - t0))
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -175,7 +175,8 @@
cdr.get_octet_array(&((*data)[0]), len);
#else // ORB_IS_RTORB
data->length(len);
- cdr.get_octet_array(reinterpret_cast<char *>(&((*data)[0]), static_cast<int>(len)));
+ cdr.get_octet_array(reinterpret_cast<char *>(&((*data)[0]),
+ static_cast<int>(len)));
#endif // ORB_IS_RTORB
}
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-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -521,7 +521,8 @@
{
std::vector<std::string>& oldPorts(m_expPorts);
std::sort(oldPorts.begin(), oldPorts.end());
- std::vector<std::string> newPorts(coil::split(m_rtobj->getProperties()["conf.default.exported_ports"], ","));
+ std::vector<std::string> newPorts(coil::split(
+ m_rtobj->getProperties()["conf.default.exported_ports"], ","));
std::sort(newPorts.begin(), newPorts.end());
std::vector<std::string> removedPorts; // oldPorts - interPorts
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -183,7 +183,8 @@
{
RTC_PARANOID(("Period: %f [s]", static_cast<double>(period)));
RTC_PARANOID(("Execution: %f [s]", static_cast<double>(t1 - t0)));
- RTC_PARANOID(("Sleep: %f [s]", static_cast<double>(period - (t1 - t0))));
+ RTC_PARANOID(("Sleep: %f [s]",
+ static_cast<double>(period - (t1 - t0))));
}
coil::TimeValue t2(coil::gettimeofday());
if (!m_nowait && period > (t1 - t0))
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-18 09:34:46 UTC (rev 2869)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-18 10:15:28 UTC (rev 2870)
@@ -185,7 +185,8 @@
RTC_TRACE(("set_organization_property_value(name=%s)", name));
if (std::string(name).empty())
{
- throw InvalidParameter("set_organization_property_value(): Enpty name.");
+ throw InvalidParameter(
+ "set_organization_property_value(): Enpty name.");
}
CORBA::Long index;
More information about the openrtm-commit
mailing list