[openrtm-commit:02250] r2858 - 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日 (水) 14:24:01 JST 

Author: sec_fukai
Date: 2017-01-18 14:24:01 +0900 (Wed, 18 Jan 2017)
New Revision: 2858

Modified:
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.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/OS.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Typename.h
Log:
[compat,->DEV_IQ_2016]Modify include order. refs #3810

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,9 +20,10 @@
 #ifndef COIL_ALLOCATOR_H
 #define COIL_ALLOCATOR_H
 
+#include <coil/Singleton.h>
+
 #include <stddef.h>
 #include <new>
-#include <coil/Singleton.h>
 
 namespace coil
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,12 +19,13 @@
 #ifndef COIL_CLOCKMANAGER_H
 #define COIL_CLOCKMANAGER_H
 
-#include <string>
 #include <coil/Singleton.h>
 #include <coil/TimeValue.h>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 
+#include <string>
+
 namespace coil
 {
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,13 +20,14 @@
 #ifndef COIL_FACTORY_H
 #define COIL_FACTORY_H
 
+#include <coil/Singleton.h>
+
 #include <assert.h>
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <map>
 #include <vector>
-#include <coil/Singleton.h>
 
 // for Windows DLL export
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,6 +20,9 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
+#include <coil/Mutex.h>
+#include <coil/Guard.h>
+
 #include <fstream>
 #include <iostream>
 #include <limits.h>
@@ -27,9 +30,6 @@
 #include <utility>
 #include <vector>
 
-#include <coil/Mutex.h>
-#include <coil/Guard.h>
-
 #ifndef LINE_MAX
 #define LINE_MAX  1024
 #endif

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,11 +20,6 @@
 #ifndef COIL_PERIODICTASK_H
 #define COIL_PERIODICTASK_H
 
-#include <map>
-#include <string>
-#include <vector>
-#include <algorithm>
-
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <coil/Condition.h>
@@ -32,6 +27,11 @@
 #include <coil/TimeMeasure.h>
 #include <coil/PeriodicTaskBase.h>
 
+#include <algorithm>
+#include <map>
+#include <string>
+#include <vector>
+
 namespace coil
 {
   /*!

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,8 +20,8 @@
 #ifndef COIL_TIMEMEASURE_H
 #define COIL_TIMEMEASURE_H
 
+#include <coil/TimeValue.h>
 #include <vector>
-#include <coil/TimeValue.h>
 
 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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -17,14 +17,15 @@
  *
  */
 
-#include <algorithm>
-#include <iostream>
-#include <cstring>
+#include <coil/stringutil.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <limits.h>
-#include <coil/stringutil.h>
 #include <string.h>
+#include <algorithm>
+#include <iostream>
+#include <cstring>
 #include <cctype>
 #include <cstdio>
 

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,10 +20,10 @@
 #ifndef COIL_CONDITION_H
 #define COIL_CONDITION_H
 
+#include <sys/time.h>
 #include <pthread.h>
 #include <algorithm>
 #include <ctime>
-#include <sys/time.h>
 
 namespace coil
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,9 +19,9 @@
 #ifndef COIL_DYNAMICLIB_H
 #define COIL_DYNAMICLIB_H
 
+#include <coil/config_coil.h>
 #include <dlfcn.h>
 #include <string>
-#include <coil/config_coil.h>
 
 #define COIL_DEFAULT_DYNLIB_MODE RTLD_LAZY
 

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,15 +19,15 @@
 #ifndef COIL_FILE_H
 #define COIL_FILE_H
 
-#include <cstring>
+#include <coil/config_coil.h>
+#include <coil/stringutil.h>
+
 #include <dirent.h>
 #include <libgen.h>
+#include <sys/types.h>
 #include <string>
-#include <sys/types.h>
+#include <cstring>
 
-#include <coil/config_coil.h>
-#include <coil/stringutil.h>
-
 #ifdef __QNX__
 using std::strlen;
 using std::strcpy;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,11 +19,11 @@
 #ifndef COIL_OS_H
 #define COIL_OS_H
 
-#include <string>
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string>
 
 extern "C"
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,11 +20,12 @@
 #ifndef COIL_PROCESS_H
 #define COIL_PROCESS_H
 
+#include <coil/stringutil.h>
+
 #include <libgen.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string>
-#include <unistd.h>
-#include <coil/stringutil.h>
 
 namespace coil
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,13 +19,14 @@
 #ifndef COIL_TIME_H
 #define COIL_TIME_H
 
-#include <unistd.h>
+#include <coil/config_coil.h>
+#include <coil/TimeValue.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
 #include <iostream>
-#include <coil/config_coil.h>
-#include <coil/TimeValue.h>
+#include <unistd.h>
 
 namespace coil
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -18,9 +18,11 @@
  */
 
 #include <coil/UUID.h>
+
+#include <string.h>
 #include <iostream>
-#include <string.h>
 
+
 #ifdef COIL_OS_FREEBSD
 void error_code(uint32_t status)
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,9 +20,10 @@
 #ifndef COIL_CONDITION_H
 #define COIL_CONDITION_H
 
+#include <coil/Mutex.h>
+
 #include <windows.h>
 #include <algorithm>
-#include <coil/Mutex.h>
 #include <iostream>
 
 namespace coil

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,10 +19,11 @@
 #ifndef COIL_DYNAMICLIB_H
 #define COIL_DYNAMICLIB_H
 
+#include <coil/config_coil.h>
+
 #include <windows.h>
 #include <iostream>
 #include <string>
-#include <coil/config_coil.h>
 
 #define COIL_DEFAULT_DYNLIB_MODE LOAD_WITH_ALTERED_SEARCH_PATH
 

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,11 +19,12 @@
 #ifndef COIL_FILE_H
 #define COIL_FILE_H
 
-#include <string>
-#include <windows.h>
 #include <coil/config_coil.h>
 #include <coil/stringutil.h>
 
+#include <windows.h>
+#include <string>
+
 namespace coil
 {
   const unsigned int MaxPathLength(1024);

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,10 +20,11 @@
 #ifndef COIL_PROCESS_H
 #define COIL_PROCESS_H
 
+#include <coil/stringutil.h>
+
+#include <string>
 #include <windows.h>
 #include <tchar.h>
-#include <string>
-#include <coil/stringutil.h>
 
 namespace coil
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -15,9 +15,10 @@
  *
  */
 
+#include <rtm/CORBA_IORUtil.h>
+
 #include <iostream>
 #include <sstream>
-#include <rtm/CORBA_IORUtil.h>
 
 #define POA_NAME_SEP            '\xff'
 #define TRANSIENT_SUFFIX_SEP    '\xfe'

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -18,9 +18,10 @@
 #ifndef CORBA_IORUTIL_H
 #define CORBA_IORUTIL_H
 
-#include <string>
 #include <rtm/RTC.h>
 
+#include <string>
+
 /*!
  * @if jp
  * @namespace CORBA_IORUtil

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,14 +19,16 @@
 #ifndef RTC_COMPONENTACTIONLISTENER_H
 #define RTC_COMPONENTACTIONLISTENER_H
 
-#include <vector>
-#include <utility>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
+
 #include <rtm/RTC.h>
 #include <rtm/idl/RTCSkel.h>
 #include <rtm/ConnectorBase.h>
 
+#include <vector>
+#include <utility>
+
 namespace RTC
 {
   typedef ExecutionContextHandle_t UniqueId;

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -17,9 +17,10 @@
  */
 
 #include <rtm/ConfigAdmin.h>
-#include <algorithm>
+
 #include <assert.h>
 #include <string.h>
+#include <algorithm>
 
 namespace RTC
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,13 +19,14 @@
 #ifndef RTC_CONFIGADMIN_H
 #define RTC_CONFIGADMIN_H
 
-#include <string>
-#include <vector>
-#include <iostream>
 #include <coil/Properties.h>
 #include <coil/stringutil.h>
 #include <rtm/ConfigurationListener.h>
 
+#include <string>
+#include <vector>
+#include <iostream>
+
 /*!
  * @if jp
  * @namespace RTC

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,12 +19,13 @@
 #ifndef RTC_CONFIGURATIONLISTENER_H
 #define RTC_CONFIGURATIONLISTENER_H
 
-#include <utility>
-#include <vector>
 #include <coil/Properties.h>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 
+#include <utility>
+#include <vector>
+
 namespace RTC
 {
   //============================================================

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,8 +20,6 @@
 #ifndef RTC_CONNECTORBASE_H
 #define RTC_CONNECTORBASE_H
 
-#include <string>
-#include <vector>
 #include <coil/stringutil.h>
 #include <coil/Properties.h>
 
@@ -30,6 +28,9 @@
 #include <rtm/DataPortStatus.h>
 #include <rtm/SystemLogger.h>
 
+#include <string>
+#include <vector>
+
 namespace RTC
 {
   /*!

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,14 +20,15 @@
 #ifndef RTC_CONNECTORLISTENER_H
 #define RTC_CONNECTORLISTENER_H
 
-#include <string>
-#include <vector>
-#include <utility>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <rtm/RTC.h>
 #include <rtm/ConnectorBase.h>
 
+#include <string>
+#include <vector>
+#include <utility>
+
 class cdrMemoryStream;
 
 namespace RTC

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,13 +20,14 @@
 #ifndef RTC_CORBAPORT_H
 #define RTC_CORBAPORT_H
 
-#include <list>
-#include <string>
-#include <vector>
 #include <rtm/PortBase.h>
 #include <rtm/CorbaConsumer.h>
 #include <rtm/NVUtil.h>
 
+#include <list>
+#include <string>
+#include <vector>
+
 /*!
  * @if jp
  * @namespace RTC

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -16,14 +16,15 @@
  *
  */
 
-#include <algorithm>
-#include <iostream>
 #include <coil/Time.h>
 #include <coil/TimeValue.h>
 #include <rtm/RTObject.h>
 #include <rtm/RTObjectStateMachine.h>
 #include <rtm/ExecutionContextWorker.h>
 
+#include <algorithm>
+#include <iostream>
+
 #define DEEFAULT_PERIOD 0.000001
 namespace RTC_impl
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -21,12 +21,12 @@
 
 #include <coil/Mutex.h>
 #include <coil/Condition.h>
-#include <vector>
 
 #include <rtm/idl/RTCSkel.h>
 #include <rtm/SystemLogger.h>
 //#include <rtm/StateMachine.h>
 //#include <rtm/RTObjectStateMachine.h>
+#include <vector>
 
 #define NUM_OF_LIFECYCLESTATE 4
 

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,10 +20,6 @@
 #ifndef RTC_INPORT_H
 #define RTC_INPORT_H
 
-#include <string>
-#include <vector>
-#include <iostream>
-
 #include <coil/TimeValue.h>
 #include <coil/Time.h>
 #include <coil/OS.h>
@@ -37,6 +33,10 @@
 #include <rtm/PortCallback.h>
 #include <rtm/InPortConnector.h>
 
+#include <string>
+#include <vector>
+#include <iostream>
+
 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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -17,9 +17,6 @@
  *
  */
 
-#include <algorithm>
-#include <iterator>
-
 #include <rtm/CORBA_SeqUtil.h>
 #include <rtm/NVUtil.h>
 #include <rtm/InPortBase.h>
@@ -29,6 +26,9 @@
 #include <rtm/InPortPushConnector.h>
 #include <rtm/InPortPullConnector.h>
 
+#include <algorithm>
+#include <iterator>
+
 namespace RTC
 {
 

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,12 +20,13 @@
 #ifndef RTC_INPORTBASE_H
 #define RTC_INPORTBASE_H
 
-#include <vector>
 #include <rtm/PortBase.h>
 #include <rtm/DataPortStatus.h>
 #include <rtm/CdrBufferBase.h>
 #include <rtm/ConnectorListener.h>
 
+#include <vector>
+
 /*!
  * @if jp
  * @namespace RTC

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,8 +20,6 @@
 #ifndef RTC_INPORTPROVIDER_H
 #define RTC_INPORTPROVIDER_H
 
-#include <string>
-
 #include <coil/Factory.h>
 
 #include <rtm/BufferBase.h>
@@ -30,6 +28,8 @@
 #include <rtm/DataPortStatus.h>
 #include <rtm/InPortConnector.h>
 
+#include <string>
+
 namespace RTC
 {
   class ConnectorListeners;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,12 +19,13 @@
 #ifndef RTM_UTIL_LISTENERHOLDER_H
 #define RTM_UTIL_LISTENERHOLDER_H
 
-#include <vector>
-#include <utility>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <coil/NonCopyable.h>
 
+#include <vector>
+#include <utility>
+
 namespace RTM
 {
 namespace util

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -25,8 +25,9 @@
 #include <rtm/CORBA_SeqUtil.h>
 #include <rtm/LocalServiceAdmin.h>
 #include <rtm/LocalServiceBase.h>
+
+#include <algorithm>
 #include <memory>
-#include <algorithm>
 #include <string.h>
 #include <vector>
 

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,8 +19,6 @@
 #ifndef RTC_LOCALSERVICEADMIN_H
 #define RTC_LOCALSERVICEADMIN_H
 
-#include <string>
-#include <vector>
 #include <coil/Mutex.h>
 #include <coil/Factory.h>
 #include <coil/Singleton.h>
@@ -29,6 +27,9 @@
 #include <rtm/SystemLogger.h>
 #include <rtm/LocalServiceBase.h>
 
+#include <string>
+#include <vector>
+
 namespace RTM
 {
   // forward decl

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,14 +19,14 @@
 #ifndef RTM_LOCALSERVICEBASE_H
 #define RTM_LOCALSERVICEBASE_H
 
-#include <string>
-#include <vector>
-
 #include <coil/Mutex.h>
 #include <coil/Factory.h>
 #include <coil/Timer.h>
 #include <coil/Properties.h>
 
+#include <string>
+#include <vector>
+
 namespace RTM
 {
 

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -29,8 +29,6 @@
 #include <rtm/PeriodicECSharedComposite.h>
 #include <rtm/RTCUtil.h>
 #include <rtm/ManagerServant.h>
-#include <fstream>
-#include <iostream>
 #include <coil/Properties.h>
 #include <coil/stringutil.h>
 #include <coil/Signal.h>
@@ -50,6 +48,9 @@
 #include <pthread.h>
 #endif // RTM_OS_LINUX
 
+#include <fstream>
+#include <iostream>
+
 #if defined(minor)
 #undef minor
 #endif

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -22,10 +22,6 @@
 
 #include <rtm/RTC.h>
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <coil/Task.h>
@@ -36,6 +32,11 @@
 #include <rtm/SystemLogger.h>
 #include <rtm/ManagerActionListener.h>
 
+#include <iostream>
+#include <string>
+#include <vector>
+
+
 namespace RTM
 {
   class ManagerServant;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,15 +19,16 @@
 #ifndef RTM_MANAGERACTIONLISTENER_H
 #define RTM_MANAGERACTIONLISTENER_H
 
-#include <string>
-#include <vector>
-#include <utility>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <coil/Properties.h>
 #include <coil/stringutil.h>
 #include <rtm/ListenerHolder.h>
 
+#include <string>
+#include <vector>
+#include <utility>
+
 // forward decl
 namespace RTC
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,12 +19,13 @@
 
 #include <rtm/RTC.h>
 #include <rtm/ManagerConfig.h>
-#include <fstream>
-#include <iostream>
 #include <coil/OS.h>
 #include <coil/stringutil.h>
 #include <rtm/DefaultConfiguration.h>
 
+#include <fstream>
+#include <iostream>
+
 #ifdef __QNX__
 using std::sprintf;
 #endif

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,9 +20,9 @@
 #ifndef RTC_MANAGERCONFIG_H
 #define RTC_MANAGERCONFIG_H
 
-#include <string>
 #include <coil/Properties.h>
 
+#include <string>
 
 namespace RTC
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,13 +20,14 @@
 #ifndef RTM_MANAGERSERVANT_H
 #define RTM_MANAGERSERVANT_H
 
-#include <iostream>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <rtm/idl/ManagerSkel.h>
 #include <rtm/Manager.h>
 #include <rtm/SystemLogger.h>
 
+#include <iostream>
+
 /*!
  * @if jp
  * @namespace RTM

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,10 +20,6 @@
 #ifndef RTC_MODULEMANAGER_H
 #define RTC_MODULEMANAGER_H
 
-// STL includes
-#include <string>
-#include <vector>
-#include <map>
 
 // ACE includes
 #include <coil/DynamicLib.h>
@@ -33,6 +29,10 @@
 #include <coil/Properties.h>
 #include <rtm/ObjectManager.h>
 
+// STL includes
+#include <string>
+#include <vector>
+#include <map>
 
 #define CONFIG_EXT    "manager.modules.config_ext"
 #define CONFIG_PATH   "manager.modules.config_path"

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -25,12 +25,13 @@
 #pragma warning( disable : 4312 )
 #endif // WIN32
 
-#include <map>
-#include <algorithm>
 #include <coil/stringutil.h>
 #include <rtm/NVUtil.h>
 #include <rtm/CORBA_SeqUtil.h>
 
+#include <map>
+#include <algorithm>
+
 #ifdef WIN32
 #pragma warning( pop )
 #endif // WIN32

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,11 +20,12 @@
 #ifndef NVUTIL_NVUTIL_H
 #define NVUTIL_NVUTIL_H
 
-#include <string>
-#include <iostream>
 #include <coil/Properties.h>
 #include <rtm/idl/SDOPackageSkel.h>
 
+#include <string>
+#include <iostream>
+
 /*!
  * @if jp
  * @namespace NVUtil

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -17,10 +17,6 @@
  *
  */
 
-#include <functional>
-#include <algorithm>
-#include <iostream>
-
 #include <coil/Routing.h>
 #include <coil/stringutil.h>
 
@@ -28,6 +24,10 @@
 #include <rtm/Manager.h>
 #include <rtm/CORBA_IORUtil.h>
 
+#include <algorithm>
+#include <functional>
+#include <iostream>
+
 namespace RTC
 {
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,8 +19,6 @@
 #ifndef RTC_NAMINGMANAGER_H
 #define RTC_NAMINGMANAGER_H
 
-#include <string>
-#include <vector>
 #include <rtm/RTC.h>
 
 #include <coil/Task.h>
@@ -31,6 +29,9 @@
 #include <rtm/SystemLogger.h>
 #include <rtm/ManagerServant.h>
 
+#include <string>
+#include <vector>
+
 namespace RTC
 {
   class Manager;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -21,12 +21,13 @@
 
 #include <rtm/RTC.h>
 
+#include <coil/Mutex.h>
+#include <coil/Guard.h>
+
+#include <algorithm>
 #include <vector>
 #include <string>
-#include <algorithm>
 
-#include <coil/Mutex.h>
-#include <coil/Guard.h>
 
 /*!
  * @if jp

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-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,10 +20,6 @@
 #ifndef RTC_OUTPORT_H
 #define RTC_OUTPORT_H
 
-#include <functional>
-#include <string>
-#include <vector>
-
 #include <coil/TimeValue.h>
 #include <coil/Time.h>
 #include <coil/TimeMeasure.h>
@@ -36,6 +32,11 @@
 #include <rtm/PortCallback.h>
 #include <rtm/OutPortConnector.h>
 
+#include <functional>
+#include <string>
+#include <vector>
+
+
 /*!
  * @if jp
  * @brief データにタイムスタンプをセットする

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,9 +20,6 @@
 #ifndef RTC_OUTPORTBASE_H
 #define RTC_OUTPORTBASE_H
 
-#include <vector>
-#include <string>
-
 #include <coil/Properties.h>
 #include <coil/stringutil.h>
 
@@ -34,6 +31,9 @@
 #include <rtm/SystemLogger.h>
 #include <rtm/ConnectorListener.h>
 
+#include <vector>
+#include <string>
+
 namespace RTC
 {
   class PublisherBase;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,8 +20,6 @@
 #ifndef RTC_OUTPORTPROVIDER_H
 #define RTC_OUTPORTPROVIDER_H
 
-#include <string>
-
 #include <coil/Factory.h>
 #include <rtm/BufferBase.h>
 #include <rtm/NVUtil.h>
@@ -29,6 +27,8 @@
 #include <rtm/DataPortStatus.h>
 #include <rtm/OutPortConnector.h>
 
+#include <string>
+
 namespace RTC
 {
   class ConnectorListeners;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,9 +20,6 @@
 #ifndef RTC_PERIODICECSHAREDCOMPOSITE_H
 #define RTC_PERIODICECSHAREDCOMPOSITE_H
 
-#include <string>
-#include <utility>
-#include <vector>
 #include <rtm/idl/RTCSkel.h>
 #include <rtm/idl/OpenRTMSkel.h>
 #include <rtm/RTObject.h>
@@ -30,6 +27,10 @@
 #include <rtm/SdoOrganization.h>
 #include <coil/stringutil.h>
 
+#include <string>
+#include <utility>
+#include <vector>
+
 /*!
  * @if jp
  * @namespace SDOPackage

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,15 +19,15 @@
 #ifndef RTC_PERIODICEXECUTIONCONTEXT2_H
 #define RTC_PERIODICEXECUTIONCONTEXT2_H
 
-#include <vector>
-#include <iostream>
-
 #include <coil/Task.h>
 #include <coil/Mutex.h>
 #include <coil/Condition.h>
 
 #include <rtm/ExecutionContextBase.h>
 
+#include <vector>
+#include <iostream>
+
 #define NUM_OF_LIFECYCLESTATE 4
 
 #ifdef WIN32

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,8 +19,8 @@
 #include <rtm/RTC.h>
 #include <rtm/PortAdmin.h>
 #include <rtm/CORBA_SeqUtil.h>
+#include <string.h>
 #include <functional>
-#include <string.h>
 #include <vector>
 
 namespace RTC

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,12 +20,13 @@
 #ifndef RTC_PORTADMIN_H
 #define RTC_PORTADMIN_H
 
-#include <string>
 #include <rtm/idl/RTCSkel.h>
 #include <rtm/PortBase.h>
 #include <rtm/ObjectManager.h>
 #include <rtm/SystemLogger.h>
 
+#include <string>
+
 namespace RTC
 {
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -22,8 +22,6 @@
 
 #include <rtm/RTC.h>
 
-#include <string>
-#include <vector>
 #include <coil/Guard.h>
 #include <coil/Mutex.h>
 #include <rtm/idl/RTCSkel.h>
@@ -31,7 +29,10 @@
 #include <rtm/NVUtil.h>
 #include <rtm/SystemLogger.h>
 #include <rtm/PortConnectListener.h>
+
 #include <iostream>
+#include <string>
+#include <vector>
 
 #ifdef WIN32
 #pragma warning( disable : 4290 )

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,13 +19,14 @@
 #ifndef RTC_PORTCONNECTLISTENER_H
 #define RTC_PORTCONNECTLISTENER_H
 
-#include <vector>
-#include <utility>
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 #include <rtm/RTC.h>
 #include <rtm/idl/RTCSkel.h>
 
+#include <vector>
+#include <utility>
+
 namespace RTC
 {
   //============================================================

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,7 +20,6 @@
 #define RTC_PORTPROFILEHELPER_H
 
 
-#include <string>
 // RTC header include
 #include <rtm/RTC.h>
 #include <rtm/Util.h>
@@ -31,6 +30,7 @@
 // CORBA header include
 #include <rtm/idl/RTCSkel.h>
 
+#include <string>
 
 
 

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -17,9 +17,6 @@
  *
  */
 
-#include <iostream>
-#include <assert.h>
-
 #include <coil/Properties.h>
 #include <coil/stringutil.h>
 
@@ -30,6 +27,9 @@
 #include <rtm/idl/DataPortSkel.h>
 #include <rtm/ConnectorListener.h>
 
+#include <iostream>
+#include <assert.h>
+
 namespace RTC
 {
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -18,8 +18,6 @@
 #ifndef RTC_RTOBJECT_H
 #define RTC_RTOBJECT_H
 
-#include <string>
-#include <vector>
 // CORBA header include
 #include <coil/Properties.h>
 
@@ -37,6 +35,9 @@
 #include <rtm/SdoServiceAdmin.h>
 #include <rtm/PortConnectListener.h>
 
+#include <string>
+#include <vector>
+
 #define ECOTHER_OFFSET 1000
 
 namespace SDOPackage

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,8 +19,8 @@
 #include <rtm/RTObjectStateMachine.h>
 #include <rtm/Manager.h>
 #include <rtm/RTObject.h>
+#include <stdio.h>
 #include <iostream>
-#include <stdio.h>
 
 namespace RTC_impl
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,11 +19,7 @@
 
 #ifndef RTC_RINGBUFFER_H
 #define RTC_RINGBUFFER_H
-
-#include <string>
 #include <vector>
-#include <algorithm>
-#include <iostream>
 
 #include <coil/TimeValue.h>
 #include <coil/Mutex.h>
@@ -34,6 +30,10 @@
 #include <rtm/BufferBase.h>
 #include <rtm/BufferStatus.h>
 
+#include <algorithm>
+#include <iostream>
+#include <string>
+
 #define RINGBUFFER_DEFAULT_LENGTH 8
 /*!
  * @if jp

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 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -16,11 +16,13 @@
  *
  */
 
+#include "rtm/SdoConfiguration.h"
+
 #include <coil/UUID.h>
-#include "rtm/SdoConfiguration.h"
 #include <rtm/CORBA_SeqUtil.h>
 #include <rtm/NVUtil.h>
 #include <rtm/ExecutionContextBase.h>
+
 #include <memory>
 #include <iostream>
 // ACE

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,8 +20,6 @@
 #ifndef RTC_SDOCONFIGURATION_H
 #define RTC_SDOCONFIGURATION_H
 
-#include <string>
-
 // CORBA header include
 #include <rtm/RTC.h>
 #include <coil/Mutex.h>
@@ -33,6 +31,8 @@
 #include <rtm/SystemLogger.h>
 #include <rtm/SdoServiceAdmin.h>
 
+#include <string>
+
 // SdoConfiguration with SeqEx 159120
 // SdoConfiguration with SeqUtil 114504 114224
 

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -23,10 +23,12 @@
 #include <rtm/RTC.h>
 #include <rtm/idl/SDOPackageSkel.h>
 #include <rtm/SystemLogger.h>
-#include <string>
+
 #include <coil/Mutex.h>
 #include <coil/Guard.h>
 
+#include <string>
+
 /*!
  * @if jp
  * @namespace SDOPackage

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,13 +19,16 @@
 #include <coil/UUID.h>
 #include <coil/Guard.h>
 #include <coil/stringutil.h>
+
 #include <rtm/RTObject.h>
 #include <rtm/CORBA_SeqUtil.h>
 #include <rtm/SdoServiceAdmin.h>
 #include <rtm/SdoServiceProviderBase.h>
 #include <rtm/SdoServiceConsumerBase.h>
+
+#include <string.h>
+
 #include <memory>
-#include <string.h>
 #include <vector>
 
 namespace RTC

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,14 +19,15 @@
 #ifndef RTC_SDOSERVICEADMIN_H
 #define RTC_SDOSERVICEADMIN_H
 
-#include <string>
-#include <vector>
 #include <coil/Mutex.h>
 #include <coil/Factory.h>
 
 #include <rtm/idl/SDOPackageStub.h>
 #include <rtm/SystemLogger.h>
 
+#include <string>
+#include <vector>
+
 namespace RTC
 {
   class RTObject_impl;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,11 +19,12 @@
 #ifndef RTC_STATEMACHINE_H
 #define RTC_STATEMACHINE_H
 
+#include <coil/Mutex.h>
+#include <coil/Guard.h>
+
 #include <cassert>
 #include <utility>
 #include <vector>
-#include <coil/Mutex.h>
-#include <coil/Guard.h>
 
 namespace RTC_Utils
 {

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -19,10 +19,8 @@
 #ifndef RTC_SYSTEMLOGGER_H
 #define RTC_SYSTEMLOGGER_H
 
-#include <string>
 #include <rtm/config_rtc.h>
 
-// COIL
 #include <coil/Time.h>
 #include <coil/ClockManager.h>
 #include <coil/Logger.h>
@@ -30,6 +28,8 @@
 #include <coil/Guard.h>
 #include <coil/stringutil.h>
 
+#include <string>
+
 namespace RTC
 {
   typedef ::coil::LogStreamBuffer LogStreamBuf;

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Typename.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Typename.h	2017-01-18 04:58:23 UTC (rev 2857)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Typename.h	2017-01-18 05:24:01 UTC (rev 2858)
@@ -20,9 +20,10 @@
 #ifndef RTC_TYPENAME_H
 #define RTC_TYPENAME_H
 
-#include <iostream>
 #include <rtm/RTC.h>
 
+#include <iostream>
+
 namespace CORBA_Util
 {
   /*!

More information about the openrtm-commit mailing list