[openrtm-commit:02262] r2867 - 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月 18日 (水) 18:26:35 JST
Author: sec_fukai
Date: 2017-01-18 18:26:35 +0900 (Wed, 18 Jan 2017)
New Revision: 2867
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.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/PublisherNew.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3816
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -20,6 +20,8 @@
#include <coil/ClockManager.h>
#include <coil/Guard.h>
+#include <string>
+
namespace coil
{
//============================================================
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-18 09:26:35 UTC (rev 2867)
@@ -23,9 +23,9 @@
#include <coil/Mutex.h>
#include <coil/Guard.h>
+#include <limits.h>
#include <fstream>
#include <iostream>
-#include <limits.h>
#include <string>
#include <utility>
#include <vector>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -19,7 +19,11 @@
#include <coil/Properties.h>
#include <coil/stringutil.h>
+
#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
#ifdef __QNX__
using std::size_t;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -19,6 +19,9 @@
#include <coil/Listener.h>
#include <coil/Timer.h>
#include <coil/Time.h>
+
+#include <vector>
+
namespace coil
{
/*!
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 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -19,15 +19,16 @@
#include <coil/stringutil.h>
+#include <limits.h>
+#include <stdarg.h>
#include <stdio.h>
-#include <stdarg.h>
-#include <limits.h>
#include <string.h>
#include <algorithm>
#include <iostream>
#include <cstring>
#include <cctype>
#include <cstdio>
+#include <string>
#ifdef __QNX__
using std::toupper;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -18,6 +18,8 @@
#include <coil/DynamicLib.h>
+#include <utility>
+
namespace coil
{
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -20,13 +20,15 @@
#ifndef COIL_PROCESS_H
#define COIL_PROCESS_H
+#include <coil/stringutil.h>
+
#include <stdlib.h>
#include <unistd.h>
#include <libgen.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <coil/stringutil.h>
+#include <string>
namespace coil
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -19,6 +19,8 @@
#define TEST_DYNAMIC_LIB 1 // Test for DLL export.
#include <coil/DynamicLib.h>
+#include <utility>
+
namespace coil
{
/*!
@@ -180,8 +182,7 @@
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
reinterpret_cast<char *>(cstr),
256,
- NULL
- );
+ NULL);
return cstr;
}
}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -19,6 +19,7 @@
#include <rtm/Factory.h>
#include <rtm/RTObject.h>
+#include <string>
namespace RTC
{
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-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -28,6 +28,7 @@
#include <algorithm>
#include <iterator>
+#include <string>
namespace RTC
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -21,6 +21,8 @@
#include <rtm/OutPortConsumer.h>
#include <rtm/ConnectorListener.h>
+#include <string>
+
namespace RTC
{
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -21,6 +21,8 @@
#include <rtm/InPortProvider.h>
#include <rtm/ConnectorListener.h>
+#include <string>
+
namespace RTC
{
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -26,9 +26,9 @@
#include <rtm/LocalServiceAdmin.h>
#include <rtm/LocalServiceBase.h>
+#include <string.h>
#include <algorithm>
#include <memory>
-#include <string.h>
#include <vector>
namespace RTM
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 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -24,6 +24,9 @@
#include <rtm/CORBA_SeqUtil.h>
#include <rtm/CORBA_IORUtil.h>
+#include <vector>
+#include <string>
+
namespace RTM
{
//
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -29,8 +29,9 @@
#include <rtm/NVUtil.h>
#include <rtm/CORBA_SeqUtil.h>
+#include <algorithm>
#include <map>
-#include <algorithm>
+#include <vector>
#ifdef WIN32
#pragma warning( pop )
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -20,6 +20,8 @@
#include <rtm/OutPortPullConnector.h>
#include <rtm/OutPortProvider.h>
+#include <string>
+
namespace RTC
{
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -22,6 +22,8 @@
#include <rtm/OutPortPushConnector.h>
#include <rtm/ConnectorListener.h>
+#include <string>
+
namespace RTC
{
/*!
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 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -19,9 +19,11 @@
#include <rtm/RTC.h>
#include <rtm/PeriodicECSharedComposite.h>
#include <rtm/Manager.h>
-#include <string>
+
+#include <algorithm>
#include <iostream>
#include <iterator>
+#include <string>
static const char* periodicecsharedcomposite_spec[] =
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 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -16,18 +16,21 @@
*
*/
-#include <algorithm>
-#include <iostream>
+#include <coil/Time.h>
+#include <coil/TimeValue.h>
+
+#include <rtm/PeriodicExecutionContext.h>
+#include <rtm/RTObjectStateMachine.h>
+
#ifdef RTM_OS_LINUX
#define _GNU_SOURCE
#include <pthread.h>
#endif // RTM_OS_LINUX
-#include <coil/Time.h>
-#include <coil/TimeValue.h>
-#include <rtm/PeriodicExecutionContext.h>
-#include <rtm/RTObjectStateMachine.h>
#include <string.h>
+#include <algorithm>
+#include <iostream>
+#include <string>
#define DEEFAULT_PERIOD 0.000001
namespace RTC_exp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -27,8 +27,9 @@
#include <rtm/idl/DataPortSkel.h>
#include <rtm/ConnectorListener.h>
+#include <assert.h>
#include <iostream>
-#include <assert.h>
+#include <string>
namespace RTC
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-18 08:03:50 UTC (rev 2866)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-18 09:26:35 UTC (rev 2867)
@@ -25,6 +25,7 @@
#include <memory>
#include <iostream>
+#include <vector>
// ACE
namespace SDOPackage
More information about the openrtm-commit
mailing list