[openrtm-commit:02247] r2855 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/common coil/posix/coil coil/win32/coil rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 18日 (水) 13:00:45 JST
Author: sec_fukai
Date: 2017-01-18 13:00:44 +0900 (Wed, 18 Jan 2017)
New Revision: 2855
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.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/Logger.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
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/InPortDirectProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.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/OutPortBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3816
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -55,7 +55,7 @@
*/
void* Allocator::NewArray(size_t t) throw (std::bad_alloc)
{
- return operator new [](t);
+ return operator new[](t);
}
/*!
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -133,7 +133,6 @@
: public Async
{
public:
-
/*!
* @if jp
*
@@ -302,7 +301,6 @@
: public Async
{
public:
-
/*!
* @if jp
*
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -20,7 +20,6 @@
#ifndef COIL_FACTORY_H
#define COIL_FACTORY_H
-#include <functional>
#include <assert.h>
#include <algorithm>
#include <functional>
@@ -108,7 +107,6 @@
{
class FactoryEntry;
public:
-
typedef std::map<Identifier, FactoryEntry> FactoryMap;
typedef typename FactoryMap::iterator FactoryMapIt;
typedef std::map<AbstractClass*, FactoryEntry> ObjectMap;
@@ -500,7 +498,6 @@
}
private:
-
/*!
* @if jp
*
@@ -585,7 +582,6 @@
Destructor> >
{
public:
-
private:
/*!
* @if jp
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -41,7 +41,6 @@
class Guard
{
public:
-
/*!
* @if jp
*
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -419,7 +419,6 @@
}
public:
-
/*!
* @if jp
*
@@ -433,7 +432,7 @@
*/
struct Stream
{
- Stream(streambuf_type* stream, bool cleanup = false)
+ explicit Stream(streambuf_type* stream, bool cleanup = false)
: stream_(stream), cleanup_(cleanup)
{
}
@@ -471,7 +470,6 @@
};
private:
-
/*!
* @if jp
*
@@ -810,7 +808,6 @@
protected:
-
/*!
* @if jp
*
@@ -904,7 +901,6 @@
*/
std::ofstream m_dummy;
public:
-
/*!
* @if jp
* @brief ロック有効モード
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -124,7 +124,7 @@
*
* @endif
*/
- Properties(const char* key = "", const char* value = "");
+ explicit Properties(const char* key = "", const char* value = "");
/*!
* @if jp
@@ -207,7 +207,7 @@
*
* @endif
*/
- Properties(const char* defaults[], long num = LONG_MAX);
+ explicit Properties(const char* defaults[], long num = LONG_MAX);
/*!
* @if jp
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -54,7 +54,7 @@
}
m_sec = (long int)timeval;
m_usec = (long)((timeval - (double)m_sec)
- * TIMEVALUE_ONE_SECOND_IN_USECS + dbHalfAdj );
+ * TIMEVALUE_ONE_SECOND_IN_USECS + dbHalfAdj);
normalize();
}
@@ -128,15 +128,15 @@
*/
TimeValue TimeValue::operator=(double time)
{
- double dbHalfAdj;
- if ( time >= 0 )
- {
- dbHalfAdj = +0.5;
- }
- else
- {
- dbHalfAdj = -0.5;
- }
+ double dbHalfAdj;
+ if ( time >= 0 )
+ {
+ dbHalfAdj = +0.5;
+ }
+ else
+ {
+ dbHalfAdj = -0.5;
+ }
m_sec = (long)time;
m_usec = (long)((time -
@@ -189,7 +189,7 @@
++m_sec;
m_usec -= TIMEVALUE_ONE_SECOND_IN_USECS;
}
- while (m_usec >= TIMEVALUE_ONE_SECOND_IN_USECS);
+ while (m_usec >= TIMEVALUE_ONE_SECOND_IN_USECS) {}
}
else if (m_usec <= -TIMEVALUE_ONE_SECOND_IN_USECS)
{
@@ -198,7 +198,7 @@
--m_sec;
m_usec += TIMEVALUE_ONE_SECOND_IN_USECS;
}
- while (m_usec <= -TIMEVALUE_ONE_SECOND_IN_USECS);
+ while (m_usec <= -TIMEVALUE_ONE_SECOND_IN_USECS) {}
}
if (m_sec >= 1 && m_usec < 0)
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -44,7 +44,6 @@
class Condition
{
public:
-
/*!
* @if jp
*
@@ -185,7 +184,7 @@
abstime.tv_nsec = tv.tv_usec * 1000 + nano_second;
if (abstime.tv_nsec >= 1000000000) {
abstime.tv_nsec -= 1000000000;
- abstime.tv_sec ++;
+ abstime.tv_sec++;
}
return 0 == ::pthread_cond_timedwait(&m_cond, &m_mutex.mutex_, &abstime);
}
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -48,7 +48,6 @@
class DynamicLib
{
public:
-
/*!
* @if jp
*
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -83,7 +83,6 @@
class Condition
{
public:
-
/*!
* @if jp
*
@@ -220,7 +219,6 @@
}
private:
-
/*!
* @if jp
*
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -58,7 +58,6 @@
class DynamicLib
{
public:
-
/*!
* @if jp
*
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -70,7 +70,7 @@
m_Security_attr.nLength = sizeof(SECURITY_ATTRIBUTES);
m_Security_attr.lpSecurityDescriptor = &sd_buffer;
m_Security_attr.bInheritHandle = TRUE;
- mutex_ = ::CreateMutexA( &m_Security_attr, FALSE,name );
+ mutex_ = ::CreateMutexA(&m_Security_attr, FALSE,name);
}
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -61,7 +61,7 @@
inline unsigned int sleep(unsigned int seconds)
{
- ::Sleep( seconds *1000 );
+ ::Sleep(seconds *1000);
return 0;
}
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -348,8 +348,14 @@
sstr << static_cast<char>('a' + (v - 10));
}
v = key[j] & 0xf;
- if (v < 10) { sstr << static_cast<char>('0' + v); }
- else { sstr << static_cast<char>('a' + (v - 10)); }
+ if (v < 10)
+ {
+ sstr << static_cast<char>('0' + v);
+ }
+ else
+ {
+ sstr << static_cast<char>('a' + (v - 10));
+ }
}
sstr << " (" << key.length() << " bytes)" << std::endl;
}
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -1069,7 +1069,7 @@
* The ExecutionContextActionType listener is stored.
* @endif
*/
- ExecutionContextActionListenerHolder
+ ExecutionContextActionListenerHolder
ecaction_[EC_ACTION_LISTENER_NUM];
};
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -524,7 +524,10 @@
{ // If Object is object, unbind it.
context->unbind(bl[i].binding_name);
}
- else assert(0); // never comes here
+ else
+ {
+ assert(0); // never comes here
+ }
}
// no more binding -> do-while loop will be finished
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -1024,6 +1024,6 @@
ConnectorListeners& InPortBase::getListeners()
{
- return m_listeners;
+ return m_listeners;
}
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -281,7 +281,7 @@
*
* @endif
*/
- InPortConnector* getConnectorByName(const char* name);
+ InPortConnector* getConnectorByName(const char* name);
/*!
* @if jp
@@ -619,7 +619,6 @@
virtual ConnectorListeners& getListeners();
protected:
-
/*!
* @if jp
* @brief Interface情報を公開する
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -33,7 +33,7 @@
* @endif
*/
InPortDirectProvider::InPortDirectProvider(void)
- : m_buffer(0)
+ : m_buffer(0)
{
// PortProfile setting
setInterfaceType("direct");
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -224,7 +224,6 @@
virtual void setConnector(InPortConnector* connector);
private:
-
/*!
* @if jp
* @brief ON_BUFFER_WRITE のリスナへ通知する。
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -757,8 +757,8 @@
}
}
- comp_prop["exported_ports"] = exported_ports_str;
- comp_prop["conf.default.exported_ports"] = exported_ports_str;
+ comp_prop["exported_ports"] = exported_ports_str;
+ comp_prop["conf.default.exported_ports"] = exported_ports_str;
}
//------------------------------------------------------------
@@ -1452,7 +1452,7 @@
}
catch (...)
{
- RTC_ERROR(("Exception: Caught unknown exception in initORB()." ));
+ RTC_ERROR(("Exception: Caught unknown exception in initORB()."));
return false;
}
return true;
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -1116,7 +1116,6 @@
// Protected functions
//============================================================
protected:
-
//============================================================
// Manager initialize and finalization
//============================================================
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -457,7 +457,7 @@
*
* @endif
*/
- OutPortConnector* getConnectorByName(const char* name);
+ OutPortConnector* getConnectorByName(const char* name);
/*!
* @if jp
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -33,7 +33,7 @@
* @endif
*/
OutPortCorbaCdrProvider::OutPortCorbaCdrProvider(void)
- : m_buffer(0)
+ : m_buffer(0)
{
// PortProfile setting
setInterfaceType("corba_cdr");
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -256,7 +256,6 @@
void onDisconnect();
protected:
-
/*!
* @if jp
* @brief OutPortProvider へのポインタ
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -493,7 +493,7 @@
RTC_DEBUG(("Port %s was deleted.", port_name.c_str()));
}
- }
+ }
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -639,7 +639,7 @@
* @endif
*/
- void PeriodicExecutionContextInit(RTC::Manager* manager)
+ void PeriodicExecutionContextInit(RTC::Manager* manager)
{
RTC::ExecutionContextFactory::
instance().addFactory("PeriodicExecutionContext",
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-01-18 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -45,7 +45,7 @@
#else // ORB_IS_RTORB
PortProfile *pp;
pp = p->get_port_profile();
- std::string name( pp->name);
+ std::string name(pp->name);
delete pp;
#endif // ORB_IS_RTORB
return m_name == name;
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -896,7 +896,7 @@
*
* @endif
*/
- const char* getName() const;
+ const char* getName() const;
/*!
* @if jp
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -573,7 +573,7 @@
typedef SequenceEx<ConnectorProfileList,
ConnectorProfile,
Mutex> ConnProfiles;
- ConnProfiles m_connProfiles ;
+ ConnProfiles m_connProfiles;
// PortProfile.owner
RTObject_var m_owner;
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -298,7 +298,7 @@
m_buffer->advanceRptr();
}
- return PORT_OK;
+ return PORT_OK;
}
/*!
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-18 04:00:44 UTC (rev 2855)
@@ -374,7 +374,7 @@
for (CORBA::ULong ic(0), len(m_ecOther.length()); ic < len; ++ic)
{
- if (! CORBA::is_nil(m_ecOther[ic]))
+ if (!CORBA::is_nil(m_ecOther[ic]))
{
return RTC::PRECONDITION_NOT_MET;
}
@@ -418,7 +418,7 @@
{
// m_ecOther[ic]->stop();
RTC::LightweightRTObject_var comp(this->_this());
- if (! ::CORBA::is_nil(m_ecOther[ic]))
+ if (!::CORBA::is_nil(m_ecOther[ic]))
{
m_ecOther[ic]->remove_component(comp.in());
}
@@ -448,7 +448,7 @@
for (::CORBA::ULong i(0), len(m_ecOther.length()); i < len; ++i)
{
- if (! ::CORBA::is_nil(m_ecOther[i]))
+ if (!::CORBA::is_nil(m_ecOther[i]))
{
if (exec_context->_is_equivalent(m_ecOther[i]))
return true;
@@ -486,7 +486,7 @@
if (index < m_ecOther.length())
{
- if (! ::CORBA::is_nil(m_ecOther[index]))
+ if (!::CORBA::is_nil(m_ecOther[index]))
{
return ExecutionContext::_duplicate(m_ecOther[index]);
}
@@ -1879,7 +1879,7 @@
* @brief [local interface] Checking if the current context is own context
* @endif
*/
- bool RTObject_impl::isOwnExecutionContext(RTC::UniqueId ec_id)
+ bool RTObject_impl::isOwnExecutionContext(RTC::UniqueId ec_id)
{
if (ec_id < ECOTHER_OFFSET)
{
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 02:16:36 UTC (rev 2854)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h 2017-01-18 04:00:44 UTC (rev 2855)
@@ -762,13 +762,13 @@
{
// pre-do
if (m_predo[state.curr] != NULL)
- (m_listener->*m_predo [state.curr])(state);
+ (m_listener->*m_predo[state.curr])(state);
if (need_trans()) return;
// do
if (m_do[state.curr] != NULL)
- (m_listener->*m_do [state.curr])(state);
+ (m_listener->*m_do[state.curr])(state);
if (need_trans()) return;
More information about the openrtm-commit
mailing list