[openrtm-commit:02218] r2835 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/win32/coil rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 13日 (金) 17:46:12 JST
Author: sec_fukai
Date: 2017-01-13 17:46:12 +0900 (Fri, 13 Jan 2017)
New Revision: 2835
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
Log:
[compat,->DEV_IQ_2016] Modify parameter scorpe. refs #3803
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-13 08:46:12 UTC (rev 2835)
@@ -237,7 +237,6 @@
FILETIME ftime;
LARGE_INTEGER lint;
__int64 val64;
- static int tzflag;
if (tv != NULL)
{
::GetSystemTimeAsFileTime(&ftime);
@@ -250,7 +249,8 @@
tv->tv_usec = (long)(val64 % 1000000);
}
if (tz)
- {
+ {
+ static int tzflag;
if (!tzflag)
{
::_tzset();
@@ -320,11 +320,11 @@
FILETIME ftime;
LARGE_INTEGER lint;
__int64 val64;
- int bias(0);
// tv,tz -> ftime
if (tv != NULL)
{
+ int bias(0);
if (tz != NULL)
{
bias = tz->tz_minuteswest;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h 2017-01-13 08:46:12 UTC (rev 2835)
@@ -145,6 +145,8 @@
*/
static const char* toString(PreComponentActionListenerType type)
{
+ if (type < PRE_COMPONENT_ACTION_LISTENER_NUM)
+ {
static const char* typeString[] =
{
"PRE_ON_INITIALIZE",
@@ -161,7 +163,8 @@
"PRE_ON_RATE_CHANGED",
"PRE_COMPONENT_ACTION_LISTENER_NUM"
};
- if (type < PRE_COMPONENT_ACTION_LISTENER_NUM) { return typeString[type]; }
+ return typeString[type];
+ }
return "";
}
@@ -308,6 +311,8 @@
*/
static const char* toString(PostComponentActionListenerType type)
{
+ if (type < POST_COMPONENT_ACTION_LISTENER_NUM)
+ {
static const char* typeString[] =
{
"POST_ON_INITIALIZE",
@@ -324,8 +329,6 @@
"POST_ON_RATE_CHANGED",
"POST_COMPONENT_ACTION_LISTENER_NUM"
};
- if (type < POST_COMPONENT_ACTION_LISTENER_NUM)
- {
return typeString[type];
}
return "";
@@ -428,13 +431,16 @@
*/
static const char* toString(PortActionListenerType type)
{
+ if (type < PORT_ACTION_LISTENER_NUM)
+ {
static const char* typeString[] =
{
"ADD_PORT",
"REMOVE_PORT",
"PORT_ACTION_LISTENER_NUM"
};
- if (type < PORT_ACTION_LISTENER_NUM) { return typeString[type]; }
+ return typeString[type];
+ }
return "";
}
@@ -535,13 +541,16 @@
*/
static const char* toString(ExecutionContextActionListenerType type)
{
+ if (type < EC_ACTION_LISTENER_NUM)
+ {
static const char* typeString[] =
{
"ATTACH_EC",
"DETACH_ECT",
"EC_ACTION_LISTENER_NUM"
};
- if (type < EC_ACTION_LISTENER_NUM) { return typeString[type]; }
+ return typeString[type];
+ }
return "";
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h 2017-01-13 08:46:12 UTC (rev 2835)
@@ -97,13 +97,13 @@
*/
static const char* toString(ConfigurationParamListenerType type)
{
- static const char* typeString[] =
- {
- "ON_UPDATE_CONFIG_PARAM",
- "CONFIG_PARAM_LISTENER_NUM"
- };
if (type < CONFIG_PARAM_LISTENER_NUM)
{
+ static const char* typeString[] =
+ {
+ "ON_UPDATE_CONFIG_PARAM",
+ "CONFIG_PARAM_LISTENER_NUM"
+ };
return typeString[type];
}
return "";
@@ -214,13 +214,16 @@
*/
static const char* toString(ConfigurationSetListenerType type)
{
- static const char* typeString[] =
- {
- "ON_SET_CONFIG_SET",
- "ON_ADD_CONFIG_SET",
- "CONFIG_SET_LISTENER_NUM"
- };
- if (type < CONFIG_SET_LISTENER_NUM) { return typeString[type]; }
+ if (type < CONFIG_SET_LISTENER_NUM)
+ {
+ static const char* typeString[] =
+ {
+ "ON_SET_CONFIG_SET",
+ "ON_ADD_CONFIG_SET",
+ "CONFIG_SET_LISTENER_NUM"
+ };
+ return typeString[type];
+ }
return "";
}
@@ -324,14 +327,17 @@
*/
static const char* toString(ConfigurationSetNameListenerType type)
{
- static const char* typeString[] =
- {
- "ON_UPDATE_CONFIG_SET",
- "ON_REMOVE_CONFIG_SET",
- "ON_ACTIVATE_CONFIG_SET",
- "CONFIG_SET_NAME_LISTENER_NUM"
- };
- if (type < CONFIG_SET_NAME_LISTENER_NUM) { return typeString[type]; }
+ if (type < CONFIG_SET_NAME_LISTENER_NUM)
+ {
+ static const char* typeString[] =
+ {
+ "ON_UPDATE_CONFIG_SET",
+ "ON_REMOVE_CONFIG_SET",
+ "ON_ACTIVATE_CONFIG_SET",
+ "CONFIG_SET_NAME_LISTENER_NUM"
+ };
+ return typeString[type];
+ }
return "";
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-01-13 08:46:12 UTC (rev 2835)
@@ -213,21 +213,24 @@
*/
static const char* toString(ConnectorDataListenerType type)
{
- static const char* typeString[] =
- {
- "ON_BUFFER_WRITE",
- "ON_BUFFER_FULL",
- "ON_BUFFER_WRITE_TIMEOUT",
- "ON_BUFFER_OVERWRITE",
- "ON_BUFFER_READ",
- "ON_SEND",
- "ON_RECEIVED",
- "ON_RECEIVER_FULL",
- "ON_RECEIVER_TIMEOUT",
- "ON_RECEIVER_ERROR",
- "CONNECTOR_DATA_LISTENER_NUM"
- };
- if (type < CONNECTOR_DATA_LISTENER_NUM) { return typeString[type]; }
+ if (type < CONNECTOR_DATA_LISTENER_NUM)
+ {
+ static const char* typeString[] =
+ {
+ "ON_BUFFER_WRITE",
+ "ON_BUFFER_FULL",
+ "ON_BUFFER_WRITE_TIMEOUT",
+ "ON_BUFFER_OVERWRITE",
+ "ON_BUFFER_READ",
+ "ON_SEND",
+ "ON_RECEIVED",
+ "ON_RECEIVER_FULL",
+ "ON_RECEIVER_TIMEOUT",
+ "ON_RECEIVER_ERROR",
+ "CONNECTOR_DATA_LISTENER_NUM"
+ };
+ return typeString[type];
+ }
return "";
}
@@ -541,18 +544,21 @@
*/
static const char* toString(ConnectorListenerType type)
{
- static const char* typeStr[] =
- {
- "ON_BUFFER_EMPTY",
- "ON_BUFFER_READ_TIMEOUT",
- "ON_SENDER_EMPTY",
- "ON_SENDER_TIMEOUT",
- "ON_SENDER_ERROR",
- "ON_CONNECT",
- "ON_DISCONNECT",
- "CONNECTOR_LISTENER_NUM"
- };
- if (type < CONNECTOR_LISTENER_NUM) { return typeStr[type]; }
+ if (type < CONNECTOR_LISTENER_NUM)
+ {
+ static const char* typeStr[] =
+ {
+ "ON_BUFFER_EMPTY",
+ "ON_BUFFER_READ_TIMEOUT",
+ "ON_SENDER_EMPTY",
+ "ON_SENDER_TIMEOUT",
+ "ON_SENDER_ERROR",
+ "ON_CONNECT",
+ "ON_DISCONNECT",
+ "CONNECTOR_LISTENER_NUM"
+ };
+ return typeStr[type];
+ }
return "";
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-13 08:46:12 UTC (rev 2835)
@@ -925,9 +925,9 @@
prop);
#endif // ORB_IS_RTORB
- InPortConnector* connector(0);
try
{
+ InPortConnector* connector(0);
if (m_singlebuffer)
{
connector = new InPortPushConnector(profile, provider,
@@ -986,9 +986,9 @@
prop);
#endif // ORB_IS_RTORB
- InPortConnector* connector(0);
try
{
+ InPortConnector* connector(0);
if (m_singlebuffer)
{
connector = new InPortPullConnector(profile, consumer,
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-01-13 08:46:12 UTC (rev 2835)
@@ -247,10 +247,10 @@
if (ret == PORT_OK) { continue; }
result = false;
- const char* id(m_connectors[i]->profile().id.c_str());
if (ret == CONNECTION_LOST)
{
+ const char* id(m_connectors[i]->profile().id.c_str());
RTC_WARN(("connection_lost id: %s", id));
if (m_onConnectionLost != 0)
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-01-13 08:04:27 UTC (rev 2834)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-01-13 08:46:12 UTC (rev 2835)
@@ -959,9 +959,9 @@
prop);
#endif // ORB_IS_RTORB
- OutPortConnector* connector(0);
try
{
+ OutPortConnector* connector(0);
connector = new OutPortPushConnector(profile, consumer, m_listeners);
if (connector == 0)
@@ -1029,9 +1029,9 @@
prop);
#endif // ORB_IS_RTORB
- OutPortConnector* connector(0);
try
{
+ OutPortConnector* connector(0);
connector = new OutPortPullConnector(profile, provider, m_listeners);
if (connector == 0)
More information about the openrtm-commit
mailing list