[openrtm-commit:02235] r2846 - 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月 17日 (火) 16:25:03 JST
Author: sec_fukai
Date: 2017-01-17 16:25:02 +0900 (Tue, 17 Jan 2017)
New Revision: 2846
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.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/Factory.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/Properties.cpp
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/common/TimeValue.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
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/Routing.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.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/Mutex.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/Routing.cpp
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/rtm/CORBA_IORUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp
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.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
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/InPortCorbaCdrConsumer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
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/ManagerServant.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/OutPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
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/RTObject.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3817
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -42,7 +42,7 @@
UUID_Generator() : ACE_Utils::UUID_Generator() {};
#ifndef ACE_5_6_1_OR_EARLIER
coil::UUID*
- generateUUID(ACE_UINT16 version=0x0001, u_char variant=0x80)
+ generateUUID(ACE_UINT16 version = 0x0001, u_char variant = 0x80)
{
return ACE_Utils::UUID_Generator::generate_UUID(version, variant);
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -74,7 +74,7 @@
*
* @endif
*/
- virtual ~Async(){}
+ virtual ~Async() {}
/*!
* @if jp
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -120,7 +120,7 @@
coil::Mutex ClockManager::clockmgr_mutex;
ClockManager& ClockManager::instance()
{
- if(!clockmgr)
+ if (!clockmgr)
{
coil::Guard<coil::Mutex> guard(clockmgr_mutex);
if (!clockmgr)
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -600,7 +600,7 @@
*
* @endif
*/
- GlobalFactory(){}
+ GlobalFactory() {}
/*!
* @if jp
@@ -617,7 +617,7 @@
*
* @endif
*/
- ~GlobalFactory(){}
+ ~GlobalFactory() {}
friend class Singleton<GlobalFactory>;
};
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Listener.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -56,7 +56,7 @@
*
* @endif
*/
- virtual ~ListenerBase(){}
+ virtual ~ListenerBase() {}
/*!
* @if jp
@@ -222,7 +222,7 @@
*
* @endif
*/
- virtual ~ListenerFunc(){}
+ virtual ~ListenerFunc() {}
/*!
* @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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -50,7 +50,7 @@
*
* @endif
*/
- template <typename _CharT, typename _Traits=std::char_traits<_CharT> >
+ template <typename _CharT, typename _Traits = std::char_traits<_CharT> >
class log_streambuf
: public ::std::basic_streambuf<_CharT, _Traits>
{
@@ -163,14 +163,14 @@
bool removeStream(streambuf_type* stream)
{
std::vector<coil::log_streambuf<char>::Stream>::iterator it;
- for( it = m_streams.begin(); it != m_streams.end(); ++it )
- {
+ for ( it = m_streams.begin(); it != m_streams.end(); ++it )
+ {
if (it->stream_ == stream)
{
m_streams.erase(it);
return true;
}
- }
+ }
return false;
}
@@ -536,7 +536,7 @@
*
* @endif
*/
- template <typename _CharT, typename _Traits=std::char_traits<_CharT> >
+ template <typename _CharT, typename _Traits = std::char_traits<_CharT> >
class log_stream
: public std::basic_ostream<_CharT, _Traits>
{
@@ -924,10 +924,10 @@
};
template <typename _CharT, typename _Traits >
- bool log_stream<_CharT,_Traits >::m_lockEnable = true;
+ bool log_stream<_CharT, _Traits >::m_lockEnable = true;
template <typename _CharT, typename _Traits >
- coil::Mutex log_stream<_CharT,_Traits>::m_mutex("Mutex for Logger.");
+ coil::Mutex log_stream<_CharT, _Traits>::m_mutex("Mutex for Logger.");
typedef log_streambuf<char> LogStreamBuffer;
typedef log_stream<char> LogStream;
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -339,7 +339,7 @@
{
std::string pline;
- while(!inStream.eof())
+ while (!inStream.eof())
{
std::string tmp;
coil::getlinePortable(inStream, tmp);
@@ -766,7 +766,7 @@
return out;
}
if (index != 0) out << std::endl;
- for (size_t i(0), len(curr.leaf.size()); i < len ;++i)
+ for (size_t i(0), len(curr.leaf.size()); i < len; ++i)
{
_dump(out, *(curr.leaf[i]), index + 1);
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -318,7 +318,10 @@
*
* @endif
*/
- inline const char* getDefaultValue(void) const {return default_value.c_str();}
+ inline const char* getDefaultValue(void) const
+ {
+ return default_value.c_str();
+ }
/*!
* @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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -130,16 +130,17 @@
{
double dbHalfAdj;
if ( time >= 0 )
- {
+ {
dbHalfAdj = +0.5;
- }
+ }
else
- {
+ {
dbHalfAdj = -0.5;
- }
+ }
m_sec = (long)time;
- m_usec = (long)((time - (double)m_sec)*TIMEVALUE_ONE_SECOND_IN_USECS + dbHalfAdj);
+ m_usec = (long)((time -
+ (double)m_sec)*TIMEVALUE_ONE_SECOND_IN_USECS + dbHalfAdj);
normalize();
return *this;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -63,7 +63,7 @@
*
* @endif
*/
- TimeValue(long sec=0, long usec=0);
+ TimeValue(long sec = 0, long usec = 0);
/*!
* @if jp
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -45,7 +45,7 @@
std::wstring string2wstring(std::string str)
{
std::wstring wstr(str.length(), L' ');
- std::copy(str.begin(),str.end(),wstr.begin());
+ std::copy(str.begin(), str.end(), wstr.begin());
return wstr;
}
@@ -149,7 +149,7 @@
*/
struct escape_functor
{
- escape_functor() {};
+ escape_functor() {}
void operator()(const char c)
{
if (c == '\t') str += "\\t";
@@ -185,7 +185,7 @@
*/
struct unescape_functor
{
- unescape_functor() : count(0) {};
+ unescape_functor() : count(0) {}
void operator()(char c)
{
if (c == '\\')
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -177,7 +177,8 @@
* @endif
*/
GetOpt(int argc, char* const argv[], const char* opt, int flag)
- : optarg(::optarg), optind(1), opterr(1), optopt(0), m_argc(argc), m_argv(argv), m_opt(opt), m_flag(flag)
+ : optarg(::optarg), optind(1), opterr(1), optopt(0),
+ m_argc(argc), m_argv(argv), m_opt(opt), m_flag(flag)
{
::optind = 1;
#ifdef __QNX__
@@ -238,7 +239,7 @@
#endif
int result = getopt(m_argc, m_argv, m_opt);
#ifdef __QNX__
- if(::optind == optind_last)
+ if (::optind == optind_last)
{
::optind++;
result = getopt(m_argc, m_argv, m_opt);
@@ -249,7 +250,10 @@
optind = ::optind;
optopt = ::optopt;
#if __QNX__
- if(optind_last < m_argc) { ++optind_last; }
+ if (optind_last < m_argc)
+ {
+ ++optind_last;
+ }
#endif
return result;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -43,7 +43,7 @@
signal(SIGCHLD, SIG_IGN);
pid_t pid;
- if((pid = fork()) < 0 )
+ if ((pid = fork()) < 0 )
{ // fork failed
return -1;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -64,7 +64,9 @@
addr.sin_addr.s_addr = **(unsigned int **)(hostent->h_addr_list);
dest_addr = inet_ntoa(addr.sin_addr);
-#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN) || defined(COIL_OS_QNX)
+#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) \
+ || defined(COIL_OS_CYGWIN) \
+ || defined(COIL_OS_QNX)
std::string cmd("PATH=/bin:/sbin:/usr/bin:/usr/sbin "
"route get ");
const char* match_str = "interface";
@@ -99,7 +101,9 @@
line.erase(line.end() - 1);
coil::vstring vs(coil::split(line, delimiter));
-#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN) || defined(COIL_OS_QNX)
+#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) \
+ || defined(COIL_OS_CYGWIN) \
+ || defined(COIL_OS_QNX)
if (vs.size() > ifname_pos)
{
dest_if = vs[ifname_pos];
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -101,25 +101,29 @@
#if defined(COIL_OS_LINUX) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
- UUID_Generator::UUID_Generator(){}
+ UUID_Generator::UUID_Generator() {}
- void UUID_Generator::init(){}
- UUID* UUID_Generator::generateUUID(int varsion, int variant){
+ void UUID_Generator::init() {}
+ UUID* UUID_Generator::generateUUID(int varsion, int variant)
+ {
uuid_t uuid;
uuid_generate(uuid);
return new UUID(&uuid);
}
- UUID::UUID(){
+ UUID::UUID()
+ {
uuid_clear(this->_uuid);
}
- UUID::UUID(uuid_t *uuid){
+ UUID::UUID(uuid_t *uuid)
+ {
strncpy((char *)this->_uuid, (char *)(*uuid), sizeof(this->_uuid));
}
- const char* UUID::to_string(){
+ const char* UUID::to_string()
+ {
uuid_unparse(this->_uuid, buf);
return buf;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -240,7 +240,8 @@
*
* @endif
*/
- int pthread_cond_wait (coil::pthread_cond_t *cv, coil::Mutex *external_mutex, DWORD aMilliSecond)
+ int pthread_cond_wait (coil::pthread_cond_t *cv,
+ coil::Mutex *external_mutex, DWORD aMilliSecond)
{
DWORD result;
@@ -252,8 +253,10 @@
// This call atomically releases the mutex and waits on the
// semaphore until <pthread_cond_signal> or <pthread_cond_broadcast>
// are called by another thread.
-// std::cout << "Before SignalObjectAndWait [wait with time(" << milliSecond << ")]" << std::endl << std::flush ;
- result = SignalObjectAndWait (external_mutex->mutex_, cv->sema_, aMilliSecond, FALSE);
+// std::cout << "Before SignalObjectAndWait [wait with time(" << milliSecond
+// << ")]" << std::endl << std::flush ;
+ result = SignalObjectAndWait (external_mutex->mutex_,
+ cv->sema_, aMilliSecond, FALSE);
// char * p;
// switch (result) {
@@ -270,7 +273,8 @@
// p = "Other !?";
// break;
// }
-// std::cout << "After SignalObjectAndWait [wait with time(" << milliSecond << ")]"
+// std::cout << "After SignalObjectAndWait [wait with time("
+// << milliSecond << ")]"
// << " result(" << result << ":" << p << ")"
// << std::endl << std::flush ;
@@ -291,7 +295,9 @@
// This call atomically signals the <waiters_done_> event and
// waits until it can acquire the <external_mutex>. This is
// required to ensure fairness.
- DWORD result = SignalObjectAndWait (cv->waiters_done_, external_mutex->mutex_, INFINITE, FALSE);
+ DWORD result = SignalObjectAndWait (cv->waiters_done_,
+ external_mutex->mutex_,
+ INFINITE, FALSE);
// std::cout << "result " << result << std::endl;
} else {
// Always regain the external mutex since that's the guarantee we
@@ -360,31 +366,37 @@
cv->waiters_count_lock_.lock();
int have_waiters = 0;
- if (cv->waiters_count_ > 0) {
- // We are broadcasting, even if there is just one waiter...
- // Record that we are broadcasting, which helps optimize
- // <pthread_cond_wait> for the non-broadcast case.
- cv->was_broadcast_ = 1;
- have_waiters = 1;
- }
+ if (cv->waiters_count_ > 0)
+ {
+ // We are broadcasting, even if there is just one waiter...
+ // Record that we are broadcasting, which helps optimize
+ // <pthread_cond_wait> for the non-broadcast case.
+ cv->was_broadcast_ = 1;
+ have_waiters = 1;
+ }
- if (have_waiters) {
- // Wake up all the waiters atomically.
-// std::cout << "Before ReleaseSemaphore(" << cv->waiters_count_ << ")" << std::endl << std::flush ;
- ReleaseSemaphore (cv->sema_, cv->waiters_count_, 0);
-// std::cout << "After ReleaseSemaphore(" << cv->waiters_count_ << ")" << std::endl << std::flush ;
+ if (have_waiters)
+ {
+ // Wake up all the waiters atomically.
+// std::cout << "Before ReleaseSemaphore(" << cv->waiters_count_ << ")"
+// << std::endl << std::flush ;
+ ReleaseSemaphore (cv->sema_, cv->waiters_count_, 0);
+// std::cout << "After ReleaseSemaphore(" << cv->waiters_count_ << ")"
+// << std::endl << std::flush ;
- cv->waiters_count_lock_.unlock();
+ cv->waiters_count_lock_.unlock();
- // Wait for all the awakened threads to acquire the counting
- // semaphore.
- WaitForSingleObject (cv->waiters_done_, INFINITE);
- // This assignment is okay, even without the <waiters_count_lock_> held
- // because no other waiter threads can wake up to access it.
- cv->was_broadcast_ = 0;
- }
+ // Wait for all the awakened threads to acquire the counting
+ // semaphore.
+ WaitForSingleObject (cv->waiters_done_, INFINITE);
+ // This assignment is okay, even without the <waiters_count_lock_> held
+ // because no other waiter threads can wake up to access it.
+ cv->was_broadcast_ = 0;
+ }
else
- cv->waiters_count_lock_.unlock();
+ {
+ cv->waiters_count_lock_.unlock();
+ }
return 0;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -166,7 +166,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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -289,7 +289,7 @@
* @endif
*/
static int ForExternTest(void) {
- std::cout<<"ForExternTest"<<std::endl;
+ std::cout << "ForExternTest" << std::endl;
return 0xdeadbeef;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -70,30 +70,30 @@
std::string dir_name;
if (p)
- {
- if(p != return_dirname)
{
- if(*(p+1) == '\0')
- {
- *p = '\0';
- dir_name = dirname(return_dirname);
- }
- else
- {
- *p = '\0';
- dir_name = return_dirname;
- }
+ if (p != return_dirname)
+ {
+ if (*(p+1) == '\0')
+ {
+ *p = '\0';
+ dir_name = dirname(return_dirname);
+ }
+ else
+ {
+ *p = '\0';
+ dir_name = return_dirname;
+ }
+ }
+ else
+ {
+ *(p+1) = '\0';
+ dir_name = return_dirname;
+ }
}
- else
+ else
{
- *(p+1) = '\0';
- dir_name = return_dirname;
+ dir_name = ".";
}
- }
- else
- {
- dir_name = ".";
- }
return dir_name;
}
@@ -137,34 +137,34 @@
std::string base_name(p);
if (pdelimiter)
- {
- if(pdelimiter != p)
{
- if(*(pdelimiter+1) == '\0')
- {
- *pdelimiter = '\0';
- base_name = basename(p);
- }
+ if (pdelimiter != p)
+ {
+ if (*(pdelimiter+1) == '\0')
+ {
+ *pdelimiter = '\0';
+ base_name = basename(p);
+ }
+ else
+ {
+ pdelimiter++;
+ base_name = pdelimiter;
+ }
+ }
else
- {
- pdelimiter++;
- base_name = pdelimiter;
- }
- }
- else
- {
- if(*(pdelimiter+1) != '\0')
- {
- pdelimiter++;
- base_name = pdelimiter;
- }
- else
- {
- base_name = pdelimiter;
- }
+ {
+ if (*(pdelimiter+1) != '\0')
+ {
+ pdelimiter++;
+ base_name = pdelimiter;
+ }
+ else
+ {
+ base_name = pdelimiter;
+ }
+ }
}
- }
return base_name;
}
@@ -242,8 +242,14 @@
if (*(path.end() - 1) != '\\' && *(path.end() - 1) != '/')
{
std::string::size_type pos(path.find("/"));
- if (pos == std::string::npos) { path.push_back('\\'); } // delim = '\'
- else { path.push_back('/'); } // delim = '/'
+ if (pos == std::string::npos)
+ {
+ path.push_back('\\'); // delim = '\'
+ }
+ else
+ {
+ path.push_back('/'); // delim = '/'
+ }
}
path.push_back('*'); // now path is "/dir/dir/../*"
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -112,7 +112,7 @@
*/
inline void lock()
{
- ::WaitForSingleObject(mutex_,INFINITE);
+ ::WaitForSingleObject(mutex_, INFINITE);
}
/*!
@@ -133,8 +133,8 @@
inline bool trylock()
{
unsigned long dwret;
- dwret = ::WaitForSingleObject(mutex_,0);
- switch(dwret)
+ dwret = ::WaitForSingleObject(mutex_, 0);
+ switch (dwret)
{
case WAIT_ABANDONED:
return true;
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -269,7 +269,7 @@
place = EMSG;
return(-1);
}
- for(;;)
+ for (;;)
{
/* Check that the scanning reached the last element. */
if (optind >= nargc)
@@ -317,33 +317,36 @@
}
return(BADCH);
}
- if (*++oli != ':') { /* don't need argument */
- optarg = NULL;
- if (!*place)
+ if (*++oli != ':') /* don't need argument */
+ {
+ optarg = NULL;
+ if (!*place)
+ ++optind;
+ }
+ else
+ { /* need an argument */
+ if (*place) /* no white space */
+ optarg = place;
+ else if (nargc <= ++optind)
+ { /* no arg */
+ place = EMSG;
+ if (!(p = strrchr(*nargv, '/')))
+ p = *nargv;
+ else
+ ++p;
+ if (*ostr == ':')
+ return(BADARG);
+ if (opterr)
+ fprintf(stderr,
+ "%s: option requires an argument -- %c\n",
+ p, optopt);
+ return(BADCH);
+ }
+ else /* white space */
+ optarg = nargv[optind];
+ place = EMSG;
++optind;
- }
- else { /* need an argument */
- if (*place) /* no white space */
- optarg = place;
- else if (nargc <= ++optind) { /* no arg */
- place = EMSG;
- if (!(p = strrchr(*nargv, '/')))
- p = *nargv;
- else
- ++p;
- if (*ostr == ':')
- return(BADARG);
- if (opterr)
- fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- p, optopt);
- return(BADCH);
}
- else /* white space */
- optarg = nargv[optind];
- place = EMSG;
- ++optind;
- }
return(optopt); /* dump back option letter */
}
@@ -383,7 +386,8 @@
* @endif
*/
GetOpt(int argc, char* const argv[], const char* opt, int flag)
- : m_argc(argc), m_argv(argv), m_opt(opt), m_flag(flag), optind(1), opterr(1), optopt(0)
+ : m_argc(argc), m_argv(argv), m_opt(opt),
+ m_flag(flag), optind(1), opterr(1), optopt(0)
{
this->optarg = coil::optarg;
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -49,7 +49,7 @@
PROCESS_INFORMATION pi;
ZeroMemory( &pi, sizeof(pi) );
- if(!CreateProcess(NULL, lpcommand, NULL, NULL, FALSE, 0,
+ if (!CreateProcess(NULL, lpcommand, NULL, NULL, FALSE, 0,
NULL, NULL, &si, &pi) )
{
delete lpcommand;
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -76,7 +76,7 @@
int i(0);
while (hp->h_addr_list[i] != 0)
{
- if(hp->h_addrtype == AF_INET)
+ if (hp->h_addrtype == AF_INET)
{
struct sockaddr_in addr;
memset((char*)&addr, 0, sizeof(addr));
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -99,17 +99,19 @@
//The WSAStartup function initiates use of the Winsock DLL by a process.
ver = MAKEWORD(2,2);
- iret = ::WSAStartup(ver,&wsa);
- if( iret != 0 )
- {
+ iret = ::WSAStartup(ver, &wsa);
+ if ( iret != 0 )
+ {
return iret;
- }
+ }
- //The socket function creates a socket that is bound to a specific transport service provider.
- ssoc = ::socket(AF_INET, //It is assumed AF_INET because there is no AF_UNIX for Windows.
- SOCK_STREAM,
+ //The socket function creates a socket that is bound to
+ //a specific transport service provider.
+ //It is assumed AF_INET because there is no AF_UNIX for Windows.
+ ssoc = ::socket(AF_INET,
+ SOCK_STREAM,
0);
- if(ssoc==INVALID_SOCKET){
+ if (ssoc == INVALID_SOCKET) {
iret = ::WSAGetLastError();
::WSACleanup();
return iret;
@@ -119,17 +121,18 @@
//Initialize fd_set.
FD_ZERO(&mask);
//Register the reading socket.
- FD_SET(ssoc,&mask);
+ FD_SET(ssoc, &mask);
tv.tv_sec = interval.sec();
tv.tv_usec = interval.usec();
iret = ::select((int)ssoc+1, &mask, NULL, NULL, &tv);
- if( iret == SOCKET_ERROR )
+ if ( iret == SOCKET_ERROR )
{
iret = ::WSAGetLastError();
//The closesocket function closes an existing socket.
::closesocket(ssoc);
- //The WSACleanup function terminates use of the Winsock 2 DLL (Ws2_32.dll).
+ //The WSACleanup function terminates
+ //use of the Winsock 2 DLL (Ws2_32.dll).
::WSACleanup();
return iret;
}
@@ -173,32 +176,34 @@
SOCKET ssoc;
//The WSAStartup function initiates use of the Winsock DLL by a process.
- ver = MAKEWORD(2,2);
- iret = ::WSAStartup(ver,&wsa);
- if( iret != 0 )
+ ver = MAKEWORD(2, 2);
+ iret = ::WSAStartup(ver, &wsa);
+ if ( iret != 0 )
{
return iret;
}
- //The socket function creates a socket that is bound to a specific transport service provider.
- ssoc = ::socket(AF_INET,SOCK_STREAM,0);
- if(ssoc==INVALID_SOCKET){
+ //The socket function creates a socket that is
+ //bound to a specific transport service provider.
+ ssoc = ::socket(AF_INET, SOCK_STREAM, 0);
+ if (ssoc == INVALID_SOCKET) {
iret = ::WSAGetLastError();
::WSACleanup();
return iret;
}
FD_ZERO(&mask);
- FD_SET(ssoc,&mask);
+ FD_SET(ssoc, &mask);
tv.tv_sec = usec / 1000000;
tv.tv_usec = usec % 1000000;
iret = ::select((int)ssoc+1, &mask, NULL, NULL, &tv);
- if( iret == SOCKET_ERROR )
+ if ( iret == SOCKET_ERROR )
{
iret = ::WSAGetLastError();
//The closesocket function closes an existing socket.
::closesocket(ssoc);
- //The WSACleanup function terminates use of the Winsock 2 DLL (Ws2_32.dll).
+ //The WSACleanup function terminates
+ //use of the Winsock 2 DLL (Ws2_32.dll).
::WSACleanup();
return iret;
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -69,7 +69,7 @@
*/
const char* UUID::to_string()
{
- if(::UuidToStringA(&m_uuid, (RPC_CSTR*)&m_uuidstr)
+ if (::UuidToStringA(&m_uuid, (RPC_CSTR*)&m_uuidstr)
!= RPC_S_OK)
{
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -61,7 +61,7 @@
if (size < 4)
{
return false;
- throw CORBA::MARSHAL(0,CORBA::COMPLETED_NO);
+ throw CORBA::MARSHAL(0, CORBA::COMPLETED_NO);
}
const char* p = iorstr;
@@ -69,7 +69,7 @@
if (p[0] != 'I' || p[1] != 'O' || p[2] != 'R' || p[3] != ':')
{
return false;
- throw CORBA::MARSHAL(0,CORBA::COMPLETED_NO);
+ throw CORBA::MARSHAL(0, CORBA::COMPLETED_NO);
}
// IOR:xxyyzz......
@@ -84,16 +84,40 @@
CORBA::Octet v;
// upper digit
int j(i * 2);
- if (p[j] >= '0' && p[j] <= '9') { v = ((p[j] - '0') << 4); }
- else if (p[j] >= 'a' && p[j] <= 'f') { v = ((p[j] - 'a' + 10) << 4); }
- else if (p[j] >= 'A' && p[j] <= 'F') { v = ((p[j] - 'A' + 10) << 4); }
- else { return false; }
+ if (p[j] >= '0' && p[j] <= '9')
+ {
+ v = ((p[j] - '0') << 4);
+ }
+ else if (p[j] >= 'a' && p[j] <= 'f')
+ {
+ v = ((p[j] - 'a' + 10) << 4);
+ }
+ else if (p[j] >= 'A' && p[j] <= 'F')
+ {
+ v = ((p[j] - 'A' + 10) << 4);
+ }
+ else
+ {
+ return false;
+ }
// lower digit
int k(j + 1);
- if (p[k] >= '0' && p[k] <= '9') { v += (p[k] - '0'); }
- else if (p[k] >= 'a' && p[k] <= 'f') { v += (p[k] - 'a' + 10); }
- else if (p[k] >= 'A' && p[k] <= 'F') { v += (p[k] - 'A' + 10); }
- else { return false; }
+ if (p[k] >= '0' && p[k] <= '9')
+ {
+ v += (p[k] - '0');
+ }
+ else if (p[k] >= 'a' && p[k] <= 'f')
+ {
+ v += (p[k] - 'a' + 10);
+ }
+ else if (p[k] >= 'A' && p[k] <= 'F')
+ {
+ v += (p[k] - 'A' + 10);
+ }
+ else
+ {
+ return false;
+ }
// push_back to buffer
buf.marshalOctet(v);
}
@@ -121,7 +145,7 @@
bool toString(IOP::IOR& ior, std::string& iorstr)
{
#ifndef ORB_IS_RTORB
- cdrMemoryStream buf(CORBA::ULong(0),CORBA::Boolean(1));
+ cdrMemoryStream buf(CORBA::ULong(0), CORBA::Boolean(1));
buf.marshalBoolean(omni::myByteOrder);
buf.marshalRawString(ior.type_id);
ior.profiles >>= buf;
@@ -296,9 +320,9 @@
{
// Output key as text
sstr << " Object Key: \"";
- for(unsigned int j = 0; j < key.length(); ++j)
+ for (unsigned int j = 0; j < key.length(); ++j)
{
- if( (char) key[j] >= ' ' && (char) key[j] <= '~')
+ if ( (char) key[j] >= ' ' && (char) key[j] <= '~')
{
sstr << (char) key[j];
}
@@ -311,11 +335,17 @@
// Output key in hexadecimal form.
sstr << " = 0x";
- for(unsigned int j(0); j < key.length(); ++j)
+ for (unsigned int j(0); j < key.length(); ++j)
{
int v = (key[j] & 0xf0) >> 4;
- if (v < 10) { sstr << (char)('0' + v); }
- else { sstr << (char)('a' + (v - 10)); }
+ if (v < 10)
+ {
+ sstr << (char)('0' + v);
+ }
+ else
+ {
+ sstr << (char)('a' + (v - 10));
+ }
v = key[j] & 0xf;
if (v < 10) { sstr << (char)('0' + v); }
else { sstr << (char)('a' + (v - 10)); }
@@ -329,10 +359,10 @@
int is_transient;
OctetUSequence id;
- if(get_poa_info(key, poas, is_transient, id))
+ if (get_poa_info(key, poas, is_transient, id))
{
sstr << " POA(" << (char*)poas[0];
- for(unsigned i(1); i < poas.length(); ++i)
+ for (unsigned i(1); i < poas.length(); ++i)
{
sstr << '/' << (char*)poas[i];
}
@@ -340,7 +370,7 @@
}
else
{
- if(key.length() != sizeof(omniOrbBoaKey))
+ if (key.length() != sizeof(omniOrbBoaKey))
{
return;
}
@@ -359,19 +389,19 @@
poas_out.length(1);
poas_out[0] = CORBA::string_dup("root");
- if(*k != TRANSIENT_SUFFIX_SEP && *k != POA_NAME_SEP) { return 0; }
+ if (*k != TRANSIENT_SUFFIX_SEP && *k != POA_NAME_SEP) { return 0; }
- while(k < kend && *k == POA_NAME_SEP)
+ while (k < kend && *k == POA_NAME_SEP)
{
++k;
const char* name = k;
- while(k < kend && *k && *k != POA_NAME_SEP
+ while (k < kend && *k && *k != POA_NAME_SEP
&& *k != TRANSIENT_SUFFIX_SEP)
{
++k;
}
- if(k == kend) { return 0; }
+ if (k == kend) { return 0; }
char* nm = new char[k - name + 1];
memcpy(nm, name, k - name);
@@ -379,15 +409,15 @@
poas_out.length(poas_out.length() + 1);
poas_out[poas_out.length() - 1] = nm;
}
- if(k == kend) { return 0; }
+ if (k == kend) { return 0; }
transient_out = 0;
- if(*k == TRANSIENT_SUFFIX_SEP)
+ if (*k == TRANSIENT_SUFFIX_SEP)
{
transient_out = 1;
k += TRANSIENT_SUFFIX_SIZE + 1;
}
- if(k >= kend || *k) { return 0; }
+ if (k >= kend || *k) { return 0; }
k++;
id_out.length(kend - k);
@@ -412,7 +442,7 @@
char* q;
do
{
- q = strchr(p,'\n');
+ q = strchr(p, '\n');
if (q)
{
*q++ = '\0';
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -29,7 +29,7 @@
* @class PostComponentActionListener class
* @endif
*/
- PostComponentActionListener::~PostComponentActionListener(){}
+ PostComponentActionListener::~PostComponentActionListener() {}
/*!
* @if jp
@@ -38,7 +38,7 @@
* @class PreComponentActionListener class
* @endif
*/
- PreComponentActionListener::~PreComponentActionListener(){}
+ PreComponentActionListener::~PreComponentActionListener() {}
/*!
* @if jp
@@ -47,7 +47,7 @@
* @class PortActionListener class
* @endif
*/
- PortActionListener::~PortActionListener(){}
+ PortActionListener::~PortActionListener() {}
/*!
* @if jp
@@ -56,7 +56,7 @@
* @class ExecutionContextActionListener class
* @endif
*/
- ExecutionContextActionListener::~ExecutionContextActionListener(){}
+ ExecutionContextActionListener::~ExecutionContextActionListener() {}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -45,7 +45,7 @@
*/
void ConfigBase::notifyUpdate(const char* key, const char* val)
{
- if(m_admin == 0 || m_callback == 0) return;
+ if (m_admin == 0 || m_callback == 0) return;
(m_admin->*m_callback)(key, val);
}
@@ -372,7 +372,7 @@
void
ConfigAdmin::setOnRemoveConfigurationSet(OnRemoveConfigurationSetCallback* cb)
{
- std::cerr << "setOnRemoveConfigurationSet function is obsolete."<<std::endl;
+ std::cerr << "setOnRemoveConfigurationSet function is obsolete." <<std::endl;
std::cerr << "Use addConfigurationSetNameListener instead." << std::endl;
m_listeners.configsetname_[ON_REMOVE_CONFIG_SET].addListener(cb, false);
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -398,7 +398,7 @@
*
* @endif
*/
- virtual ~Config(void){}
+ virtual ~Config(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -29,7 +29,7 @@
* @class ConfigurationParamListener class
* @endif
*/
- ConfigurationParamListener::~ConfigurationParamListener(){}
+ ConfigurationParamListener::~ConfigurationParamListener() {}
/*!
* @if jp
@@ -38,7 +38,7 @@
* @class ConfigurationSetNameListener class
* @endif
*/
- ConfigurationSetNameListener::~ConfigurationSetNameListener(){}
+ ConfigurationSetNameListener::~ConfigurationSetNameListener() {}
/*!
* @if jp
@@ -47,7 +47,7 @@
* @class ConfigurationSetListener class
* @endif
*/
- ConfigurationSetListener::~ConfigurationSetListener(){}
+ ConfigurationSetListener::~ConfigurationSetListener() {}
//============================================================
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -28,7 +28,7 @@
* @class ConnectorDataListener class
* @endif
*/
- ConnectorDataListener::~ConnectorDataListener(){}
+ ConnectorDataListener::~ConnectorDataListener() {}
/*!
* @if jp
@@ -37,7 +37,7 @@
* @class ConnectorListener class
* @endif
*/
- ConnectorListener::~ConnectorListener(){}
+ ConnectorListener::~ConnectorListener() {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -301,7 +301,7 @@
* @brief Destructor
* @endif
*/
- virtual ~ConnectorDataListenerT(){}
+ virtual ~ConnectorDataListenerT() {}
/*!
* @if jp
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -156,7 +156,7 @@
void CorbaPort::activateInterfaces()
{
CorbaProviderList::iterator it(m_providers.begin());
- while(it != m_providers.end())
+ while (it != m_providers.end())
{
it->activate();
++it;
@@ -173,7 +173,7 @@
void CorbaPort::deactivateInterfaces()
{
CorbaProviderList::iterator it(m_providers.begin());
- while(it != m_providers.end())
+ while (it != m_providers.end())
{
it->deactivate();
++it;
@@ -196,7 +196,7 @@
RTC_TRACE(("publishInterfaces()"));
ReturnCode_t returnvalue = _publishInterfaces();
- if(returnvalue != RTC::RTC_OK)
+ if (returnvalue != RTC::RTC_OK)
{
return returnvalue;
}
@@ -268,8 +268,14 @@
{
const char* strictness;
nv[index].value >>= strictness;
- if (std::string("best_effort") == strictness) { strict = false; }
- else if (std::string("strict") == strictness) { strict = true; }
+ if (std::string("best_effort") == strictness)
+ {
+ strict = false;
+ }
+ else if (std::string("strict") == strictness)
+ {
+ strict = true;
+ }
RTC_DEBUG(("Connetion strictness is: %s",
strict ? "strict" : "best_effort"))
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -415,7 +415,7 @@
Guard guard(m_mutex);
for (size_t i(0); i < m_comps.size() ; ++i)
{
- if(m_comps.at(i)->isEquivalent(comp))
+ if (m_comps.at(i)->isEquivalent(comp))
{
return m_comps.at(i);
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -145,7 +145,7 @@
* @endif
*/
InPort(const char* name, DataType& value,
- int bufsize=64,
+ int bufsize = 64,
bool read_block = false, bool write_block = false,
int read_timeout = 0, int write_timeout = 0)
#if defined(__GNUC__) && (__GNUC__ <= 3 && __GNUC_MINOR__ <= 3)
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -125,7 +125,7 @@
initConsumers();
int num(-1);
if (!coil::stringTo(num,
- m_properties.getProperty("connection_limit","-1").c_str()))
+ m_properties.getProperty("connection_limit", "-1").c_str()))
{
RTC_ERROR(("invalid connection_limit value: %s",
m_properties.getProperty("connection_limit").c_str()));
@@ -474,7 +474,7 @@
RTC_TRACE(("publishInterfaces()"));
ReturnCode_t returnvalue = _publishInterfaces();
- if(returnvalue!=RTC::RTC_OK)
+ if (returnvalue != RTC::RTC_OK)
{
return returnvalue;
}
@@ -774,7 +774,7 @@
bool& littleEndian)
{
// old version check
- if(prop.hasKey("serializer") == NULL)
+ if (prop.hasKey("serializer") == NULL)
{
littleEndian = true;
return true;
@@ -786,13 +786,13 @@
coil::normalize(endian_type);
std::vector<std::string> endian(coil::split(endian_type, ","));
- if(endian.empty()) { return false; }
- if(endian[0] == "little")
+ if (endian.empty()) { return false; }
+ if (endian[0] == "little")
{
littleEndian = true;
return true;
}
- else if(endian[0] == "big")
+ else if (endian[0] == "big")
{
littleEndian = false;
return true;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -79,7 +79,7 @@
cdrdata_tmp->_buffer =
(CORBA_octet *)RtORB_alloc(data.bufSize(), "InPortCorbaCdrComsumer::put");
memcpy(cdrdata_tmp->_buffer, data.bufPtr(), data.bufSize());
- cdrdata_tmp->_length = cdrdata_tmp->_maximum= data.bufSize();
+ cdrdata_tmp->_length = cdrdata_tmp->_maximum = data.bufSize();
::OpenRTM::CdrData tmp(cdrdata_tmp);
#endif // ORB_IS_RTORB
try
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrProvider.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -172,7 +172,7 @@
InPortCorbaCdrProvider::convertReturn(BufferStatus::Enum status,
const cdrMemoryStream& data)
{
- switch(status)
+ switch (status)
{
case BufferStatus::BUFFER_OK:
onBufferWrite(data);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -44,7 +44,7 @@
{
m_buffer = createBuffer(info);
}
- if (m_buffer == 0 || m_provider==0) throw std::bad_alloc();
+ if (m_buffer == 0 || m_provider == 0) throw std::bad_alloc();
m_buffer->init(info.properties.getNode("buffer"));
m_provider->init(info.properties);
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -260,7 +260,7 @@
try
{
- if(CORBA::is_nil(this->thePOAManager()))
+ if (CORBA::is_nil(this->thePOAManager()))
{
RTC_ERROR(("Could not get POA manager."));
return false;
@@ -1571,7 +1571,7 @@
void Manager::shutdownORB()
{
RTC_TRACE(("Manager::shutdownORB()"));
- if(CORBA::is_nil(m_pORB))
+ if (CORBA::is_nil(m_pORB))
{
return;
}
@@ -1918,7 +1918,7 @@
}
for (CORBA::ULong i(0), len(m_ecs.size()); i < len; ++i)
{
- try{
+ try {
PortableServer::RefCountServantBase* servant;
servant = dynamic_cast<PortableServer::RefCountServantBase*>(m_ecs[i]);
if (servant == NULL)
@@ -2051,7 +2051,7 @@
RTC_ERROR(("Empty ExecutionContext's name"));
return false;
}
- ec_id =id_and_conf[0];
+ ec_id = id_and_conf[0];
if (id_and_conf.size() == 2)
{
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -1869,7 +1869,8 @@
std::string m_name;
};
- typedef ObjectManager<std::string, RTObject_impl, InstanceName> ComponentManager;
+ typedef ObjectManager<std::string, RTObject_impl,
+ InstanceName> ComponentManager;
/*!
* @if jp
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -844,7 +844,7 @@
RTM::Manager_var mgr = ::RTM::Manager::_narrow(mobj);
#else // ORB_IS_RTORB
RTM::Manager_var mgr;
- if(!make_client_connection(mobj->impl()->connection))
+ if (!make_client_connection(mobj->impl()->connection))
{
return RTM::Manager_ptr();
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -689,7 +689,8 @@
std::string m_filepath;
public:
explicit DllPred(const char* filepath) : m_filepath(filepath) {}
- explicit DllPred(const DLLEntity* dll) : m_filepath(dll->properties["file_path"]) {}
+ explicit DllPred(const DLLEntity* dll)
+ : m_filepath(dll->properties["file_path"]) {}
bool operator()(DLLEntity* dllentity)
{
return m_filepath == dllentity->properties.getProperty("file_path");
@@ -765,7 +766,7 @@
class UnloadPred
{
public:
- UnloadPred(){}
+ UnloadPred() {}
void operator()(DLLEntity* dll)
{
dll->dll.close();
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -193,7 +193,7 @@
*/
struct nv_find
{
- explicit nv_find(const char* name) : m_name(name) {};
+ explicit nv_find(const char* name) : m_name(name) {}
bool operator()(const SDOPackage::NameValue& nv)
{
std::string name(nv.name);
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -261,8 +261,8 @@
}
}
}
- std::for_each(disconnect_ids.begin(),disconnect_ids.end(),
- std::bind1st(std::mem_fun(&PortBase::disconnect),this));
+ std::for_each(disconnect_ids.begin(), disconnect_ids.end(),
+ std::bind1st(std::mem_fun(&PortBase::disconnect), this));
return result;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -142,7 +142,7 @@
initProviders();
int num(-1);
if (!coil::stringTo(num,
- m_properties.getProperty("connection_limit","-1").c_str()))
+ m_properties.getProperty("connection_limit", "-1").c_str()))
{
RTC_ERROR(("invalid connection_limit value: %s",
m_properties.getProperty("connection_limit").c_str()));
@@ -516,7 +516,7 @@
RTC_TRACE(("publishInterfaces()"));
ReturnCode_t returnvalue = _publishInterfaces();
- if(returnvalue!=RTC::RTC_OK)
+ if (returnvalue != RTC::RTC_OK)
{
return returnvalue;
}
@@ -810,7 +810,7 @@
bool& littleEndian)
{
// old version check
- if(prop.hasKey("serializer") == NULL)
+ if (prop.hasKey("serializer") == NULL)
{
littleEndian = true;
return true;
@@ -822,13 +822,13 @@
coil::normalize(endian_type);
std::vector<std::string> endian(coil::split(endian_type, ","));
- if(endian.empty()) { return false; }
- if(endian[0] == "little")
+ if (endian.empty()) { return false; }
+ if (endian[0] == "little")
{
littleEndian = true;
return true;
}
- else if(endian[0] == "big")
+ else if (endian[0] == "big")
{
littleEndian = false;
return true;
@@ -1042,7 +1042,8 @@
RTC_TRACE(("OutPortPullConnector created"));
m_connectors.push_back(connector);
- RTC_PARANOID(("connector pushback done: size = %d", m_connectors.size()));
+ RTC_PARANOID(("connector pushback done: size = %d",
+ m_connectors.size()));
return connector;
}
catch (std::bad_alloc& e)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -226,7 +226,7 @@
OutPortCorbaCdrConsumer::convertReturn(::OpenRTM::PortStatus status,
const cdrMemoryStream& data)
{
- switch(status)
+ switch (status)
{
case ::OpenRTM::PORT_OK:
// never comes here
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -193,7 +193,7 @@
OutPortCorbaCdrProvider::convertReturn(BufferStatus::Enum status,
const cdrMemoryStream& data)
{
- switch(status)
+ switch (status)
{
case BufferStatus::BUFFER_OK:
onBufferRead(data);
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -214,7 +214,8 @@
removeParticipantFromEC(member);
removeOrganizationFromTarget(member);
startOwnedEC(member);
- ::SDOPackage::Organization_impl::remove_member(member.profile_->instance_name);
+ ::SDOPackage::Organization_impl::
+ remove_member(member.profile_->instance_name);
++it;
}
m_rtcMembers.clear();
@@ -518,10 +519,10 @@
void PeriodicECOrganization::updateDelegatedPorts()
{
std::vector<std::string>& oldPorts(m_expPorts);
- std::sort(oldPorts.begin(),oldPorts.end());
+ std::sort(oldPorts.begin(), oldPorts.end());
std::vector<std::string>
newPorts(coil::split(m_rtobj->getProperties()["conf.default.exported_ports"], ","));
- std::sort(newPorts.begin(),newPorts.end());
+ std::sort(newPorts.begin(), newPorts.end());
std::vector<std::string> removedPorts; // oldPorts - interPorts
std::vector<std::string> createdPorts; // newPorts - interPorts
@@ -554,7 +555,7 @@
bool stringToStrVec(std::vector<std::string>& v, const char* is)
{
std::string s(is);
- v = coil::split(s ,",");
+ v = coil::split(s , ",");
return true;
}
@@ -565,7 +566,7 @@
{
public:
explicit setCallback(::SDOPackage::PeriodicECOrganization* org) : m_org(org) {}
- virtual ~setCallback(){};
+ virtual ~setCallback(){}
virtual void operator()(const coil::Properties& config_set)
{
m_org->updateDelegatedPorts();
@@ -580,7 +581,7 @@
{
public:
explicit addCallback(::SDOPackage::PeriodicECOrganization* org) : m_org(org) {}
- virtual ~addCallback(){};
+ virtual ~addCallback(){}
virtual void operator()(const coil::Properties& config_set)
{
m_org->updateDelegatedPorts();
@@ -603,7 +604,8 @@
m_objref = RTC::RTObject::_duplicate(m_ref);
m_org = new SDOPackage::PeriodicECOrganization(this);
::CORBA_SeqUtil::push_back(m_sdoOwnedOrganizations,
- ::SDOPackage::Organization::_duplicate(m_org->getObjRef()));
+ ::SDOPackage::Organization::
+ _duplicate(m_org->getObjRef()));
bindParameter("members", m_members, "", stringToStrVec);
m_configsets.setOnSetConfigurationSet(new setCallback(m_org));
@@ -714,7 +716,8 @@
* @brief Callback function to deactivate
* @endif
*/
- ReturnCode_t PeriodicECSharedComposite::onDeactivated(RTC::UniqueId exec_handle)
+ ReturnCode_t PeriodicECSharedComposite::
+ onDeactivated(RTC::UniqueId exec_handle)
{
RTC_TRACE(("onDeactivated(%d)", exec_handle));
::RTC::ExecutionContextList_var ecs(get_owned_contexts());
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -32,7 +32,7 @@
*/
struct PortAdmin::find_port_name
{
- explicit find_port_name(const char* name) : m_name(name) {};
+ explicit find_port_name(const char* name) : m_name(name) {}
bool operator()(const PortService_ptr& p)
{
try
@@ -59,7 +59,7 @@
struct PortAdmin::find_port
{
- explicit find_port(const PortService_ptr& p) : m_port(p) {};
+ explicit find_port(const PortService_ptr& p) : m_port(p) {}
bool operator()(const PortService_ptr& p)
{
return m_port->_is_equivalent(p);
@@ -77,7 +77,7 @@
struct PortAdmin::del_port
{
PortAdmin* m_pa;
- explicit del_port(PortAdmin* pa) : m_pa(pa) {};
+ explicit del_port(PortAdmin* pa) : m_pa(pa) {}
void operator()(PortBase* p)
{
m_pa->removePort(*p);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -314,9 +314,10 @@
*/
ReturnCode_t PortBase::_publishInterfaces(void)
{
- if(!(m_connectionLimit < 0))
+ if (!(m_connectionLimit < 0))
{
- if((::CORBA::ULong)m_connectionLimit<=m_profile.connector_profiles.length())
+ if ((::CORBA::ULong)m_connectionLimit <=
+ m_profile.connector_profiles.length())
{
RTC_PARANOID(("Connected number has reached the limitation."));
RTC_PARANOID(("Can connect the port up to %d ports.",
@@ -437,7 +438,7 @@
m_profile.connector_profiles[i] =
m_profile.connector_profiles[i + 1] ;
}
- m_profile.connector_profiles._length=len-1;
+ m_profile.connector_profiles._length = len-1;
}
#endif // ORB_IS_RTORB
onDisconnected(getName(), prof, retval);
@@ -468,7 +469,7 @@
for (CORBA::ULong i(0); i < len; ++i)
{
ReturnCode_t tmpret;
- tmpret =this->disconnect(plist[i].connector_id);
+ tmpret = this->disconnect(plist[i].connector_id);
if (tmpret != RTC::RTC_OK) retcode = tmpret;
}
@@ -729,7 +730,7 @@
{
coil::UUID_Generator uugen;
uugen.init();
- std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2,0x01));
+ std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
return std::string((const char*)uuid->to_string());
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -68,7 +68,7 @@
*
* @endif
*/
- virtual ~ConnectionCallback(void){}
+ virtual ~ConnectionCallback(void) {}
/*!
* @if jp
@@ -137,7 +137,7 @@
*
* @endif
*/
- virtual ~DisconnectCallback(void){}
+ virtual ~DisconnectCallback(void) {}
/*!
* @if jp
*
@@ -205,7 +205,7 @@
*
* @endif
*/
- virtual ~OnWrite(void){}
+ virtual ~OnWrite(void) {}
/*!
* @if jp
@@ -270,7 +270,7 @@
*
* @endif
*/
- virtual ~OnWriteConvert(void){}
+ virtual ~OnWriteConvert(void) {}
/*!
* @if jp
@@ -337,7 +337,7 @@
*
* @endif
*/
- virtual ~OnRead(void){}
+ virtual ~OnRead(void) {}
/*!
* @if jp
@@ -399,7 +399,7 @@
*
* @endif
*/
- virtual ~OnReadConvert(void){}
+ virtual ~OnReadConvert(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -50,7 +50,7 @@
* @class PortConnectListener class
* @endif
*/
- PortConnectListener::~PortConnectListener(){}
+ PortConnectListener::~PortConnectListener() {}
/*!
* @if jp
@@ -84,7 +84,7 @@
* @class PortConnectRetListener class
* @endif
*/
- PortConnectRetListener::~PortConnectRetListener(){}
+ PortConnectRetListener::~PortConnectRetListener() {}
//============================================================
/*!
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -281,10 +281,22 @@
RTC_DEBUG(("push_policy: %s", push_policy.c_str()));
coil::normalize(push_policy);
- if (push_policy == "all") { m_pushPolicy = ALL; }
- else if (push_policy == "fifo") { m_pushPolicy = FIFO; }
- else if (push_policy == "skip") { m_pushPolicy = SKIP; }
- else if (push_policy == "new") { m_pushPolicy = NEW; }
+ if (push_policy == "all")
+ {
+ m_pushPolicy = ALL;
+ }
+ else if (push_policy == "fifo")
+ {
+ m_pushPolicy = FIFO;
+ }
+ else if (push_policy == "skip")
+ {
+ m_pushPolicy = SKIP;
+ }
+ else if (push_policy == "new")
+ {
+ m_pushPolicy = NEW;
+ }
else
{
RTC_ERROR(("invalid push_policy value: %s", push_policy.c_str()));
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -411,10 +411,22 @@
RTC_DEBUG(("push_policy: %s", push_policy.c_str()));
coil::normalize(push_policy);
- if (push_policy == "all") { m_pushPolicy = ALL; }
- else if (push_policy == "fifo") { m_pushPolicy = FIFO; }
- else if (push_policy == "skip") { m_pushPolicy = SKIP; }
- else if (push_policy == "new") { m_pushPolicy = NEW; }
+ if (push_policy == "all")
+ {
+ m_pushPolicy = ALL;
+ }
+ else if (push_policy == "fifo")
+ {
+ m_pushPolicy = FIFO;
+ }
+ else if (push_policy == "skip")
+ {
+ m_pushPolicy = SKIP;
+ }
+ else if (push_policy == "new")
+ {
+ m_pushPolicy = NEW;
+ }
else
{
RTC_ERROR(("invalid push_policy value: %s", push_policy.c_str()));
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -70,8 +70,8 @@
m_created(true), m_exiting(false),
m_properties(default_conf), m_configsets(m_properties.getNode("conf")),
m_sdoservice(*this),
- m_readAll(false),m_writeAll(false),
- m_readAllCompletion(false),m_writeAllCompletion(false)
+ m_readAll(false), m_writeAll(false),
+ m_readAllCompletion(false), m_writeAllCompletion(false)
{
m_objref = this->_this();
m_pSdoConfigImpl = new SDOPackage::Configuration_impl(m_configsets,
@@ -96,8 +96,8 @@
m_created(true), m_exiting(false),
m_properties(default_conf), m_configsets(m_properties.getNode("conf")),
m_sdoservice(*this),
- m_readAll(false),m_writeAll(false),
- m_readAllCompletion(false),m_writeAllCompletion(false)
+ m_readAll(false), m_writeAll(false),
+ m_readAllCompletion(false), m_writeAllCompletion(false)
{
m_objref = this->_this();
m_pSdoConfigImpl = new SDOPackage::Configuration_impl(m_configsets,
@@ -369,18 +369,18 @@
// Return RTC::PRECONDITION_NOT_MET,
// When the component is registered in ExecutionContext.
// m_ecMine.length() != 0 ||
- if(m_ecOther.length() != 0)
- {
+ if (m_ecOther.length() != 0)
+ {
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;
}
}
CORBA_SeqUtil::clear(m_ecOther);
- }
+ }
ReturnCode_t ret(on_finalize());
@@ -517,7 +517,7 @@
execlist = new ExecutionContextList();
int n = m_ecMine.length();
- for(int i(0), j(0); i < n ; ++i)
+ for (int i(0), j(0); i < n ; ++i)
{
RTC_ExecutionContext ec_mine = m_ecMine.cobj()->_buffer[i];
@@ -2008,7 +2008,7 @@
std::vector<InPortBase*>::iterator it_end = m_inports.end();
bool ret(true);
- while( it != it_end )
+ while ( it != it_end )
{
if (!((*it)->read()))
@@ -2041,7 +2041,7 @@
bool ret(true);
- while( it != it_end )
+ while ( it != it_end )
{
if (!((*it)->write()))
{
@@ -2594,7 +2594,10 @@
RTC_DEBUG_STR((*p_type));
p << *p_type;
}
- else { RTC_DEBUG(("p_type none")); }
+ else
+ {
+ RTC_DEBUG(("p_type none"));
+ }
// EC name specified
RTC_DEBUG(("size: %d, name: %s", type_and_name.size(),
@@ -2611,7 +2614,10 @@
RTC_DEBUG_STR((*p_name));
p << *p_name;
}
- else { RTC_DEBUG(("p_name none")); }
+ else
+ {
+ RTC_DEBUG(("p_name none"));
+ }
}
ec_args.push_back(p);
RTC_DEBUG(("New EC properties stored:"));
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -3302,7 +3302,7 @@
*
* @endif
*/
- void setReadAll(bool read=true, bool completion=false);
+ void setReadAll(bool read = true, bool completion = false);
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -90,7 +90,8 @@
}
}
-// RTObjectStateMachine::RTObjectStateMachine(const RTObjectStateMachine& other)
+// RTObjectStateMachine::
+// RTObjectStateMachine(const RTObjectStateMachine& other)
// : m_id(other.m_id),
// m_rtobj(RTC::LightweightRTObject::_duplicate(other.m_rtobj)),
// m_sm(other.m_sm),
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -650,7 +650,7 @@
if (std::string(id).empty())
throw InvalidParameter("ID is empty.");
- if(m_configsets.activateConfigurationSet(id))
+ if (m_configsets.activateConfigurationSet(id))
{
return true;
}
@@ -723,7 +723,7 @@
{
coil::UUID_Generator uugen;
uugen.init();
- std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2,0x01));
+ std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
return (const char*) uuid->to_string();
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -39,7 +39,7 @@
coil::UUID_Generator uugen;
uugen.init();
- std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2,0x01));
+ std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
m_pId = uuid->to_string();
#ifdef WIN32
uuid->~UUID();
@@ -54,7 +54,7 @@
{
coil::UUID_Generator uugen;
uugen.init();
- std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2,0x01));
+ std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
m_pId = uuid->to_string();
#ifdef WIN32
uuid->~UUID();
@@ -189,7 +189,7 @@
}
CORBA::Long index;
- index = CORBA_SeqUtil::find(m_orgProperty.properties,nv_name(name));
+ index = CORBA_SeqUtil::find(m_orgProperty.properties, nv_name(name));
if (index < 0)
{
NameValue nv;
@@ -221,7 +221,7 @@
throw InvalidParameter("remove_organization_property(): Enpty name.");
CORBA::Long index;
- index = CORBA_SeqUtil::find(m_orgProperty.properties,nv_name(name));
+ index = CORBA_SeqUtil::find(m_orgProperty.properties, nv_name(name));
if (index < 0)
throw InvalidParameter("remove_organization_property(): Not found.");
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-01-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-01-17 07:25:02 UTC (rev 2846)
@@ -472,7 +472,7 @@
{
coil::UUID_Generator uugen;
uugen.init();
- std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2,0x01));
+ std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
return (const char*) uuid->to_string();
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -785,7 +785,7 @@
if (state.curr != state.next)
{
state.curr = state.next;
- if(m_entry[state.curr] != NULL)
+ if (m_entry[state.curr] != NULL)
(m_listener->*m_entry[state.curr])(state);
update_curr(state.curr);
}
@@ -821,7 +821,7 @@
if (state.curr != state.next)
{
state.curr = state.next;
- if(m_entry[state.curr] != NULL)
+ if (m_entry[state.curr] != NULL)
{
(m_listener->*m_entry[state.curr])(state);
}
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-16 11:05:43 UTC (rev 2845)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h 2017-01-17 07:25:02 UTC (rev 2846)
@@ -110,7 +110,8 @@
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)
+ RTL_PARANOID // 8: (FATAL, ERROR, WARN, INFO,
+ // DEBUG, TRACE, VERBOSE, PARA)
};
/*!
More information about the openrtm-commit
mailing list