[openrtm-commit:02264] r2869 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/ace/coil coil/common coil/posix/coil coil/win32/coil rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 18日 (水) 18:34:46 JST
Author: sec_fukai
Date: 2017-01-18 18:34:46 +0900 (Wed, 18 Jan 2017)
New Revision: 2869
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/DynamicLib.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Signal.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Task.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
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/Guard.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Listener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h
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/Mutex.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.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.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/Signal.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.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.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h
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.cpp
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/OS.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.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/Signal.h
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.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferStatus.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/CORBA_SeqUtil.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrBufferBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.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.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataFlowComponentBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataInPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataOutPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultPeriodicTask.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.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/ExtTrigExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.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/InPortConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h
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.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
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/NumberingPolicy.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.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/OutPortConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h
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/PortCallback.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/PublisherBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTC.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h
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.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
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 coding style. refs #3816
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -85,4 +85,4 @@
Mutex& m_mutex;
};
}; // namespace coil
-#endif // COIL_CONDITION_H
+#endif // COIL_CONDITION_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/DynamicLib.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/DynamicLib.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/DynamicLib.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -29,4 +29,4 @@
typedef ACE_DLL DynamicLib;
};
-#endif // DynamicLib_h
+#endif // DynamicLib_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -36,4 +36,4 @@
}
}; // namespace coil
-#endif // COIL_FILE_H
+#endif // COIL_FILE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -67,4 +67,4 @@
Mutex& operator=(const Mutex &);
};
}; // namespace coil
-#endif // COIL_MUTEX_H
+#endif // COIL_MUTEX_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -53,4 +53,4 @@
typedef ACE_Get_Opt GetOpt;
}; // namespace coil
-#endif // COIL_OS_H
+#endif // COIL_OS_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Signal.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Signal.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Signal.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -34,4 +34,4 @@
typedef ACE_Sig_Action SignalAction;
typedef void (*SignalHandler)(int);
};
-#endif // COIL_SIGNAL_H
+#endif // COIL_SIGNAL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Task.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Task.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Task.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -34,4 +34,4 @@
typedef ACE_Task<ACE_MT_SYNCH> Task;
};
-#endif // COIL_TASK_H
+#endif // COIL_TASK_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -73,10 +73,10 @@
inline int settimeofday(const struct timeval *tv , const struct timezone *tz)
{
- return 0; // no implementation
+ return 0; // no implementation
}
}; // namespace coil
-#endif // COIL_TIME_H
+#endif // COIL_TIME_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -49,4 +49,4 @@
#endif
};
}; // namespace coil
-#endif // COIL_UUID_H
+#endif // COIL_UUID_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/atomic.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -52,4 +52,4 @@
#define atomic_exchange_add(x, y) \
exchange_add(x, y, &__mutex)
-#endif // COIL_ATOMIC_H
+#endif // COIL_ATOMIC_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -155,4 +155,4 @@
};
}; // namespace coil
-#endif // COIL_ALLOCATOR_H
+#endif // COIL_ALLOCATOR_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -587,4 +587,4 @@
}; // namespace coil
-#endif // COIL_ASYNC_H
+#endif // COIL_ASYNC_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -133,4 +133,4 @@
return *clockmgr;
}
#endif
-}; // namespace coil
+}; // 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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -192,5 +192,5 @@
LogicalClock m_logicalClock;
AdjustedClock m_adjustedClock;
};
-}; // namespace coil
-#endif // COIL_CLOCKMANAGER_H
+}; // namespace coil
+#endif // COIL_CLOCKMANAGER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -621,5 +621,5 @@
friend class Singleton<GlobalFactory>;
};
-}; // namespace coil
-#endif // COIL_FACTORY_H
+}; // namespace coil
+#endif // COIL_FACTORY_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -91,4 +91,4 @@
M& m_mutex;
};
}; // namespace coil
-#endif // COIL_GUARD_H
+#endif // COIL_GUARD_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Listener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Listener.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Listener.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -246,4 +246,4 @@
CallbackFunc m_cbf;
};
-#endif // Listener_h
+#endif // Listener_h
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -930,4 +930,4 @@
typedef log_stream<char> LogStream;
}; // namespace coil
-#endif // LOGGER_H
+#endif // LOGGER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -167,4 +167,4 @@
};
}; // namespace coil
-#endif // COIL_NONCOPYABLE_H
+#endif // COIL_NONCOPYABLE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -275,10 +275,10 @@
*/
int PeriodicTask::svc()
{
- while (m_alive.value) // needs lock?
+ while (m_alive.value) // needs lock?
{
if (m_periodMeasure) { m_periodTime.tack(); }
- { // wait if suspended
+ { // wait if suspended
Guard suspend_gaurd(m_suspend.mutex);
if (m_suspend.suspend)
{
@@ -361,5 +361,5 @@
++m_periodCount;
}
-}; // namespace coil
+}; // namespace coil
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -533,6 +533,6 @@
};
-}; // namespace coil
+}; // namespace coil
-#endif // COIL_PERIODICTASK_H
+#endif // COIL_PERIODICTASK_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -511,6 +511,6 @@
virtual coil::TimeMeasure::Statistics getPeriodStat() = 0;
};
-}; // namespace coil
+}; // namespace coil
-#endif // COIL_PERIODICTASKBASE_H
+#endif // COIL_PERIODICTASKBASE_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -565,8 +565,8 @@
{
while (!leaf.empty())
{
- if (leaf.back() != NULL) // recursive delete
- delete leaf.back(); // back() returns always new
+ if (leaf.back() != NULL) // recursive delete
+ delete leaf.back(); // back() returns always new
}
}
@@ -608,7 +608,7 @@
{
if ((str[i] == ':' || str[i] == '=') && !coil::isEscaped(str, i))
{
- key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
+ key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
coil::eraseHeadBlank(key);
coil::eraseTailBlank(key);
value = str.substr(i + 1);
@@ -625,7 +625,7 @@
{
if ((str[i] == ' ') && !coil::isEscaped(str, i))
{
- key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
+ key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
coil::eraseHeadBlank(key);
coil::eraseTailBlank(key);
value = str.substr(i + 1);
@@ -689,7 +689,7 @@
return NULL;
}
- if (index < keys.size() - 1) // node
+ if (index < keys.size() - 1) // node
{
return next->_getNode(keys, ++index, next);
}
@@ -843,4 +843,4 @@
{
return rhs._dump(lhs, rhs, 0);
}
-}; // namespace coil
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1315,7 +1315,7 @@
*/
friend std::ostream& operator<<(std::ostream& lhs, const Properties& rhs);
- }; // class Properties
-}; // namespace coil
-#endif // COIL_PROPERTIES_H
+ }; // class Properties
+}; // namespace coil
+#endif // COIL_PROPERTIES_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -211,4 +211,4 @@
Singleton<SingletonClass>::m_mutex;
}; // namespace coil
-#endif // COIL_SINGLETON_H
+#endif // COIL_SINGLETON_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -59,7 +59,7 @@
*/
void TimeMeasure::tick()
{
- m_begin = gettimeofday(); // [TimeValue]
+ m_begin = gettimeofday(); // [TimeValue]
}
/*!
@@ -173,4 +173,4 @@
return s;
}
-}; // namespace coil
+}; // 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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -244,5 +244,5 @@
bool m_recurred;
};
-}; // namespace coil
-#endif // COIL_TIMEMEASURE_H
+}; // namespace coil
+#endif // COIL_TIMEMEASURE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -68,12 +68,12 @@
TimeValue TimeValue::operator-(TimeValue& tm)
{
TimeValue res;
- if (m_sec >= tm.m_sec) // +
+ if (m_sec >= tm.m_sec) // +
{
if (m_usec >= tm.m_usec) /* 繰り下がり無し */
{
- res.m_sec = m_sec - tm.m_sec; // -
- res.m_usec = m_usec - tm.m_usec; // +
+ res.m_sec = m_sec - tm.m_sec; // -
+ res.m_usec = m_usec - tm.m_usec; // +
}
else /* m_usec < tm.m_usec 繰り下がり有り */
{
@@ -81,11 +81,11 @@
res.m_usec = (m_usec + 1000000) - tm.m_usec;
}
}
- else // m_sec < tm.m_sec // -
+ else // m_sec < tm.m_sec // -
{
if (tm.m_usec >= m_usec) /* 繰り下がり無し */
{
- res.m_sec = - (tm.m_sec - m_sec); // +
+ res.m_sec = - (tm.m_sec - m_sec); // +
res.m_usec = - (tm.m_usec - m_usec); // +
}
else /* tm.m_usec < m_usec 繰り下がり有り */
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -22,7 +22,7 @@
namespace coil
{
-#define TIMEVALUE_ONE_SECOND_IN_USECS 1000000 // 1 [sec] = 1000000 [usec]
+#define TIMEVALUE_ONE_SECOND_IN_USECS 1000000 // 1 [sec] = 1000000 [usec]
/*!
* @if jp
@@ -273,4 +273,4 @@
};
}; // namespace coil
-#endif // COIL_TIMEVALUE_H
+#endif // COIL_TIMEVALUE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -334,5 +334,5 @@
Mutex m_taskMutex;
};
}; // namespace coil
-#endif // Timer_h
+#endif // Timer_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -188,4 +188,4 @@
}
return c ^ 0xffffffffL;
}
-}; //namespace coil
+}; // 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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -644,4 +644,4 @@
return std::string(str);
}
-}; // namespace coil
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -24,7 +24,7 @@
#include <vector>
#include <sstream>
-#if defined (_MSC_VER) && (_MSC_VER <=1500) // VC2008(VC9.0) or before
+#if defined (_MSC_VER) && (_MSC_VER <=1500) // VC2008(VC9.0) or before
#else
#include <stdint.h>
#endif
@@ -839,4 +839,4 @@
std::string sprintf(char const * __restrict fmt, ...);
}; // namespace coil
-#endif // COIL_STRINGUTIL_H
+#endif // COIL_STRINGUTIL_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -196,4 +196,4 @@
M& m_mutex;
};
}; // namespace coil
-#endif // COIL_CONDITION_H
+#endif // COIL_CONDITION_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -288,4 +288,4 @@
}; // namespace coil
-#endif // DynamicLib_h
+#endif // DynamicLib_h
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -191,4 +191,4 @@
}
}; // namespace coil
-#endif // COIL_FILE_H
+#endif // COIL_FILE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -162,4 +162,4 @@
Mutex& operator=(const Mutex &);
};
}; // namespace coil
-#endif // COIL_MUTEX_H
+#endif // COIL_MUTEX_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -275,4 +275,4 @@
}; // namespace coil
-#endif // COIL_OS_H
+#endif // COIL_OS_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -46,11 +46,11 @@
pid_t pid;
if ((pid = fork()) < 0 )
- { // fork failed
+ { // fork failed
return -1;
}
- if (pid == 0) // I'm child process
+ if (pid == 0) // I'm child process
{
// signal(SIGCHLD, SIG_IGN);
// signal(SIGALRM, SIG_IGN);
@@ -82,5 +82,5 @@
}
-}; // namespace coil
-#endif // COIL_PROCESS_H
+}; // namespace coil
+#endif // COIL_PROCESS_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -60,5 +60,5 @@
int daemon(int nochdir, int noclose);
-}; // namespace coil
-#endif // COIL_PROCESS_H
+}; // namespace coil
+#endif // COIL_PROCESS_H
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-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -18,9 +18,9 @@
*/
#include <stdio.h>
-#include <netdb.h> // gethostbyname
-#include <arpa/inet.h> // inet_ntoa
-#include <netinet/in.h> // sockaddr_in
+#include <netdb.h> // gethostbyname
+#include <arpa/inet.h> // inet_ntoa
+#include <netinet/in.h> // sockaddr_in
#include <sys/wait.h>
#include <coil/Routing.h>
@@ -74,7 +74,7 @@
size_t ifname_pos(1);
cmd += dest_addr;
cmd += " 2> /dev/null";
-#endif // COIL_OS_IS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
+#endif // COIL_OS_IS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
#if defined(COIL_OS_LINUX)
std::string cmd("PATH=/bin:/sbin:/usr/bin:/usr/sbin "
"ip route get ");
@@ -82,7 +82,7 @@
const char* delimiter = " ";
cmd += dest_addr;
cmd += " 2> /dev/null";
-#endif // COIL_OS_IS_LINUX
+#endif // COIL_OS_IS_LINUX
FILE* fp;
if ((fp = popen(cmd.c_str(), "r")) == NULL)
@@ -111,7 +111,7 @@
wait(NULL);
return true;
}
-#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
+#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
#if defined(COIL_OS_LINUX)
for (int i(0); i < vs.size(); ++i)
{
@@ -122,7 +122,7 @@
return true;
}
}
-#endif // COIL_OS_LINUX
+#endif // COIL_OS_LINUX
} while (!feof(fp));
pclose(fp);
wait(NULL);
@@ -172,4 +172,4 @@
return false;
}
-}; // namespace coil
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -109,4 +109,4 @@
};
}; // namespace coil
-#endif // COIL_SIGNAL_H
+#endif // COIL_SIGNAL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -264,4 +264,4 @@
};
}; // namespace coil
-#endif // COIL_TASK_H
+#endif // COIL_TASK_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -195,4 +195,4 @@
}; // namespace coil
-#endif // COIL_TIME_H
+#endif // COIL_TIME_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -74,4 +74,4 @@
}; // namespace coil
#endif
-#endif // COIL_UUID_H
+#endif // COIL_UUID_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/atomic.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -63,5 +63,5 @@
#define atomic_exchange_add(x, y) \
exchange_add(x, y, &__mutex)
-#endif // COIL_HAS_ATOMIC_ADD
-#endif // COIL_ATOMIC_H
+#endif // COIL_HAS_ATOMIC_ADD
+#endif // COIL_ATOMIC_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -57,13 +57,13 @@
cv->waiters_count_ = 0;
cv->was_broadcast_ = 0;
cv->sema_ = ::CreateSemaphore (NULL, // no security
- 0, // initially 0
- 0x7fffffff, // max count
+ 0, // initially 0
+ 0x7fffffff, // max count
NULL); // unnamed
cv->waiters_done_ = ::CreateEvent (NULL, // no security
- FALSE, // auto-reset
- FALSE, // non-signaled initially
- NULL); // unnamed
+ FALSE, // auto-reset
+ FALSE, // non-signaled initially
+ NULL); // unnamed
return 0;
}
@@ -406,4 +406,4 @@
}; // class Condition
}; // namespace coil
-#endif // COIL_CONDITION_H
+#endif // COIL_CONDITION_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -103,7 +103,7 @@
* @if jp
* @brief 動的リンクライブラリのロード
* @else
- * @brief Load of the Dynamic link library
+ * @brief Load of the Dynamic link library
* @endif
*/
int DynamicLib::open(const char* dll_name,
@@ -124,7 +124,7 @@
* @if jp
* @brief 動的リンクライブラリのアンロード
* @else
- * @brief Unload of the Dynamic link library
+ * @brief Unload of the Dynamic link library
* @endif
*/
int DynamicLib::close(void)
@@ -168,7 +168,7 @@
/* Because it is a normal termination when the error code is 0, */
/* return NULL. */
- if (dwcode == 0)
+ if (dwcode == 0)
{
return NULL;
}
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -304,4 +304,4 @@
}; // namespace coil
-#endif // DynamicLib_h
+#endif // DynamicLib_h
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -246,14 +246,14 @@
std::string::size_type pos(path.find("/"));
if (pos == std::string::npos)
{
- path.push_back('\\'); // delim = '\'
+ path.push_back('\\'); // delim = '\'
}
else
{
- path.push_back('/'); // delim = '/'
+ path.push_back('/'); // delim = '/'
}
}
- path.push_back('*'); // now path is "/dir/dir/../*"
+ path.push_back('*'); // now path is "/dir/dir/../*"
// fd will be held by DIR structure
HANDLE dhandle;
@@ -456,4 +456,4 @@
}; // namespace coil
-#endif // COIL_FILE_H
+#endif // COIL_FILE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -475,4 +475,4 @@
}; // namespace coil
-#endif // COIL_OS_H
+#endif // COIL_OS_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -40,7 +40,7 @@
// std::string -> LPTSTR
LPTSTR lpcommand = new TCHAR[command.size() + 1];
_tcscpy(lpcommand, command.c_str());
-#endif // UNICODE
+#endif // UNICODE
STARTUPINFO si;
ZeroMemory( &si, sizeof(si) );
@@ -66,5 +66,5 @@
// not implemented
return 0;
}
-}; // namespace coil
+}; // namespace coil
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -90,7 +90,7 @@
return line;
}
};
-}; // namespace coil
+}; // namespace coil
inline FILE* popen(const char* cmd, const char* mode)
{
@@ -102,4 +102,4 @@
_pclose(fd);
}
-#endif // COIL_PROCESS_H
+#endif // COIL_PROCESS_H
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-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -22,11 +22,11 @@
#define WINVER _WIN32_WINNT
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
-#endif // _WIN32_WINNT
+#endif // _WIN32_WINNT
#define _WIN32_WINNT 0x0500
#define _WIN32_WINDOWS _WIN32_WINNT
#define _WIN32_IE 0x0501
-#endif // NTDDI_VERSION
+#endif // NTDDI_VERSION
#include <winsock2.h>
#include <ws2tcpip.h>
@@ -88,15 +88,15 @@
++i;
}
}
-
+
UINT ipaddress(inet_addr(dest_addr.c_str()));
if (ipaddress == INADDR_NONE) { return false; }
-
+
DWORD bestifindex;
if (NO_ERROR != GetBestInterface(ipaddress, &bestifindex)) { return false; }
-
+
PMIB_IPADDRTABLE ipaddr_table;
- ipaddr_table =
+ ipaddr_table =
reinterpret_cast<MIB_IPADDRTABLE *>(MALLOC(sizeof (MIB_IPADDRTABLE)));
if (ipaddr_table == 0) { return false; }
@@ -110,7 +110,7 @@
}
if (ipaddr_table == 0) { return false; }
if (GetIpAddrTable(ipaddr_table, &size, 0) != NO_ERROR) { return false; }
-
+
for (int i(0); i < static_cast<int>(ipaddr_table->dwNumEntries); ++i)
{
if (bestifindex == ipaddr_table->table[i].dwIndex)
@@ -123,6 +123,6 @@
}
return false;
}
-
-
-}; // namespace coil
+
+
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -122,4 +122,4 @@
};
}; // namespace coil
-#endif // COIL_SIGNAL_H
+#endif // COIL_SIGNAL_H
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-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -93,12 +93,12 @@
if (m_count == 0)
{
m_thread =
- (HANDLE)::_beginthreadex(NULL, // security
- 0, //stuck size
- Task::svc_run, // func
- reinterpret_cast<void*>(this), // argument
- 0, // flag (0 or CREATE_SUSPEND)
- NULL); //thread descripter
+ (HANDLE)::_beginthreadex(NULL, // security
+ 0, // stuck size
+ Task::svc_run, // func
+ reinterpret_cast<void*>(this), // argument
+ 0, // flag (0 or CREATE_SUSPEND)
+ NULL); // thread descripter
++m_count;
};
}
@@ -167,7 +167,7 @@
{
reset();
}
-
+
/*!
* @if jp
* @brief スレッド実行を開始する
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -263,4 +263,4 @@
};
}; // namespace coil
-#endif // COIL_TASK_H
+#endif // COIL_TASK_H
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-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -353,4 +353,4 @@
}; // namespace coil
-#endif // COIL_TIME_H
+#endif // COIL_TIME_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -35,7 +35,7 @@
: m_uuidstr(0)
{
}
-
+
/*!
* @if jp
* @brief UUIDクラス コンストラクタ
@@ -79,7 +79,7 @@
return m_uuidstr;
}
}
-
+
//------------------------------------------------------------
// UUID_Generator class
//------------------------------------------------------------
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -90,7 +90,7 @@
private:
uuid_t m_uuid;
char* m_uuidstr;
- }; // class UUID
+ }; // class UUID
//------------------------------------------------------------
@@ -159,7 +159,7 @@
* @endif
*/
coil::UUID* generateUUID(int n, int h);
- }; // class UUID_Generator
+ }; // class UUID_Generator
}; // namespace coil
-#endif // COIL_UUID_H
+#endif // COIL_UUID_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/atomic.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -59,5 +59,5 @@
#define atomic_exchange_add(x, y) \
exchange_add(x, y, &__mutex)
-#endif // COIL_HAS_ATOMIC_ADD
-#endif // COIL_ATOMIC_H
+#endif // COIL_HAS_ATOMIC_ADD
+#endif // COIL_ATOMIC_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -808,5 +808,5 @@
DataType m_data;
long int m_length;
};
-}; // namespace RTC
-#endif // BufferBase_h
+}; // namespace RTC
+#endif // BufferBase_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferStatus.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferStatus.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/BufferStatus.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -129,7 +129,7 @@
return str[status];
}
};
-}; // namespace RTC
+}; // namespace RTC
/*!
* @if jp
@@ -164,4 +164,4 @@
using ::RTC::BufferStatus::TIMEOUT; \
using ::RTC::BufferStatus::PRECONDITION_NOT_MET;
-#endif // RTC_BUFFERSTATUS_H
+#endif // RTC_BUFFERSTATUS_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -43,7 +43,7 @@
static void print_tagged_components(std::stringstream& sstr,
IOP::MultipleComponentProfile& comps);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
/*!
@@ -130,10 +130,10 @@
ior.type_id = IOP::IOR::unmarshaltype_id(buf);
ior.profiles <<= buf;
return true;
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
// RtORB does not supports this function
return false;
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
/*!
@@ -190,10 +190,10 @@
iorstr = result;
delete[] result;
return true;
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
// RtORB does not this function.
return false;
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
/*!
@@ -237,7 +237,7 @@
{
return false;
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
return false;
}
@@ -306,9 +306,9 @@
<< std::endl;
}
}
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
retstr << "RtORB does't support formatIORinfo() function." << std::endl;
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
return retstr.str();
}
@@ -464,7 +464,7 @@
sstr << " Broken component" << std::endl;
}
}
-#endif // defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
+#endif // defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}; // namespace CORBA_IORUtil
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -79,5 +79,5 @@
*/
std::string formatIORinfo(const char* iorstr);
-}; // namespace CORBA_IORUtil
-#endif // CORBA_IORUTIL_H
+}; // namespace CORBA_IORUtil
+#endif // CORBA_IORUTIL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_SeqUtil.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -427,5 +427,5 @@
}
return iorlist;
}
-}; // namespace CORBA_SeqUtil
-#endif // CORBA_SEQUTIL_H
+}; // namespace CORBA_SeqUtil
+#endif // CORBA_SEQUTIL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrBufferBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrBufferBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrBufferBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -29,5 +29,5 @@
{
typedef BufferBase<cdrMemoryStream> CdrBufferBase;
typedef ::coil::GlobalFactory<CdrBufferBase> CdrBufferFactory;
-}; // namespace RTC
-#endif // RTC_CDRBUFFERBASE_H
+}; // namespace RTC
+#endif // RTC_CDRBUFFERBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -24,7 +24,7 @@
namespace RTC
{
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
@@ -36,4 +36,4 @@
coil::Destructor<RTC::CdrBufferBase, RTC::CdrRingBuffer>);
}
};
-#endif // InPortConsumer_h
+#endif // InPortConsumer_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CdrRingBuffer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -26,10 +26,10 @@
namespace RTC
{
typedef RingBuffer<cdrMemoryStream> CdrRingBuffer;
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
void CdrRingBufferInit();
};
-#endif // RTC_CDRRINGBUFFER_H
+#endif // RTC_CDRRINGBUFFER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1076,6 +1076,6 @@
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_COMPONENTACTIONLISTENER_H
+#endif // RTC_COMPONENTACTIONLISTENER_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -553,4 +553,4 @@
}
-}; // namespace RTC
+}; // 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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1565,5 +1565,5 @@
ConfigurationListeners m_listeners;
};
-}; // namespace RTC
-#endif // RTC_CONFIGADMIN_H
+}; // namespace RTC
+#endif // RTC_CONFIGADMIN_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -745,6 +745,6 @@
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_CONFIGURATIONLISTENER_H
+#endif // RTC_CONFIGURATIONLISTENER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -305,6 +305,6 @@
// ConnectorBase(const ConnectorBase& x);
// ConnectorBase& operator=(const ConnectorBase& x);
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_CONNECTORBASE_H
+#endif // RTC_CONNECTORBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -176,6 +176,6 @@
m_listeners[i].first->operator()(info);
}
}
-}; //namespace RTC
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -31,14 +31,14 @@
#pragma warning( disable : 4290 )
#pragma warning( disable : 4311 )
#pragma warning( disable : 4312 )
-#endif // WIN32
+#endif // WIN32
#include <omniORB4/CORBA.h>
#ifdef WIN32
#pragma warning( default : 4267 )
#pragma warning( default : 4290 )
#pragma warning( default : 4311 )
#pragma warning( default : 4312 )
-#endif // WIN32
+#endif // WIN32
#endif
#ifdef ORB_IS_ORBACUS
#include <OB/CORBA.h>
@@ -457,7 +457,7 @@
if (!CorbaConsumerBase::setObject(obj))
{
releaseObject();
- return false; // object is nil
+ return false; // object is nil
}
ObjectTypeVar var = ObjectType::_narrow(m_objref);
@@ -563,5 +563,5 @@
*/
ObjectTypeVar m_var;
};
-}; // namespace RTC
-#endif // RTC_CORBACONSUMER_H
+}; // namespace RTC
+#endif // RTC_CORBACONSUMER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1703,11 +1703,11 @@
private:
CORBA::ULong m_blLength;
- }; // class CorbaNaming
-}; // namespace RTC
+ }; // class CorbaNaming
+}; // namespace RTC
#ifdef WIN32
#pragma warning( default : 4290 )
#endif
-#endif // end of RTC_CORBANAMING_H
+#endif // end of RTC_CORBANAMING_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -238,7 +238,7 @@
connector_profile.properties[len1 + i] = properties[i];
}
}
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(connector_profile.properties, properties);
#endif
@@ -262,7 +262,7 @@
const NVList& nv(connector_profile.properties);
RTC_DEBUG_STR((NVUtil::toString(nv)));
- bool strict(false); // default is "best_effort"
+ bool strict(false); // default is "best_effort"
CORBA::Long index(NVUtil::find_index(nv, "port.connection.strictness"));
if (index >= 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-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1244,7 +1244,7 @@
CORBA::String_var ior_var = orb->object_to_string(obj);
m_ior = ior_var;
deactivate();
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
// why RtORB does not activate object by __this()
// and does not deactivate at the end of ctor?
PortableServer::POA_var poa = ::RTC::Manager::instance().getPOA();
@@ -1254,7 +1254,7 @@
CORBA::ORB_var orb = Manager::instance().getORB();
CORBA::String_var ior_var = orb->object_to_string(obj);
m_ior = ior_var;
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
virtual ~CorbaProviderHolder()
{
@@ -1389,4 +1389,4 @@
};
};
}; // namespace RTC
-#endif // RTC_CORBAPORT_H
+#endif // RTC_CORBAPORT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataFlowComponentBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataFlowComponentBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataFlowComponentBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -126,5 +126,5 @@
// PeriodicExecutionContext* m_pec;
// ExecutionContextService_var m_ecref;
};
-}; // namespace RTC
-#endif // RTC_DATAFLOWCOMPONENTBASE_H
+}; // namespace RTC
+#endif // RTC_DATAFLOWCOMPONENTBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataInPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataInPort.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataInPort.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -22,4 +22,4 @@
#include <rtm/InPort.h>
-#endif // RTC_DATAINPORT_H
+#endif // RTC_DATAINPORT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataOutPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataOutPort.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataOutPort.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -22,4 +22,4 @@
#include <rtm/OutPort.h>
-#endif // RTC_DATAOUTPORT_H
+#endif // RTC_DATAOUTPORT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -246,4 +246,4 @@
using ::RTC::DataPortStatus::CONNECTION_LOST; \
using ::RTC::DataPortStatus::UNKNOWN_ERROR;
-#endif // RTC_DATAPORTSTATUS_H
+#endif // RTC_DATAPORTSTATUS_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultPeriodicTask.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultPeriodicTask.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultPeriodicTask.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -33,4 +33,4 @@
void DefaultPeriodicTaskInit();
};
-#endif // RTC_DEFAULTPERIODICTASK_H
+#endif // RTC_DEFAULTPERIODICTASK_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -358,4 +358,4 @@
ECDeleteFunc m_Delete;
};
}; // namespace RTC
-#endif // RTC_ECFACTORY_H
+#endif // RTC_ECFACTORY_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -242,4 +242,4 @@
-}; // namespace RTC
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1212,4 +1212,4 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_EXECUTIONCONTEXTBASE_H
+#endif // RTC_EXECUTIONCONTEXTBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -575,11 +575,11 @@
return m_comp->_is_equivalent(comp);
}
};
- }; // class ExecutionContextProfile
+ }; // class ExecutionContextProfile
}; // namespace RTC_impl
#ifdef WIN32
#pragma warning( default : 4290 )
#endif
-#endif // RTC_EXECUTIONCONTEXTPROFILE_H
+#endif // RTC_EXECUTIONCONTEXTPROFILE_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -507,5 +507,5 @@
updateComponentList();
}
-}; // namespace RTC_impl
+}; // 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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -599,11 +599,11 @@
mutable coil::Mutex m_removedMutex;
typedef std::vector<RTC_impl::RTObjectStateMachine*>::iterator CompItr;
- }; // class PeriodicExecutionContext
+ }; // class PeriodicExecutionContext
}; // namespace RTC_impl
#ifdef WIN32
#pragma warning( default : 4290 )
#endif
-#endif // RTC_PERIODICEXECUTIONCONTEXT_H
+#endif // RTC_PERIODICEXECUTIONCONTEXT_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -112,7 +112,7 @@
m_worker.ticked_ ? "true" : "false"));
while (!m_worker.ticked_)
{
- m_worker.cond_.wait(); // wait for tick
+ m_worker.cond_.wait(); // wait for tick
RTC_DEBUG(("Thread was woken up."));
}
if (!m_worker.ticked_) { continue; }
@@ -127,7 +127,7 @@
m_worker.ticked_ = false;
}
coil::TimeValue period(getPeriod());
- if (1) //count > 1000)
+ if (1) // count > 1000)
{
RTC_PARANOID(("Period: %f [s]", static_cast<double>(period)));
RTC_PARANOID(("Execution: %f [s]", static_cast<double>(t1 - t0)));
@@ -139,7 +139,7 @@
if (1 /*count > 1000*/) { RTC_PARANOID(("sleeping...")); }
coil::sleep((coil::TimeValue)(period - (t1 - t0)));
}
- if (1) //count > 1000)
+ if (1) // count > 1000)
{
coil::TimeValue t3(coil::gettimeofday());
RTC_PARANOID(("Slept: %f [s]", static_cast<double>(t3 - t2)));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -685,4 +685,4 @@
void ExtTrigExecutionContextInit(RTC::Manager* manager);
};
-#endif // RTC_EXTTRIGEXECUTIONCONTEXT_H
+#endif // RTC_EXTTRIGEXECUTIONCONTEXT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -405,4 +405,4 @@
NumberingPolicy* m_policy;
};
}; // namespace RTC
-#endif // RTC_FACTORY_H
+#endif // RTC_FACTORY_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -702,4 +702,4 @@
};
}; // namespace RTC
-#endif // RTC_INPORT_H
+#endif // RTC_INPORT_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file InPortBase.cpp
* @brief Base class of InPort
@@ -485,7 +485,7 @@
{
coil::Properties conn_prop;
NVUtil::copyToProperties(conn_prop, cprof.properties);
- prop << conn_prop.getNode("dataport"); // marge ConnectorProfile
+ prop << conn_prop.getNode("dataport"); // marge ConnectorProfile
/*
* marge ConnectorProfile for buffer property.
* e.g.
@@ -558,7 +558,7 @@
{
coil::Properties conn_prop;
NVUtil::copyToProperties(conn_prop, cprof.properties);
- prop << conn_prop.getNode("dataport"); // marge ConnectorProfile
+ prop << conn_prop.getNode("dataport"); // marge ConnectorProfile
/*
* marge ConnectorProfile for buffer property.
* e.g.
@@ -570,7 +570,7 @@
RTC_DEBUG(("ConnectorProfile::properties are as follows."));
RTC_DEBUG_STR((prop));
- bool littleEndian; // true: little, false: big
+ bool littleEndian; // true: little, false: big
if (!checkEndian(prop, littleEndian))
{
RTC_ERROR(("unsupported endian"));
@@ -840,7 +840,7 @@
InPortProviderFactory::instance().deleteObject(provider);
return 0;
}
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
// RtORB's copy ctor's bug?
::SDOPackage::NVList_ptr prop_ref(cprof.properties);
if (!provider->publishInterface(*prop_ref))
@@ -849,7 +849,7 @@
InPortProviderFactory::instance().deleteObject(provider);
return 0;
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
return provider;
}
@@ -918,13 +918,13 @@
cprof.connector_id,
CORBA_SeqUtil::refToVstring(cprof.ports),
prop);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
ConnectorInfo profile(cprof.name,
cprof.connector_id,
CORBA_SeqUtil::
refToVstring(RTC::PortServiceList(cprof.ports)),
prop);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
try
{
@@ -979,13 +979,13 @@
cprof.connector_id,
CORBA_SeqUtil::refToVstring(cprof.ports),
prop);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
ConnectorInfo profile(cprof.name,
cprof.connector_id,
CORBA_SeqUtil::
refToVstring(RTC::PortServiceList(cprof.ports)),
prop);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
try
{
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -888,6 +888,6 @@
*/
ConnectorListeners m_listeners;
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_INPORTBASE_H
+#endif // RTC_INPORTBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -153,4 +153,4 @@
return m_littleEndian;
}
-}; // namespace RTC
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConnector.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -283,6 +283,6 @@
ConnectorListeners* m_outPortListeners;
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_INPORTCONNECTOR_H
+#endif // RTC_INPORTCONNECTOR_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -34,7 +34,7 @@
{
class NVList;
};
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
class cdrMemoryStream;
@@ -259,6 +259,6 @@
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<InPortConsumer>;
#endif
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_INPORTCONSUMER_H
+#endif // RTC_INPORTCONSUMER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -299,7 +299,7 @@
mutable Logger rtclog;
coil::Properties m_properties;
};
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
@@ -319,5 +319,5 @@
void InPortCorbaCdrConsumerInit(void);
};
-#endif // RTC_INPORTCORBACDRCONSUMER_H
+#endif // RTC_INPORTCORBACDRCONSUMER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -384,7 +384,7 @@
InPortConnector* m_connector;
}; // class InPortCorCdrbaProvider
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
@@ -408,5 +408,5 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_INPORTCORBACDRPROVIDER_H
+#endif // RTC_INPORTCORBACDRPROVIDER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -228,7 +228,7 @@
mutable Logger rtclog;
coil::Properties m_properties;
};
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
@@ -248,5 +248,5 @@
void InPortDirectConsumerInit(void);
};
-#endif // RTC_INPORTDIRECTCONSUMER_H
+#endif // RTC_INPORTDIRECTCONSUMER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -371,5 +371,5 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_INPORTDIRECTPROVIDER_H
+#endif // RTC_INPORTDIRECTPROVIDER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -531,5 +531,5 @@
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<InPortProvider>;
#endif
-}; // namespace RTC
-#endif // RTC_INPORTPROVIDER_H
+}; // namespace RTC
+#endif // RTC_INPORTPROVIDER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -214,7 +214,7 @@
*
* @endif
*/
- virtual void activate() {} // do nothing
+ virtual void activate() {} // do nothing
/*!
* @if jp
@@ -230,7 +230,7 @@
*
* @endif
*/
- virtual void deactivate() {} // do nothing
+ virtual void deactivate() {} // do nothing
protected:
/*!
@@ -291,6 +291,6 @@
*/
ConnectorListeners& m_listeners;
};
-}; // namespace RTC
+}; // namespace RTC
#endif // RTC_PULL_CONNECTOR_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -214,7 +214,7 @@
*
* @endif
*/
- virtual void activate() {} // do nothing
+ virtual void activate() {} // do nothing
/*!
* @if jp
@@ -230,7 +230,7 @@
*
* @endif
*/
- virtual void deactivate() {} // do nothing
+ virtual void deactivate() {} // do nothing
protected:
/*!
@@ -293,6 +293,6 @@
bool m_deleteBuffer;
};
-}; // namespace RTC
+}; // namespace RTC
#endif // RTC_PUSH_CONNECTOR_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -255,4 +255,4 @@
} \
}
-#endif // RTM_UITL_LISTENERHOLDER_H
+#endif // RTM_UITL_LISTENERHOLDER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -276,4 +276,4 @@
};
}; // namespace RTM
-#endif // RTC_LOCALSERVICEADMIN_H
+#endif // RTC_LOCALSERVICEADMIN_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -295,6 +295,6 @@
EXTERN template class DLL_PLUGIN
::coil::GlobalFactory< ::RTM::LocalServiceBase >;
#endif
-}; // namespace RTM
+}; // namespace RTM
-#endif // RTM_LOCALSERVICEBASE_H
+#endif // RTM_LOCALSERVICEBASE_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -44,9 +44,9 @@
#ifdef RTM_OS_LINUX
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
-#endif // _GNU_SOURCE
+#endif // _GNU_SOURCE
#include <pthread.h>
-#endif // RTM_OS_LINUX
+#endif // RTM_OS_LINUX
#include <fstream>
#include <iostream>
@@ -484,9 +484,9 @@
connectors[i].c_str()));
}
}
- } // end of pre-connection
+ } // end of pre-connection
- { // pre-activation
+ { // pre-activation
RTC_TRACE(("Components pre-activation: %s",
m_config["manager.components.preactivation"].c_str()));
std::vector<std::string> comps;
@@ -501,7 +501,7 @@
ExecutionContextList_var ecs = comp->get_owned_contexts();
ecs[0]->activate_component(comp->getObjRef());
}
- } // end of pre-activation
+ } // end of pre-activation
return true;
}
@@ -1445,11 +1445,11 @@
omniIOR::add_IIOP_ADDRESS(iiop_addr);
#else
omniIOR::add_IIOP_ADDRESS(iiop_addr, 0);
-#endif // defined(RTC_OMNIORB_40) and defined(RTC_OMNIORB_41)
+#endif // defined(RTC_OMNIORB_40) and defined(RTC_OMNIORB_41)
}
}
}
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
}
catch (...)
{
@@ -1542,8 +1542,8 @@
#else
// omniORB 4.0
opt += " -ORBendPointPublishAllIFs 1";
-#endif // RTC_CORBA_CXXMAPPING1
-#endif // ORB_IS_OMNIORB
+#endif // RTC_CORBA_CXXMAPPING1
+#endif // ORB_IS_OMNIORB
}
else
{
@@ -1607,7 +1607,7 @@
RTC_ERROR(("Exception cought during root POA destruction"));
#ifndef ORB_IS_RTORB
RTC_ERROR(("CORBA::SystemException(minor=%d)", ex.minor()));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
catch (...)
{
@@ -1630,7 +1630,7 @@
RTC_ERROR(("Exception caught during ORB shutdown"));
#ifndef ORB_IS_RTORB
RTC_ERROR(("CORBA::SystemException(minodor=%d)", ex.minor()));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
catch (...)
{
@@ -1682,7 +1682,7 @@
// NamingManager Timer update initialization
if (coil::toBool(m_config["naming.update.enable"], "YES", "NO", true))
{
- coil::TimeValue tm(10, 0); // default interval = 10sec for safty
+ coil::TimeValue tm(10, 0); // default interval = 10sec for safty
std::string intr(m_config["naming.update.interval"]);
if (!intr.empty())
{
@@ -1744,7 +1744,7 @@
// initialize CPU affinity
#ifdef RTM_OS_LINUX
initCpuAffinity();
-#endif // RTM_OS_LINUX
+#endif // RTM_OS_LINUX
return true;
}
@@ -1807,7 +1807,7 @@
RTC_DEBUG(("Current CPU affinity mask is %d.", j));
}
}
-#endif // RTM_OS_LINUX
+#endif // RTM_OS_LINUX
}
/*!
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -2305,7 +2305,7 @@
Finalized m_finalized;
::RTM::ManagerActionListeners m_listeners;
- }; // class Manager
-}; // namespace RTC
+ }; // class Manager
+}; // namespace RTC
-#endif // RTC_MANAGER_H
+#endif // RTC_MANAGER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -973,6 +973,6 @@
NamingActionListenerHolder naming_;
LocalServiceActionListenerHolder localservice_;
};
-}; // namespace RTM
+}; // namespace RTM
-#endif // RTC_MANAGERACTIONLISTENER_H
+#endif // RTC_MANAGERACTIONLISTENER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -162,7 +162,7 @@
}
}
break;
- case 'p': // ORB's port number
+ case 'p': // ORB's port number
{
int portnum;
if (coil::stringTo(portnum, get_opts.optarg))
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -400,5 +400,5 @@
*/
bool m_isMaster;
};
-}; // namespace RTC
-#endif // RTC_MANAGERCONFIG_H
+}; // namespace RTC
+#endif // RTC_MANAGERCONFIG_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -190,9 +190,9 @@
sprof = m_slaves[i]->get_loadable_modules();
#ifndef ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof.inout(), sprof.in());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof, sprof);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
continue;
}
}
@@ -244,9 +244,9 @@
sprof = m_slaves[i]->get_loaded_modules();
#ifndef ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof.inout(), sprof.in());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof, sprof);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
continue;
}
}
@@ -298,9 +298,9 @@
sprof = m_slaves[i]->get_factory_profiles();
#ifndef ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof.inout(), sprof.in());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof, sprof);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
continue;
}
}
@@ -332,7 +332,7 @@
if (pos0 == std::string::npos && pos1 == std::string::npos)
{
- if (false) //is_master())
+ if (false) // is_master())
{
RTC_ERROR(("Master manager cannot create component: %s",
module_name));
@@ -376,7 +376,7 @@
if (CORBA::is_nil(mgrobj))
{
std::string cmd("rtcd -p ");
- cmd += mgrvstr[1]; // port number
+ cmd += mgrvstr[1]; // port number
RTC_DEBUG(("Invoking command: %s.", cmd.c_str()));
int ret(coil::launch_shell(cmd.c_str()));
@@ -485,9 +485,9 @@
srtcs = m_slaves[i]->get_components();
#ifndef ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(crtcs.inout(), srtcs.in());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(srtcs, crtcs);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
continue;
}
}
@@ -535,9 +535,9 @@
sprofs = m_slaves[i]->get_component_profiles();
#ifndef ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprofs.inout(), sprofs.in());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprofs, sprofs);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
continue;
}
}
@@ -645,7 +645,7 @@
RTC_TRACE(("add_master_manager(), %d masters", m_masters.length()));
index = CORBA_SeqUtil::find(m_masters, is_equiv(mgr));
- if (!(index < 0)) // found in my list
+ if (!(index < 0)) // found in my list
{
RTC_ERROR(("Already exists."));
return RTC::BAD_PARAMETER;
@@ -672,7 +672,7 @@
CORBA::Long index;
index = CORBA_SeqUtil::find(m_masters, is_equiv(mgr));
- if (index < 0) // not found in my list
+ if (index < 0) // not found in my list
{
RTC_ERROR(("Not found."));
return RTC::BAD_PARAMETER;
@@ -713,7 +713,7 @@
CORBA::Long index;
index = CORBA_SeqUtil::find(m_slaves, is_equiv(mgr));
- if (!(index < 0)) // found in my list
+ if (!(index < 0)) // found in my list
{
RTC_ERROR(("Already exists."));
return RTC::BAD_PARAMETER;
@@ -738,7 +738,7 @@
CORBA::Long index;
index = CORBA_SeqUtil::find(m_slaves, is_equiv(mgr));
- if (index < 0) // not found in my list
+ if (index < 0) // not found in my list
{
RTC_ERROR(("Not found."));
return RTC::BAD_PARAMETER;
@@ -784,13 +784,13 @@
{
try
{
- //Ppreparing INS POA
+ // Ppreparing INS POA
CORBA::Object_var obj;
#ifndef ORB_IS_RTORB
obj = m_mgr.theORB()->resolve_initial_references("omniINSPOA");
-#else // ROB_IS_RTORB
+#else // ROB_IS_RTORB
obj = m_mgr.theORB()->resolve_initial_references(const_cast<char*>("omniINSPOA"));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
PortableServer::POA_ptr poa = PortableServer::POA::_narrow(obj);
poa->the_POAManager()->activate();
@@ -799,10 +799,10 @@
PortableServer::ObjectId_var id;
#ifndef ORB_IS_RTORB
id = PortableServer::string_to_ObjectId(config["manager.name"].c_str());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
id = PortableServer::
string_to_ObjectId(reinterpret_cast<char*>(config["manager.name"].c_str()));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
// Object activation
poa->activate_object_with_id(id.in(), this);
@@ -845,7 +845,7 @@
mobj = m_mgr.theORB()->string_to_object(mgrloc.c_str());
#ifndef ORB_IS_RTORB
RTM::Manager_var mgr = ::RTM::Manager::_narrow(mobj);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
RTM::Manager_var mgr;
if (!make_client_connection(mobj->impl()->connection))
{
@@ -855,7 +855,7 @@
{
mgr = ::RTM::Manager::_narrow(mobj);
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
CORBA::String_var ior;
ior = m_mgr.theORB()->object_to_string(RTM::Manager::_duplicate(mgr));
@@ -869,7 +869,7 @@
{
#ifndef ORB_IS_RTORB
RTC_DEBUG(("CORBA SystemException cought (CORBA::%s)", e._name()));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
catch (...)
{
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -670,5 +670,5 @@
};
};
-}; // namespace RTM
-#endif // RTM_MANAGERSERVANT_H
+}; // namespace RTM
+#endif // RTM_MANAGERSERVANT_H
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-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -571,4 +571,4 @@
modprops.push_back(p);
}
}
-}; // namespace RTC
+}; // namespace RTC
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -777,10 +777,10 @@
vProperties m_modprofs;
}; // class ModuleManager
-}; // namespace RTC
+}; // namespace RTC
#ifdef WIN32
#pragma warning( default : 4290 )
#endif
-#endif // RTC_MODULEMANAGER_H
+#endif // RTC_MODULEMANAGER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -23,7 +23,7 @@
#pragma warning( disable : 4290 )
#pragma warning( disable : 4311 )
#pragma warning( disable : 4312 )
-#endif // WIN32
+#endif // WIN32
#include <coil/stringutil.h>
#include <rtm/NVUtil.h>
@@ -35,7 +35,7 @@
#ifdef WIN32
#pragma warning( pop )
-#endif // WIN32
+#endif // WIN32
namespace NVUtil
{
@@ -108,9 +108,9 @@
*/
#ifndef ORB_IS_RTORB
void copyFromProperties(SDOPackage::NVList& nv, const coil::Properties& prop)
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
void copyFromProperties(SDOPackage_NVList& nv, const coil::Properties& prop)
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
{
std::vector<std::string> keys;
keys = prop.propertyNames();
@@ -122,9 +122,9 @@
// Why RtORB does not copy string to Properties.
#ifndef ORB_IS_RTORB
nv[i].name = CORBA::string_dup(keys[i].c_str());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
nv[i].name = reinterpret_cast<char *>(keys[i].c_str());
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
nv[i].value <<= prop[keys[i]].c_str();
}
}
@@ -314,10 +314,10 @@
#ifndef ORB_IS_RTORB
bool appendStringValue(SDOPackage::NVList& nv, const char* name,
const char* value)
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
bool appendStringValue(SDOPackage_NVList& nv, const char* name,
const char* value)
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
{
// if (!isString(nv, name)) return false;
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -255,9 +255,9 @@
*/
#ifndef ORB_IS_RTORB
void copyFromProperties(SDOPackage::NVList& nv, const coil::Properties& prop);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
void copyFromProperties(SDOPackage_NVList& nv, const coil::Properties& prop);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
/*!
* @if jp
@@ -504,10 +504,10 @@
#ifndef ORB_IS_RTORB
bool appendStringValue(SDOPackage::NVList& nv, const char* name,
const char* value);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
bool appendStringValue(SDOPackage_NVList& nv, const char* name,
const char* value);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
/*!
* @if jp
@@ -592,4 +592,4 @@
}; // namespace NVUtil
-#endif // NVUTIL_NVUTIL_H
+#endif // NVUTIL_NVUTIL_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -92,11 +92,11 @@
}
else
{
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
m_cosnaming.rebindByString(name, rtobj->getObjRef(), true);
#ifdef ORB_IS_OMNIORB
}
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
}
void NamingOnCorba::bindObject(const char* name,
@@ -123,11 +123,11 @@
}
else
{
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
m_cosnaming.rebindByString(name, port->getPortRef(), true);
#ifdef ORB_IS_OMNIORB
}
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
}
void NamingOnCorba::bindObject(const char* name,
@@ -154,11 +154,11 @@
}
else
{
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
m_cosnaming.rebindByString(name, mgr->getObjRef(), true);
#ifdef ORB_IS_OMNIORB
}
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
}
/*!
@@ -319,7 +319,7 @@
"YES", "NO", false));
for (int i(0), len(m_names.size()); i < len; ++i)
{
- if (m_names[i]->ns == 0) // if ns==NULL
+ if (m_names[i]->ns == 0) // if ns==NULL
{
RTC_DEBUG(("Retrying connection to %s/%s",
m_names[i]->method.c_str(),
@@ -587,12 +587,12 @@
{
nsobj = createNamingObj(ns->method.c_str(),
ns->nsname.c_str());
- if (nsobj != 0) // if succeed
+ if (nsobj != 0) // if succeed
{
RTC_INFO(("Connected to a name server: %s/%s",
ns->method.c_str(), ns->nsname.c_str()));
ns->ns = nsobj;
- bindCompsTo(nsobj); // rebind all comps to new NS
+ bindCompsTo(nsobj); // rebind all comps to new NS
return;
}
else
@@ -614,4 +614,4 @@
}
}
}
-}; // namespace RTC
+}; // 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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -888,7 +888,7 @@
* @endif
*/
Logger rtclog;
- }; // class NamingManager
-}; // namespace RTC
+ }; // class NamingManager
+}; // namespace RTC
-#endif // RTC_NAMINGMANAGER_H
+#endif // RTC_NAMINGMANAGER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -262,4 +262,4 @@
int m_num;
std::vector<void*> m_objects;
};
-#endif // RTC_NUMBERINGPOLICY_H
+#endif // RTC_NUMBERINGPOLICY_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -288,4 +288,4 @@
*/
Objects m_objects;
};
-#endif // RTC_OBJECTMANAGER_H
+#endif // RTC_OBJECTMANAGER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OpenHRPExecutionContext.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -526,5 +526,5 @@
DLL_EXPORT void OpenHRPExecutionContextInit(RTC::Manager* manager);
};
-#endif // RTC_OPENHRPEXECUTIONCONTEXT_H
+#endif // RTC_OPENHRPEXECUTIONCONTEXT_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -505,6 +505,6 @@
CORBA::Long m_propValueIndex;
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_OUTPORT_H
+#endif // RTC_OUTPORT_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1090,5 +1090,5 @@
*/
struct connector_cleanup;
};
-}; // End of namespace RTC
-#endif // RTC_RTCOUTPORTBASE_H
+}; // End of namespace RTC
+#endif // RTC_RTCOUTPORTBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -133,4 +133,4 @@
return m_littleEndian;
}
-}; // namespace RTC
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConnector.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -237,7 +237,7 @@
connectorData_[ON_BUFFER_WRITE].notify(m_profile, data);
RTC_PARANOID(("ON_BUFFER_WRITE(InPort,OutPort), "
"callback called in direct mode."));
- inport->write(data); // write to InPort variable!!
+ inport->write(data); // write to InPort variable!!
// ON_RECEIVED(In,Out) callback
m_listeners.
connectorData_[ON_RECEIVED].notify(m_profile, data);
@@ -327,6 +327,6 @@
ConnectorListeners* m_inPortListeners;
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_CONNECTORBASE_H
+#endif // RTC_CONNECTORBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -30,7 +30,7 @@
{
class NVList;
};
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
namespace coil
{
@@ -416,6 +416,6 @@
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<OutPortConsumer>;
#endif
-}; // namespace RTC
-#endif // RTC_OUTPORTCONSUMER_H
+}; // namespace RTC
+#endif // RTC_OUTPORTCONSUMER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -393,4 +393,4 @@
void OutPortCorbaCdrConsumerInit(void);
};
-#endif // RTC_OUTPORTCORBACDRCONSUMER_H
+#endif // RTC_OUTPORTCORBACDRCONSUMER_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -48,11 +48,11 @@
CORBA_SeqUtil::
push_back(m_properties,
NVUtil::newNV("dataport.corba_cdr.outport_ior", ior));
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
CORBA_SeqUtil::
push_back(m_properties,
NVUtil::newNV("dataport.corba_cdr.outport_ior", ior.in()));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
CORBA_SeqUtil::
push_back(m_properties,
NVUtil::newNV("dataport.corba_cdr.outport_ref", m_objref));
@@ -173,10 +173,10 @@
#ifndef ORB_IS_RTORB
data->length(len);
cdr.get_octet_array(&((*data)[0]), len);
-#else
+#else // ORB_IS_RTORB
data->length(len);
cdr.get_octet_array(reinterpret_cast<char *>(&((*data)[0]), static_cast<int>(len)));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
return convertReturn(ret, cdr);
@@ -236,7 +236,7 @@
return ::OpenRTM::UNKNOWN_ERROR;
}
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -382,4 +382,4 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_OUTPORTCORBACDRPROVIDER_H
+#endif // RTC_OUTPORTCORBACDRPROVIDER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -57,10 +57,10 @@
SDOPackage_NVList prop_ptr(*prop.cobj());
NVUtil::appendStringValue(prop_ptr, "dataport.interface_type",
m_interfaceType.c_str());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
NVUtil::appendStringValue(prop, "dataport.interface_type",
m_interfaceType.c_str());
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
NVUtil::append(prop, m_properties);
}
@@ -143,4 +143,4 @@
{
m_subscriptionType = subs_type;
}
-}; // namespace RTC
+}; // namespace RTC
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -551,5 +551,5 @@
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
EXTERN template class DLL_PLUGIN ::coil::GlobalFactory<OutPortProvider>;
#endif
-}; // namespace RTC
-#endif // RTC_OUTPORTPROVIDER_H
+}; // namespace RTC
+#endif // RTC_OUTPORTPROVIDER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -210,7 +210,7 @@
*
* @endif
*/
- virtual void activate() {} // do nothing
+ virtual void activate() {} // do nothing
/*!
* @if jp
@@ -226,7 +226,7 @@
*
* @endif
*/
- virtual void deactivate() {} // do nothing
+ virtual void deactivate() {} // do nothing
/*!
* @if jp
@@ -283,6 +283,6 @@
*/
CdrBufferBase* m_buffer;
};
-}; // namespace RTC
+}; // namespace RTC
#endif // RTC_PULL_CONNECTOR_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -354,6 +354,6 @@
CdrBufferBase* m_buffer;
};
-}; // namespace RTC
+}; // namespace RTC
#endif // RTC_PUSH_CONNECTOR_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -93,10 +93,10 @@
::OpenRTM::DataFlowComponent_var dfc;
#ifndef ORB_IS_RTORB
if (!sdoToDFC(sdo.in(), dfc.out())) { continue; }
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
::OpenRTM::DataFlowComponent_ptr dfc_ptr(dfc.object());
if (!sdoToDFC(sdo.in(), dfc_ptr)) { continue; }
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
Member member(dfc.in());
stopOwnedEC(member);
@@ -134,14 +134,14 @@
const SDO_var sdo = sdo_list[i];
::OpenRTM::DataFlowComponent_var dfc;
if (!sdoToDFC(sdo.in(), dfc.out())) { continue; }
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
const SDO_var sdo = sdo_list[i].object();
::OpenRTM::DataFlowComponent_var dfc;
::OpenRTM::DataFlowComponent_ptr dfc_ptr(dfc);
if (!sdoToDFC(sdo.in(), dfc_ptr)) { continue; }
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
Member member(dfc.in());
@@ -345,11 +345,11 @@
#ifndef ORB_IS_RTORB
::OpenRTM::DataFlowComponent_var dfc;
if (!sdoToDFC(sdos[j].in(), dfc.out())) { continue; }
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
::OpenRTM::DataFlowComponent_var dfc;
::OpenRTM::DataFlowComponent_ptr dfc_ptr(dfc);
if (!sdoToDFC(sdos[j].in(), dfc_ptr)) { continue; }
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
m_ec->add_component(dfc.in());
}
}
@@ -387,11 +387,11 @@
#ifndef ORB_IS_RTORB
::OpenRTM::DataFlowComponent_var dfc;
if (!sdoToDFC(sdos[j].in(), dfc.out())) { continue; }
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
::OpenRTM::DataFlowComponent_var dfc;
::OpenRTM::DataFlowComponent_ptr dfc_ptr(dfc);
if (!sdoToDFC(sdos[j].in(), dfc_ptr)) { continue; }
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
m_ec->remove_component(dfc.in());
}
}
@@ -413,9 +413,9 @@
#ifndef ORB_IS_RTORB
::RTC::PortProfileList& plist(member.profile_->port_profiles);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
::RTC::PortProfileList plist(member.profile_->port_profiles);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
// port delegation
for (::CORBA::ULong i(0), len(plist.length()); i < len; ++i)
@@ -462,9 +462,9 @@
#ifndef ORB_IS_RTORB
::RTC::PortProfileList& plist(member.profile_->port_profiles);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
::RTC::PortProfileList plist(member.profile_->port_profiles);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
// port delegation
for (::CORBA::ULong i(0), len(plist.length()); i < len; ++i)
@@ -524,8 +524,8 @@
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
- std::vector<std::string> createdPorts; // newPorts - interPorts
+ std::vector<std::string> removedPorts; // oldPorts - interPorts
+ std::vector<std::string> createdPorts; // newPorts - interPorts
set_difference(oldPorts.begin(), oldPorts.end(),
newPorts.begin(), newPorts.end(),
@@ -670,12 +670,12 @@
if (::CORBA::is_nil(sdo)) continue;
::CORBA_SeqUtil::push_back(sdos, sdo);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
sdo = ::SDOPackage::SDO::_duplicate((rtc->getObjRef()).in());
if (::CORBA::is_nil(sdo)) continue;
::CORBA_SeqUtil::push_back(sdos, ::SDOPackage::SDO_ptr(sdo));
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
try
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -718,7 +718,7 @@
*/
std::vector<int> m_cpu;
- }; // class PeriodicExecutionContext
+ }; // class PeriodicExecutionContext
}; // namespace RTC_exp
#ifdef WIN32
@@ -738,4 +738,4 @@
void PeriodicExecutionContextInit(RTC::Manager* manager);
};
-#endif // RTC_PERIODICEXECUTIONCONTEXT_H
+#endif // RTC_PERIODICEXECUTIONCONTEXT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicTaskFactory.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -34,4 +34,4 @@
#endif
};
-#endif // RTC_PERIODICTASKFACTORY_H
+#endif // RTC_PERIODICTASKFACTORY_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -600,5 +600,5 @@
ObjectManager<const char*, PortBase, comp_op<PortBase> > m_portServants;
};
-}; // namespace RTC
-#endif // RTC_PORTADMIN_H
+}; // namespace RTC
+#endif // RTC_PORTADMIN_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1949,9 +1949,9 @@
*/
#ifndef ORB_IS_RTORB
bool checkPorts(::RTC::PortServiceList& ports);
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
bool checkPorts(RTC_PortServiceList& ports);
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
inline void onNotifyConnect(const char* portname,
@@ -2276,4 +2276,4 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_PORTBASE_H
+#endif // RTC_PORTBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -432,4 +432,4 @@
}; // namespace RTC
-#endif // RTC_PORTCALLBACK_H
+#endif // RTC_PORTCALLBACK_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -513,6 +513,6 @@
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_PORTCONNECTLISTENER_H
+#endif // RTC_PORTCONNECTLISTENER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -622,5 +622,5 @@
};
}; // class PortProfileHelper
-}; // namespace RTC
-#endif // RTC_PORTPROFILEHELPER_H
+}; // namespace RTC
+#endif // RTC_PORTPROFILEHELPER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -367,4 +367,4 @@
EXTERN template class DLL_PLUGIN coil::GlobalFactory<PublisherBase>;
#endif
}; // namespace RTC
-#endif // RTC_PUBLISHERBASE_H
+#endif // RTC_PUBLISHERBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -218,7 +218,7 @@
return PORT_OK;
}
-}; // namespace RTC
+}; // namespace RTC
extern "C"
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -437,12 +437,12 @@
bool m_active;
};
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
void DLL_EXPORT PublisherFlushInit();
};
-#endif // RTC_PUBLISHERFLUSH_H
+#endif // RTC_PUBLISHERFLUSH_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -585,7 +585,7 @@
}
}
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -730,12 +730,12 @@
bool m_active;
int m_leftskip;
};
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
void DLL_EXPORT PublisherNewInit();
};
-#endif // RTC_PUBLISHERNEW_H
+#endif // RTC_PUBLISHERNEW_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -479,7 +479,7 @@
// Extracting publisher's period time
double hz;
if (!coil::stringTo(hz, prop["publisher.push_rate"].c_str()) &&
- !coil::stringTo(hz, prop["push_rate"].c_str())) // for 0.4 compatibility
+ !coil::stringTo(hz, prop["push_rate"].c_str())) // for 0.4 compatibility
{
RTC_ERROR(("publisher.push_rate/push_rate were not found."));
return false;
@@ -608,7 +608,7 @@
}
}
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -759,5 +759,4 @@
void DLL_EXPORT PublisherPeriodicInit();
};
-#endif // RTC_PUBLISHERPERIODIC_H
-
+#endif // RTC_PUBLISHERPERIODIC_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTC.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTC.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTC.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -34,7 +34,7 @@
#ifdef ORB_IS_RTORB
#include <RtORB/cdrStream.h>
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
#ifdef ORB_IS_OMNIORB
@@ -43,7 +43,7 @@
#pragma warning( disable : 4290 )
#pragma warning( disable : 4311 )
#pragma warning( disable : 4312 )
-#endif // WIN32
+#endif // WIN32
#include <omniORB4/CORBA.h>
#include <omnithread.h>
@@ -53,9 +53,9 @@
#pragma warning( default : 4290 )
#pragma warning( default : 4311 )
#pragma warning( default : 4312 )
-#endif // WIN32
+#endif // WIN32
-#endif // ORB_IS_OMNIORB
+#endif // ORB_IS_OMNIORB
#include <rtm/idl/OpenRTMSkel.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -76,5 +76,5 @@
mmc = RTC::MultiModeObject::_narrow(obj);
return !CORBA::is_nil(mmc);
}
-}; // namespace RTC_Utils
+}; // namespace RTC_Utils
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -188,5 +188,5 @@
* @endif
*/
bool isMultiModeObject(CORBA::Object_ptr obj);
-}; // namespace RTC_Utils
-#endif // RTCUtil_h
+}; // namespace RTC_Utils
+#endif // RTCUtil_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -512,7 +512,7 @@
execlist = new ExecutionContextList();
CORBA_SeqUtil::for_each(m_ecMine, ec_copy(execlist));
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
ExecutionContextList_var execlist;
execlist = new ExecutionContextList();
@@ -528,7 +528,7 @@
++j;
}
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
return execlist._retn();
}
@@ -723,7 +723,7 @@
profile->category =
CORBA::string_dup(m_properties["category"].c_str());
profile->port_profiles = m_portAdmin.getPortProfileList();
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
profile->instance_name =
reinterpret_cast<char *>(m_properties["instance_name"].c_str());
profile->type_name =
@@ -738,7 +738,7 @@
reinterpret_cast<char *>(m_properties["category"].c_str());
PortProfileList ppl = m_portAdmin.getPortProfileList();
profile->port_profiles = ppl._retn();
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
NVUtil::copyFromProperties(profile->properties, m_properties);
return profile._retn();
}
@@ -1342,11 +1342,11 @@
SDOPackage::Configuration_ptr config;
config = m_pSdoConfig;
return config;
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
SDOPackage::Configuration_var config;
config = m_pSdoConfig;
return config._retn();
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
catch (...)
{
@@ -1471,10 +1471,10 @@
m_properties["instance_name"] = instance_name;
#ifndef ORB_IS_RTORB
m_profile.instance_name = m_properties["instance_name"].c_str();
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
m_profile.instance_name =
reinterpret_cast<char *>(m_properties["instance_name"].c_str());
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
/*!
@@ -1535,7 +1535,7 @@
m_profile.version = m_properties["version"].c_str();
m_profile.vendor = m_properties["vendor"].c_str();
m_profile.category = m_properties["category"].c_str();
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
m_profile.instance_name =
reinterpret_cast<char*>(m_properties["instance_name"].c_str());
m_profile.type_name =
@@ -1548,7 +1548,7 @@
reinterpret_cast<char*>(m_properties["vendor"].c_str());
m_profile.category =
reinterpret_cast<char*>(m_properties["category"].c_str());
-#endif //ORB_IS_RTORB
+#endif // ORB_IS_RTORB
}
/*!
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -5003,4 +5003,4 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_RTOBJECT
+#endif // RTC_RTOBJECT
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -98,7 +98,7 @@
void setFsmParticipantAction(const RTC::LightweightRTObject_ptr comp);
void setMultiModeComponentAction(const RTC::LightweightRTObject_ptr comp);
- private: // member variables
+ private: // member variables
RTC::Logger rtclog;
// ExecutionContext id
RTC::ExecutionContextHandle_t m_id;
@@ -129,4 +129,4 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_RTOBJECTSTATEMACHINE_H
+#endif // RTC_RTOBJECTSTATEMACHINE_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -440,17 +440,17 @@
bool timedwrite(m_timedwrite);
bool overwrite(m_overwrite);
- if (!(sec < 0)) // if second arg is set -> block mode
+ if (!(sec < 0)) // if second arg is set -> block mode
{
timedwrite = true;
overwrite = false;
}
- if (overwrite && !timedwrite) // "overwrite" mode
+ if (overwrite && !timedwrite) // "overwrite" mode
{
advanceRptr();
}
- else if (!overwrite && !timedwrite) // "do_nothing" mode
+ else if (!overwrite && !timedwrite) // "do_nothing" mode
{
return ::RTC::BufferStatus::BUFFER_FULL;
}
@@ -720,7 +720,7 @@
bool timedread(m_timedread);
bool readback(m_readback);
- if (!(sec < 0)) // if second arg is set -> block mode
+ if (!(sec < 0)) // if second arg is set -> block mode
{
timedread = true;
readback = false;
@@ -736,7 +736,7 @@
}
advanceRptr(-1);
}
- else if (!readback && !timedread) // "do_nothing" mode
+ else if (!readback && !timedread) // "do_nothing" mode
{
return ::RTC::BufferStatus::BUFFER_EMPTY;
}
@@ -1053,6 +1053,6 @@
*/
condition m_full;
};
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_RINGBUFFER_H
+#endif // RTC_RINGBUFFER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -85,10 +85,10 @@
#ifndef ORB_IS_RTORB
conf.description = CORBA::string_dup(prop["description"].c_str());
conf.id = CORBA::string_dup(prop.getName());
-#else // ORB_IS_RTORB
+#else // ORB_IS_RTORB
conf.description = reinterpret_cast<char *>(prop["description"].c_str());
conf.id = reinterpret_cast<char *>(prop.getName());
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
NVUtil::copyFromProperties(conf.configuration_data, prop);
}
@@ -283,7 +283,7 @@
catch (...)
{
throw InternalError("Configuration::get_configuration_parameters()");
- //never reach here
+ // never reach here
}
// never reach here
return new ParameterList(0);
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -1179,10 +1179,10 @@
const std::string m_id;
};
}; // class Configuration_impl
-}; // namespace SDOPackage
+}; // namespace SDOPackage
#ifdef WIN32
#pragma warning( default : 4290 )
#endif
-#endif // RTC_SDOCONFIGURATION_H
+#endif // RTC_SDOCONFIGURATION_H
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:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -43,11 +43,11 @@
m_pId = uuid->to_string();
#ifdef WIN32
uuid->~UUID();
-#endif // WIN32
+#endif // WIN32
m_dependency = OWN;
m_objref = this->_this();
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
Organization_impl::Organization_impl(SDOSystemElement_ptr sdo)
: rtclog("organization"), m_varOwner(SDOSystemElement::_duplicate(sdo))
@@ -58,7 +58,7 @@
m_pId = uuid->to_string();
#ifdef WIN32
uuid->~UUID();
-#endif // WIN32
+#endif // WIN32
m_dependency = OWN;
m_objref = this->_this();
}
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -97,7 +97,7 @@
*/
#ifdef ORB_IS_RTORB
explicit Organization_impl(RTC::RTObject_ptr sdo);
-#endif // ORB_IS_RTROB
+#endif // ORB_IS_RTROB
explicit Organization_impl(SDOSystemElement_ptr sdo);
/*!
@@ -876,4 +876,4 @@
#pragma warning( default : 4290 )
#endif
-#endif // RTC_NAMESPACE SDOPACKAGE
+#endif // RTC_NAMESPACE SDOPACKAGE
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -375,4 +375,4 @@
}; // namespace RTC
-#endif // RTC_SDOSERVICEADMIN_H
+#endif // RTC_SDOSERVICEADMIN_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -249,6 +249,6 @@
EXTERN template class DLL_PLUGIN
::coil::GlobalFactory< ::RTC::SdoServiceConsumerBase >;
#endif
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_SDOSERVICECONSUMERBASE_H
+#endif // RTC_SDOSERVICECONSUMERBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -248,6 +248,6 @@
EXTERN template class DLL_PLUGIN
::coil::GlobalFactory< ::RTC::SdoServiceProviderBase >;
#endif
-}; // namespace RTC
+}; // namespace RTC
-#endif // RTC_SDOSERVICEPROVIDERBASE_H
+#endif // RTC_SDOSERVICEPROVIDERBASE_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -983,6 +983,6 @@
m_states.curr = curr;
}
};
-}; // namespace RTC_Utils
+}; // namespace RTC_Utils
-#endif // RTC_STATEMACHINE_H
+#endif // RTC_STATEMACHINE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2017-01-18 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2017-01-18 09:34:46 UTC (rev 2869)
@@ -126,15 +126,15 @@
{
const char* color[] =
{
- "\x1b[0m", // SLILENT (none)
- "\x1b[0m\x1b[31m", // FATAL (red)
- "\x1b[0m\x1b[35m", // ERROR (magenta)
- "\x1b[0m\x1b[33m", // WARN (yellow)
- "\x1b[0m\x1b[34m", // INFO (blue)
- "\x1b[0m\x1b[32m", // DEBUG (green)
- "\x1b[0m\x1b[36m", // TRACE (cyan)
- "\x1b[0m\x1b[39m", // VERBOSE (default)
- "\x1b[0m\x1b[37m" // PARANOID (white)
+ "\x1b[0m", // SLILENT (none)
+ "\x1b[0m\x1b[31m", // FATAL (red)
+ "\x1b[0m\x1b[35m", // ERROR (magenta)
+ "\x1b[0m\x1b[33m", // WARN (yellow)
+ "\x1b[0m\x1b[34m", // INFO (blue)
+ "\x1b[0m\x1b[32m", // DEBUG (green)
+ "\x1b[0m\x1b[36m", // TRACE (cyan)
+ "\x1b[0m\x1b[39m", // VERBOSE (default)
+ "\x1b[0m\x1b[37m" // PARANOID (white)
};
*this << color[level];
*this << getDate() + m_levelString[level] + m_name + ": ";
@@ -221,4 +221,4 @@
return RTL_SILENT;
}
-}; // namespace RTC
+}; // namespace RTC
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -102,17 +102,17 @@
{
public:
enum
- { // No: Write out messages include the following.
- RTL_SILENT, // 0: ()
- RTL_FATAL, // 1: (FATAL)
- RTL_ERROR, // 2: (FATAL, ERROR)
- RTL_WARN, // 3: (FATAL, ERROR, WARN)
- RTL_INFO, // 4: (FATAL, ERROR, WARN, INFO)
- RTL_DEBUG, // 5: (FATAL, ERROR, WARN, INFO, DEBUG)
- RTL_TRACE, // 6: (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
- RTL_VERBOSE, // 7: (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
- RTL_PARANOID // 8: (FATAL, ERROR, WARN, INFO,
- // DEBUG, TRACE, VERBOSE, PARA)
+ { // No: Write out messages include the following.
+ RTL_SILENT, // 0: ()
+ RTL_FATAL, // 1: (FATAL)
+ RTL_ERROR, // 2: (FATAL, ERROR)
+ RTL_WARN, // 3: (FATAL, ERROR, WARN)
+ RTL_INFO, // 4: (FATAL, ERROR, WARN, INFO)
+ RTL_DEBUG, // 5: (FATAL, ERROR, WARN, INFO, DEBUG)
+ RTL_TRACE, // 6: (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+ RTL_VERBOSE, // 7: (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+ RTL_PARANOID // 8: (FATAL, ERROR, WARN, INFO,
+ // DEBUG, TRACE, VERBOSE, PARA)
};
/*!
@@ -617,6 +617,6 @@
#define RTC_PARANOID_STR(str)
#endif
-}; // namespace RTC
+}; // namespace RTC
#endif // RTC_SYSTEMLOGGER_H
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 09:26:58 UTC (rev 2868)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Typename.h 2017-01-18 09:34:46 UTC (rev 2869)
@@ -247,7 +247,7 @@
return typecode<true, T>::id();
}
-}; // namespace CORBA_Util
+}; // namespace CORBA_Util
template <class T>
const char* toTypename()
@@ -257,4 +257,4 @@
return CORBA_Util::typecode<CORBA_Util::is_corba_object<T>::value, T>::name();
}
-#endif // RTC_TYPENAME_H
+#endif // RTC_TYPENAME_H
More information about the openrtm-commit
mailing list