[openrtm-commit:02229] r2842 - 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月 16日 (月) 16:49:32 JST
Author: sec_fukai
Date: 2017-01-16 16:49:32 +0900 (Mon, 16 Jan 2017)
New Revision: 2842
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.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.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.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/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/Signal.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h
Log:
[compat,->DEV_IQ_2016] Convert remained tabs to much spaces. refs #3758
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -184,7 +184,7 @@
static ClockManager* clockmgr;
static coil::Mutex clockmgr_mutex;
private:
- ClockManager() {};
+ ClockManager() {};
#endif
private:
SystemClock m_systemClock;
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Listener.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -94,7 +94,7 @@
* @endif
*/
template <class ListenerClass,
- class CallbackFunc = void (ListenerClass::*)()>
+ class CallbackFunc = void (ListenerClass::*)()>
class ListenerObject
: public ListenerBase
{
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -732,14 +732,14 @@
ostream_type& level(int level)
{
if (m_minLevel <= level && level <= m_logLevel)
- {
+ {
header(level);
- return *this;
- }
+ return *this;
+ }
else
- {
- return m_dummy;
- }
+ {
+ return m_dummy;
+ }
}
/*!
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -418,7 +418,7 @@
* @endif
*/
const std::string& getProperty(const std::string& key,
- const std::string& def) const;
+ const std::string& def) const;
/*!
* @if jp
@@ -1103,7 +1103,7 @@
* @endif
*/
static void splitKeyValue(const std::string& str, std::string& key,
- std::string& value);
+ std::string& value);
/*!
* @if jp
@@ -1137,7 +1137,7 @@
* @endif
*/
static bool split(const std::string& str, const char delim,
- std::vector<std::string>& value);
+ std::vector<std::string>& value);
/*!
* @if jp
@@ -1172,8 +1172,8 @@
* @endif
*/
static Properties* _getNode(std::vector<std::string>& keys,
- std::vector<Properties*>::size_type index,
- const Properties* curr);
+ std::vector<Properties*>::size_type index,
+ const Properties* curr);
/*!
* @if jp
@@ -1197,8 +1197,8 @@
* @endif
*/
static void _propertiyNames(std::vector<std::string>& names,
- std::string curr_name,
- const Properties* curr);
+ std::string curr_name,
+ const Properties* curr);
/*!
* @if jp
@@ -1222,7 +1222,7 @@
* @endif
*/
static void _store(std::ostream& out, std::string curr_name,
- Properties* curr);
+ Properties* curr);
/*!
* @if jp
@@ -1252,7 +1252,7 @@
* @endif
*/
static std::ostream& _dump(std::ostream& out, const Properties& curr,
- int index);
+ int index);
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -133,13 +133,13 @@
// DLC pattern
if (!m_instance)
- {
- coil::Guard<coil::Mutex> guard(m_mutex);
- if (!m_instance)
- {
- m_instance = new SingletonClass();
- }
- }
+ {
+ coil::Guard<coil::Mutex> guard(m_mutex);
+ if (!m_instance)
+ {
+ m_instance = new SingletonClass();
+ }
+ }
return *m_instance;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -253,8 +253,8 @@
*/
template <class ListenerClass>
ListenerId registerListenerObj(ListenerClass* obj,
- void (ListenerClass::*cbf)(),
- TimeValue tm)
+ void (ListenerClass::*cbf)(),
+ TimeValue tm)
{
return registerListener(new ListenerObject<ListenerClass>(obj, cbf), tm);
}
@@ -322,7 +322,7 @@
struct Task
{
Task(ListenerBase* l, TimeValue p)
- : listener(l), period(p), remains(p)
+ : listener(l), period(p), remains(p)
{
}
ListenerBase* listener;
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -239,11 +239,11 @@
int result = getopt(m_argc, m_argv, m_opt);
#ifdef __QNX__
if(::optind == optind_last)
- {
+ {
::optind++;
result = getopt(m_argc, m_argv, m_opt);
optind_last = ::optind;
- }
+ }
#endif
optarg = ::optarg;
optind = ::optind;
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -55,15 +55,15 @@
{
cv->waiters_count_ = 0;
cv->was_broadcast_ = 0;
- cv->sema_ = ::CreateSemaphore (NULL, // no security
+ cv->sema_ = ::CreateSemaphore (NULL, // no security
0, // initially 0
0x7fffffff, // max count
NULL); // unnamed
- cv->waiters_done_ = ::CreateEvent (NULL, // no security
+ cv->waiters_done_ = ::CreateEvent (NULL, // no security
FALSE, // auto-reset
FALSE, // non-signaled initially
NULL); // unnamed
- return 0;
+ return 0;
}
/*!
@@ -185,8 +185,8 @@
*/
bool wait()
{
- return 0 == pthread_cond_wait(&m_cond, &m_mutex, INFINITE);
- }
+ return 0 == pthread_cond_wait(&m_cond, &m_mutex, INFINITE);
+ }
/*!
* @if jp
@@ -331,7 +331,7 @@
// std::cout << "Before ReleaseSemaphore(1)" << std::endl << std::flush ;
ReleaseSemaphore (cv->sema_, 1, 0);
// std::cout << "After ReleaseSemaphore(1)" << std::endl << std::flush ;
- return 0;
+ return 0;
}
/*!
@@ -385,7 +385,7 @@
}
else
cv->waiters_count_lock_.unlock();
- return 0;
+ return 0;
}
explicit Condition(const Mutex&);
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -67,12 +67,10 @@
::InitializeSecurityDescriptor(&sd_buffer,
SECURITY_DESCRIPTOR_REVISION);
::SetSecurityDescriptorDacl (&sd_buffer, TRUE, 0, FALSE);
- 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 );
+ 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 );
}
@@ -94,8 +92,7 @@
*/
~Mutex()
{
- ::CloseHandle(mutex_);
-
+ ::CloseHandle(mutex_);
}
/*!
@@ -115,7 +112,7 @@
*/
inline void lock()
{
- ::WaitForSingleObject(mutex_,INFINITE);
+ ::WaitForSingleObject(mutex_,INFINITE);
}
/*!
@@ -135,20 +132,20 @@
*/
inline bool trylock()
{
- unsigned long dwret;
- dwret = ::WaitForSingleObject(mutex_,0);
- switch(dwret)
- {
- case WAIT_ABANDONED:
- return true;
- break;
- case WAIT_OBJECT_0:
- return false;
- case WAIT_TIMEOUT:
- return true;
- default:
- return true;
- }
+ unsigned long dwret;
+ dwret = ::WaitForSingleObject(mutex_,0);
+ switch(dwret)
+ {
+ case WAIT_ABANDONED:
+ return true;
+ break;
+ case WAIT_OBJECT_0:
+ return false;
+ case WAIT_TIMEOUT:
+ return true;
+ default:
+ return true;
+ }
}
/*!
@@ -168,14 +165,14 @@
*/
inline void unlock()
{
- ::ReleaseMutex(mutex_);
+ ::ReleaseMutex(mutex_);
}
HANDLE mutex_;
private:
SECURITY_ATTRIBUTES m_Security_attr;
- Mutex(const Mutex&);
+ Mutex(const Mutex&);
Mutex& operator=(const Mutex &);
};
};
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -119,21 +119,21 @@
switch (arch)
{
- case PROCESSOR_ARCHITECTURE_INTEL:
- strcpy(cputype, "Intel");
- if (sys_info.wProcessorLevel == 3)
- strcpy(subtype, "80386");
- else if (sys_info.wProcessorLevel == 4)
- strcpy(subtype, "80486");
- else if (sys_info.wProcessorLevel == 5)
- strcpy(subtype, "Pentium");
- else if (sys_info.wProcessorLevel == 6)
- strcpy(subtype, "Pentium Pro");
- else if (sys_info.wProcessorLevel == 7)
- strcpy(subtype, "Pentium II");
- else
- strcpy(subtype, "Pentium Family");
- break;
+ case PROCESSOR_ARCHITECTURE_INTEL:
+ strcpy(cputype, "Intel");
+ if (sys_info.wProcessorLevel == 3)
+ strcpy(subtype, "80386");
+ else if (sys_info.wProcessorLevel == 4)
+ strcpy(subtype, "80486");
+ else if (sys_info.wProcessorLevel == 5)
+ strcpy(subtype, "Pentium");
+ else if (sys_info.wProcessorLevel == 6)
+ strcpy(subtype, "Pentium Pro");
+ else if (sys_info.wProcessorLevel == 7)
+ strcpy(subtype, "Pentium II");
+ else
+ strcpy(subtype, "Pentium Family");
+ break;
default:
strcpy(cputype, "Unknown");
strcpy(subtype, "Unknown");
@@ -143,7 +143,7 @@
// name.nodename
DWORD len = COIL_UTSNAME_LENGTH;
if (GetComputerNameExA(ComputerNameDnsHostname,
- name->nodename,
+ name->nodename,
&len) == false)
ret = -1;
return ret;
@@ -226,15 +226,15 @@
return ::getenv(name);
}
- static int opterr = 1, /* if error message should be printed */
- optind = 1, /* index into parent argv vector */
- optopt, /* character checked for validity */
- optreset; /* reset getopt */
- static char *optarg; /* argument associated with option */
+ static int opterr = 1, /* if error message should be printed */
+ optind = 1, /* index into parent argv vector */
+ optopt, /* character checked for validity */
+ optreset; /* reset getopt */
+ static char *optarg; /* argument associated with option */
-#define BADCH (int)'?'
-#define BADARG (int)':'
-#define EMSG ""
+#define BADCH (int)'?'
+#define BADARG (int)':'
+#define EMSG ""
/*!
* @if jp
@@ -257,11 +257,11 @@
*/
static int getopt(int nargc, char * const *nargv, const char *ostr)
{
- static char *place = EMSG; /* option letter processing */
- const char *oli; /* option letter list index */
+ static char *place = EMSG; /* option letter processing */
+ const char *oli; /* option letter list index */
char *p;
- if (optreset || !*place) { /* update scanning pointer */
+ if (optreset || !*place) { /* update scanning pointer */
optreset = 0;
/* Check that the scanning reached the last element. */
if (optind >= nargc)
@@ -291,12 +291,12 @@
break;
}
}
- if (place[1] && *++place == '-') { /* found "--" */
+ if (place[1] && *++place == '-') { /* found "--" */
++optind;
place = EMSG;
return(-1);
}
- } /* option letter okay? */
+ } /* option letter okay? */
if ((optopt = (int)*place++) == (int)':' ||
!(oli = strchr(ostr, optopt))) {
/*
@@ -317,15 +317,15 @@
}
return(BADCH);
}
- if (*++oli != ':') { /* don't need argument */
+ if (*++oli != ':') { /* don't need argument */
optarg = NULL;
if (!*place)
++optind;
}
- else { /* need an argument */
- if (*place) /* no white space */
+ else { /* need an argument */
+ if (*place) /* no white space */
optarg = place;
- else if (nargc <= ++optind) { /* no arg */
+ else if (nargc <= ++optind) { /* no arg */
place = EMSG;
if (!(p = strrchr(*nargv, '/')))
p = *nargv;
@@ -339,12 +339,12 @@
p, optopt);
return(BADCH);
}
- else /* white space */
+ else /* white space */
optarg = nargv[optind];
place = EMSG;
++optind;
}
- return(optopt); /* dump back option letter */
+ return(optopt); /* dump back option letter */
}
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -31,8 +31,8 @@
typedef void (*SignalHandler)(int);
typedef struct __sigset {
- unsigned int __bits[_SIG_WORDS];
- } sigset_t;
+ unsigned int __bits[_SIG_WORDS];
+ } sigset_t;
/*!
* @if jp
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -30,10 +30,10 @@
namespace coil
{
- #define EPOCHFILETIME (116444736000000000i64)
-struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
+ #define EPOCHFILETIME (116444736000000000i64)
+ struct timezone {
+ int tz_minuteswest;
+ int tz_dsttime;
};
/*!
@@ -234,36 +234,36 @@
*/
inline int gettimeofday(struct timeval *tv, struct timezone *tz)
{
- FILETIME ftime;
- LARGE_INTEGER lint;
- __int64 val64;
- if (tv != NULL)
- {
- ::GetSystemTimeAsFileTime(&ftime);
- lint.LowPart = ftime.dwLowDateTime;
- lint.HighPart = ftime.dwHighDateTime;
- val64 = lint.QuadPart;
- val64 = val64 - EPOCHFILETIME;
- val64 = val64 / 10;
- tv->tv_sec = (long)(val64 / 1000000);
- tv->tv_usec = (long)(val64 % 1000000);
- }
- if (tz)
- {
- static int tzflag;
- if (!tzflag)
- {
- ::_tzset();
- ++tzflag;
- }
- long tzone = 0;
- ::_get_timezone(&tzone);
- tz->tz_minuteswest = tzone / 60;
- int dlight = 0;
- ::_get_daylight(&dlight);
- tz->tz_dsttime = dlight;
- }
- return 0;
+ FILETIME ftime;
+ LARGE_INTEGER lint;
+ __int64 val64;
+ if (tv != NULL)
+ {
+ ::GetSystemTimeAsFileTime(&ftime);
+ lint.LowPart = ftime.dwLowDateTime;
+ lint.HighPart = ftime.dwHighDateTime;
+ val64 = lint.QuadPart;
+ val64 = val64 - EPOCHFILETIME;
+ val64 = val64 / 10;
+ tv->tv_sec = (long)(val64 / 1000000);
+ tv->tv_usec = (long)(val64 % 1000000);
+ }
+ if (tz)
+ {
+ static int tzflag;
+ if (!tzflag)
+ {
+ ::_tzset();
+ ++tzflag;
+ }
+ long tzone = 0;
+ ::_get_timezone(&tzone);
+ tz->tz_minuteswest = tzone / 60;
+ int dlight = 0;
+ ::_get_daylight(&dlight);
+ tz->tz_dsttime = dlight;
+ }
+ return 0;
}
/*!
@@ -316,28 +316,28 @@
inline int settimeofday(const struct timeval *tv , const struct timezone *tz)
{
- SYSTEMTIME systime;
- FILETIME ftime;
- LARGE_INTEGER lint;
- __int64 val64;
+ SYSTEMTIME systime;
+ FILETIME ftime;
+ LARGE_INTEGER lint;
+ __int64 val64;
- // tv,tz -> ftime
- if (tv != NULL)
- {
- int bias(0);
- if (tz != NULL)
- {
- bias = tz->tz_minuteswest;
- }
+ // tv,tz -> ftime
+ if (tv != NULL)
+ {
+ int bias(0);
+ if (tz != NULL)
+ {
+ bias = tz->tz_minuteswest;
+ }
- val64 = (tv->tv_sec + bias * 60) * 1000000;
- val64 = val64 + tv->tv_usec;
- lint.QuadPart = val64;
- ftime.dwHighDateTime = lint.LowPart;
- ftime.dwHighDateTime = lint.HighPart;
- ::FileTimeToSystemTime(&ftime, &systime);
- ::SetSystemTime(&systime);
- }
+ val64 = (tv->tv_sec + bias * 60) * 1000000;
+ val64 = val64 + tv->tv_usec;
+ lint.QuadPart = val64;
+ ftime.dwHighDateTime = lint.LowPart;
+ ftime.dwHighDateTime = lint.HighPart;
+ ::FileTimeToSystemTime(&ftime, &systime);
+ ::SetSystemTime(&systime);
+ }
return 0;
}
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -347,7 +347,7 @@
* @endif
*/
template <typename VarType,
- typename TransFunc = bool (*)(VarType&, const char*)>
+ typename TransFunc = bool (*)(VarType&, const char*)>
class Config
: public ConfigBase
{
@@ -378,7 +378,7 @@
* @endif
*/
Config(const char* name, VarType& var, const char* def_val,
- TransFunc trans = coil::stringTo)
+ TransFunc trans = coil::stringTo)
: ConfigBase(name, def_val), m_var(var), m_trans(trans)
{
}
@@ -690,8 +690,8 @@
*/
template <typename VarType>
bool bindParameter(const char* param_name, VarType& var,
- const char* def_val,
- bool (*trans)(VarType&, const char*) = coil::stringTo)
+ const char* def_val,
+ bool (*trans)(VarType&, const char*) = coil::stringTo)
{
if (param_name == 0) { return false; }
if (def_val == 0) { return false; }
@@ -1549,7 +1549,7 @@
bool operator()(ConfigBase* conf)
{
if (conf == 0) { return false; }
- return (m_name == conf->name);
+ return (m_name == conf->name);
}
};
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -221,9 +221,9 @@
virtual bool setObject(CORBA::Object_ptr obj)
{
if (CORBA::is_nil(obj))
- {
- return false;
- }
+ {
+ return false;
+ }
m_objref = CORBA::Object::_duplicate(obj);
return true;
}
@@ -333,8 +333,8 @@
* @endif
*/
template <class ObjectType,
- typename ObjectTypePtr = typename ObjectType::_ptr_type,
- typename ObjectTypeVar = typename ObjectType::_var_type>
+ typename ObjectTypePtr = typename ObjectType::_ptr_type,
+ typename ObjectTypeVar = typename ObjectType::_var_type>
class CorbaConsumer
: public CorbaConsumerBase
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -253,7 +253,7 @@
* @endif
*/
void bind(const CosNaming::Name& name, CORBA::Object_ptr obj,
- const bool force = 1)
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed,
InvalidName, AlreadyBound);
@@ -296,7 +296,7 @@
* @endif
*/
void bindByString(const char* string_name, CORBA::Object_ptr obj,
- const bool force = 1)
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed,
InvalidName, AlreadyBound);
@@ -361,8 +361,8 @@
* @endif
*/
void bindRecursive(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name,
- CORBA::Object_ptr obj)
+ const CosNaming::Name& name,
+ CORBA::Object_ptr obj)
throw (SystemException, CannotProceed, InvalidName, AlreadyBound);
/*!
@@ -403,7 +403,7 @@
* @endif
*/
void rebind(const CosNaming::Name& name, CORBA::Object_ptr obj,
- const bool force = 1)
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed, InvalidName);
/*!
@@ -443,7 +443,7 @@
* @endif
*/
void rebindByString(const char* string_name, CORBA::Object_ptr obj,
- const bool force = 1)
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed, InvalidName);
/*!
@@ -484,8 +484,8 @@
* @endif
*/
void rebindRecursive(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name,
- CORBA::Object_ptr obj)
+ const CosNaming::Name& name,
+ CORBA::Object_ptr obj)
throw (SystemException, CannotProceed, InvalidName);
/*!
@@ -525,8 +525,8 @@
* @endif
*/
void bindContext(const CosNaming::Name& name,
- CosNaming::NamingContext_ptr name_cxt,
- const bool force = 1)
+ CosNaming::NamingContext_ptr name_cxt,
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed,
InvalidName, AlreadyBound);
@@ -568,8 +568,8 @@
* @endif
*/
void bindContext(const char* string_name,
- CosNaming::NamingContext_ptr name_cxt,
- const bool force = 1)
+ CosNaming::NamingContext_ptr name_cxt,
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed,
InvalidName, AlreadyBound);
@@ -599,8 +599,8 @@
* @endif
*/
void bindContextRecursive(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name,
- CosNaming::NamingContext_ptr name_cxt);
+ const CosNaming::Name& name,
+ CosNaming::NamingContext_ptr name_cxt);
/*!
* @if jp
@@ -641,8 +641,8 @@
* @endif
*/
void rebindContext(const CosNaming::Name& name,
- CosNaming::NamingContext_ptr name_cxt,
- const bool force = 1)
+ CosNaming::NamingContext_ptr name_cxt,
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed, InvalidName);
/*!
@@ -684,8 +684,8 @@
* @endif
*/
void rebindContext(const char* string_name,
- CosNaming::NamingContext_ptr name_cxt,
- const bool force = 1)
+ CosNaming::NamingContext_ptr name_cxt,
+ const bool force = 1)
throw (SystemException, NotFound, CannotProceed, InvalidName);
/*!
@@ -714,8 +714,8 @@
* @endif
*/
void rebindContextRecursive(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name,
- CosNaming::NamingContext_ptr name_cxt);
+ const CosNaming::Name& name,
+ CosNaming::NamingContext_ptr name_cxt);
/*!
* @if jp
@@ -1365,8 +1365,8 @@
* @endif
*/
CORBA::Object_ptr bindOrResolve(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name,
- CORBA::Object_ptr obj);
+ const CosNaming::Name& name,
+ CORBA::Object_ptr obj);
/*!
* @if jp
@@ -1403,8 +1403,8 @@
*/
CosNaming::NamingContext_ptr
bindOrResolveContext(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name,
- CosNaming::NamingContext_ptr new_context);
+ const CosNaming::Name& name,
+ CosNaming::NamingContext_ptr new_context);
/*!
* @if jp
@@ -1438,7 +1438,7 @@
*/
CosNaming::NamingContext_ptr
bindOrResolveContext(CosNaming::NamingContext_ptr context,
- const CosNaming::Name& name);
+ const CosNaming::Name& name);
/*!
* @if jp
@@ -1577,8 +1577,8 @@
* @endif
*/
CosNaming::Name subName(const CosNaming::Name& name,
- CORBA::Long begin,
- CORBA::Long end = -1);
+ CORBA::Long begin,
+ CORBA::Long end = -1);
protected:
/*!
@@ -1614,7 +1614,7 @@
* @endif
*/
void nameToString(const CosNaming::Name& name, char* string_name,
- CORBA::ULong slen);
+ CORBA::ULong slen);
/*!
* @if jp
* @brief ネームコンポーネントの文字列表現時の文字長を取得する
@@ -1671,8 +1671,8 @@
* @endif
*/
unsigned int split(const std::string& input,
- const std::string& delimiter,
- std::vector<std::string>& results);
+ const std::string& delimiter,
+ std::vector<std::string>& results);
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -246,8 +246,8 @@
* @endif
*/
ECFactoryCXX(const char* name,
- ECNewFunc new_func,
- ECDeleteFunc delete_func);
+ ECNewFunc new_func,
+ ECDeleteFunc delete_func);
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -589,16 +589,16 @@
* @brief onStarted() template function
*/
virtual RTC::ReturnCode_t onStarted();
- // template virtual functions adding/removing component
- /*!
- * @brief onAddedComponent() template function
- */
- virtual RTC::ReturnCode_t
- onAddedComponent(RTC::LightweightRTObject_ptr rtobj);
- /*!
- * @brief onRemovedComponent() template function
- */
- virtual RTC::ReturnCode_t
+ // template virtual functions adding/removing component
+ /*!
+ * @brief onAddedComponent() template function
+ */
+ virtual RTC::ReturnCode_t
+ onAddedComponent(RTC::LightweightRTObject_ptr rtobj);
+ /*!
+ * @brief onRemovedComponent() template function
+ */
+ virtual RTC::ReturnCode_t
onRemovedComponent(RTC::LightweightRTObject_ptr rtobj);
/*!
* @brief onWaitingActivated() template function
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -321,9 +321,9 @@
* @endif
*/
FactoryCXX(const coil::Properties& profile,
- RtcNewFunc new_func,
- RtcDeleteFunc delete_func,
- NumberingPolicy* policy = new DefaultNumberingPolicy());
+ RtcNewFunc new_func,
+ RtcDeleteFunc delete_func,
+ NumberingPolicy* policy = new DefaultNumberingPolicy());
virtual ~FactoryCXX()
{
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -145,13 +145,13 @@
* @endif
*/
InPort(const char* name, DataType& value,
- int bufsize=64,
- bool read_block = false, bool write_block = false,
- int read_timeout = 0, int write_timeout = 0)
+ 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)
- : InPortBase(name, ::CORBA_Util::toRepositoryIdOfStruct<DataType>()),
+ : InPortBase(name, ::CORBA_Util::toRepositoryIdOfStruct<DataType>()),
#else
- : InPortBase(name, ::CORBA_Util::toRepositoryId<DataType>()),
+ : InPortBase(name, ::CORBA_Util::toRepositoryId<DataType>()),
#endif
m_name(name), m_value(value),
m_OnRead(NULL), m_OnReadConvert(NULL),
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -488,7 +488,7 @@
explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop) : m_prop(prop) {}
void operator()(InPortProvider* provider)
{
- provider->publishInterfaceProfile(m_prop);
+ provider->publishInterfaceProfile(m_prop);
}
SDOPackage::NVList& m_prop;
};
@@ -506,7 +506,7 @@
: m_prop(prop), provider_(0) {}
void operator()(InPortProvider* provider)
{
- if (provider->publishInterface(m_prop))
+ if (provider->publishInterface(m_prop))
{
provider_ = provider;
}
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -532,8 +532,8 @@
* @endif
*/
bool registerFactory(coil::Properties& profile,
- RtcNewFunc new_func,
- RtcDeleteFunc delete_func);
+ RtcNewFunc new_func,
+ RtcDeleteFunc delete_func);
/*!
* @if jp
@@ -581,8 +581,8 @@
* @endif
*/
bool registerECFactory(const char* name,
- ECNewFunc new_func,
- ECDeleteFunc delete_func);
+ ECNewFunc new_func,
+ ECDeleteFunc delete_func);
/*!
* @if jp
@@ -1719,7 +1719,7 @@
* @endif
*/
std::string formatString(const char* naming_format,
- coil::Properties& prop);
+ coil::Properties& prop);
@@ -1899,7 +1899,7 @@
{
}
explicit FactoryPredicate(FactoryBase* factory)
- : m_vendor(factory->profile()["vendor"]),
+ : m_vendor(factory->profile()["vendor"]),
m_category(factory->profile()["category"]),
m_impleid(factory->profile()["implementation_id"]),
m_version(factory->profile()["version"])
@@ -1962,7 +1962,7 @@
* @endif
*/
typedef ObjectManager<const coil::Properties, FactoryBase,
- FactoryPredicate> FactoryManager;
+ FactoryPredicate> FactoryManager;
/*!
* @if jp
@@ -1981,16 +1981,16 @@
{
explicit ECFactoryPredicate(const char* name) : m_name(name){};
explicit ECFactoryPredicate(ECFactoryBase* factory)
- : m_name(factory->name()) {};
+ : m_name(factory->name()) {};
bool operator()(ECFactoryBase* factory)
{
- return m_name == factory->name();
+ return m_name == factory->name();
}
std::string m_name;
};
typedef ObjectManager<const char*,
- ECFactoryBase,
- ECFactoryPredicate> ECFactoryManager;
+ ECFactoryBase,
+ ECFactoryPredicate> ECFactoryManager;
/*!
* @if jp
@@ -2015,7 +2015,7 @@
{
void operator()(FactoryBase* f)
{
- modlist.push_back(f->profile().getProperty("implementation_id"));
+ modlist.push_back(f->profile().getProperty("implementation_id"));
}
std::vector<std::string> modlist;
};
@@ -2061,7 +2061,7 @@
*/
explicit OrbRunner(CORBA::ORB_ptr orb) : m_pORB(orb)
{
- open(0);
+ open(0);
};
/*!
@@ -2087,8 +2087,8 @@
*/
virtual int open(void *args)
{
- activate();
- return 0;
+ activate();
+ return 0;
}
/*!
@@ -2110,9 +2110,9 @@
*/
virtual int svc(void)
{
- m_pORB->run();
-// Manager::instance().shutdown();
- return 0;
+ m_pORB->run();
+// Manager::instance().shutdown();
+ return 0;
}
/*!
@@ -2138,7 +2138,7 @@
*/
virtual int close(unsigned long flags)
{
- return 0;
+ return 0;
}
private:
CORBA::ORB_ptr m_pORB;
@@ -2212,7 +2212,7 @@
*/
void terminate()
{
- open(0);
+ open(0);
}
/*!
@@ -2238,8 +2238,8 @@
*/
virtual int open(void *args)
{
- activate();
- return 0;
+ activate();
+ return 0;
}
/*!
@@ -2261,8 +2261,8 @@
*/
virtual int svc(void)
{
- Manager::instance().shutdown();
- return 0;
+ Manager::instance().shutdown();
+ return 0;
}
Manager* m_manager;
};
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -121,7 +121,7 @@
struct Error
{
explicit Error(const std::string& _reason)
- : reason(_reason) {}
+ : reason(_reason) {}
std::string reason;
};
@@ -136,7 +136,7 @@
struct NotFound
{
explicit NotFound(const std::string& _name)
- : name(_name) {}
+ : name(_name) {}
std::string name;
};
@@ -152,7 +152,7 @@
: public NotFound
{
explicit FileNotFound(const std::string& _name)
- : NotFound(_name) {}
+ : NotFound(_name) {}
};
/*!
@@ -167,7 +167,7 @@
: public NotFound
{
explicit ModuleNotFound(const std::string& _name)
- : NotFound(_name) {}
+ : NotFound(_name) {}
};
/*!
@@ -182,7 +182,7 @@
: public NotFound
{
explicit SymbolNotFound(const std::string& _name)
- : NotFound(_name) {}
+ : NotFound(_name) {}
};
/*!
@@ -197,7 +197,7 @@
: public Error
{
explicit NotAllowedOperation(const std::string& _reason)
- : Error(_reason) {}
+ : Error(_reason) {}
};
/*!
@@ -212,7 +212,7 @@
: public Error
{
explicit InvalidArguments(const std::string& _reason)
- : Error(_reason) {}
+ : Error(_reason) {}
};
/*!
@@ -227,7 +227,7 @@
: public Error
{
explicit InvalidOperation(const std::string& _reason)
- : Error(_reason) {}
+ : Error(_reason) {}
};
typedef void (*ModuleInitFunc)(Manager*);
@@ -551,7 +551,7 @@
* @endif
*/
std::string findFile(const std::string& fname,
- const std::vector<std::string>& load_path);
+ const std::vector<std::string>& load_path);
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -173,7 +173,7 @@
* @endif
*/
SDOPackage::NameValue newNVBool(const char* name,
- const CORBA::Boolean value);
+ const CORBA::Boolean value);
/*!
* @if jp
@@ -425,7 +425,7 @@
* @endif
*/
bool isStringValue(const SDOPackage::NVList& nv, const char* name,
- const char* value);
+ const char* value);
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -784,7 +784,7 @@
struct Comps
{
Comps(const char* n, const RTObject_impl* obj)
- : name(n), rtobj(obj)
+ : name(n), rtobj(obj)
{}
std::string name;
const RTObject_impl* rtobj;
@@ -799,7 +799,7 @@
struct Port
{
Port(const char* n, const PortBase* p)
- : name(n), port(p)
+ : name(n), port(p)
{}
std::string name;
const PortBase* port;
@@ -814,7 +814,7 @@
struct Mgr
{
Mgr(const char* n, const RTM::ManagerServant* obj)
- : name(n), mgr(obj)
+ : name(n), mgr(obj)
{}
std::string name;
const RTM::ManagerServant* mgr;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -121,11 +121,11 @@
Guard guard(m_objects._mutex);
it = std::find_if(m_objects._obj.begin(), m_objects._obj.end(),
- Predicate(obj));
+ Predicate(obj));
if (it == m_objects._obj.end())
{
- m_objects._obj.push_back(obj);
- return true;
+ m_objects._obj.push_back(obj);
+ return true;
}
return false;
}
@@ -161,12 +161,12 @@
Guard guard(m_objects._mutex);
it = std::find_if(m_objects._obj.begin(), m_objects._obj.end(),
- Predicate(id));
+ Predicate(id));
if (it != m_objects._obj.end())
{
- Object* obj(*it);
- m_objects._obj.erase(it);
- return obj;
+ Object* obj(*it);
+ m_objects._obj.erase(it);
+ return obj;
}
return NULL;;
}
@@ -204,10 +204,10 @@
ObjectVectorConstItr it;
Guard guard(m_objects._mutex);
it = std::find_if(m_objects._obj.begin(), m_objects._obj.end(),
- Predicate(id));
+ Predicate(id));
if (it != m_objects._obj.end())
{
- return *it;
+ return *it;
}
return NULL;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -510,7 +510,7 @@
explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop) : m_prop(prop) {}
void operator()(OutPortProvider* provider)
{
- provider->publishInterfaceProfile(m_prop);
+ provider->publishInterfaceProfile(m_prop);
}
SDOPackage::NVList& m_prop;
};
@@ -528,7 +528,7 @@
: m_prop(prop), provider_(0) {}
void operator()(OutPortProvider* provider)
{
- if (provider->publishInterface(m_prop))
+ if (provider->publishInterface(m_prop))
{
provider_ = provider;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -126,7 +126,7 @@
*/
virtual ::CORBA::Boolean add_members(const SDOList& sdo_list)
throw (::CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -153,7 +153,7 @@
*/
virtual ::CORBA::Boolean set_members(const SDOList& sdos)
throw (::CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -178,7 +178,7 @@
*/
virtual ::CORBA::Boolean remove_member(const char* id)
throw (::CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -327,19 +327,19 @@
// config_(rtobj->get_configuration())
{
rtobj_ = RTC::RTObject::_duplicate(rtobj);
- profile_ = rtobj->get_component_profile();
- eclist_ = rtobj->get_owned_contexts();
- config_ = rtobj->get_configuration();
+ profile_ = rtobj->get_component_profile();
+ eclist_ = rtobj->get_owned_contexts();
+ config_ = rtobj->get_configuration();
}
virtual ~Member(void)
{
- /*
+ /*
rtobj_.out();
profile_.out();
eclist_.out();
config_.out();
- */
+ */
}
Member(const Member& x)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -534,17 +534,17 @@
{
public:
explicit comp_op(const char* _name)
- : m_name(_name)
+ : m_name(_name)
{
}
explicit comp_op(T* obj)
- : m_name((const char*)(obj->getProfile().name))
+ : m_name((const char*)(obj->getProfile().name))
{
}
bool operator()(T* obj)
{
- std::string name((const char*)obj->getProfile().name);
- return m_name == name;
+ std::string name((const char*)obj->getProfile().name);
+ return m_name == name;
}
private:
std::string m_name;
@@ -563,7 +563,7 @@
explicit port_prof_collect(PortProfileList& p) : m_p(p) {}
void operator()(const PortBase* port)
{
- CORBA_SeqUtil::push_back(m_p, port->getPortProfile());
+ CORBA_SeqUtil::push_back(m_p, port->getPortProfile());
}
private:
PortProfileList& m_p;
@@ -583,7 +583,7 @@
void operator()(const PortService_ptr port)
{
PortProfile* pp(port->get_port_profile());
- CORBA_SeqUtil::push_back(m_p, *(pp));
+ CORBA_SeqUtil::push_back(m_p, *(pp));
delete pp;
}
private:
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-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -1816,7 +1816,7 @@
* @endif
*/
bool appendInterface(const char* name, const char* type_name,
- PortInterfacePolarity pol);
+ PortInterfacePolarity pol);
/*!
* @if jp
@@ -1876,7 +1876,7 @@
void addProperty(const char* key, ValueType value)
{
CORBA_SeqUtil::push_back(m_profile.properties,
- NVUtil::newNV(key, value));
+ NVUtil::newNV(key, value));
}
/*!
@@ -2225,7 +2225,7 @@
explicit find_conn_id(const char* id) : m_id(id) {};
bool operator()(const ConnectorProfile& cprof)
{
- return m_id == std::string(cprof.connector_id);
+ return m_id == std::string(cprof.connector_id);
}
std::string m_id;
}; // struct find_conn_id
@@ -2242,7 +2242,7 @@
explicit find_port_ref(PortService_ptr port_ref) : m_port(port_ref) {};
bool operator()(PortService_ptr port_ref)
{
- return m_port->_is_equivalent(port_ref);
+ return m_port->_is_equivalent(port_ref);
}
PortService_ptr m_port;
}; // struct find_port_ref
@@ -2257,13 +2257,13 @@
struct find_interface
{
find_interface(const char* name, PortInterfacePolarity pol)
- : m_name(name), m_pol(pol)
+ : m_name(name), m_pol(pol)
{}
bool operator()(const PortInterfaceProfile& prof)
{
- CORBA::String_var name(CORBA::string_dup(prof.instance_name));
- return ((m_name == (const char *)name) && (m_pol == prof.polarity));
+ CORBA::String_var name(CORBA::string_dup(prof.instance_name));
+ return ((m_name == (const char *)name) && (m_pol == prof.polarity));
}
std::string m_name;
PortInterfacePolarity m_pol;
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-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -561,8 +561,8 @@
// PortProfile.interfaces
typedef SequenceEx<PortInterfaceProfileList,
- PortInterfaceProfile,
- Mutex> IfProfiles;
+ PortInterfaceProfile,
+ Mutex> IfProfiles;
IfProfiles m_ifProfiles;
// PortProfile.port_ref
@@ -570,8 +570,8 @@
// PortProfile.connector_profile
typedef SequenceEx<ConnectorProfileList,
- ConnectorProfile,
- Mutex> ConnProfiles;
+ ConnectorProfile,
+ Mutex> ConnProfiles;
ConnProfiles m_connProfiles ;
// PortProfile.owner
@@ -590,8 +590,8 @@
explicit if_name(const char* name) : m_name(name) {};
bool operator()(const PortInterfaceProfile& p)
{
- std::string name(p.instance_name);
- return m_name == name;
+ std::string name(p.instance_name);
+ return m_name == name;
}
const std::string m_name;
};
@@ -602,8 +602,8 @@
explicit conn_name(const char* name) : m_name(name) {};
bool operator()(const ConnectorProfile& c)
{
- std::string name(c.name);
- return m_name == name;
+ std::string name(c.name);
+ return m_name == name;
}
const std::string m_name;
};
@@ -614,8 +614,8 @@
explicit conn_id(const char* id) : m_id(id) {};
bool operator()(const ConnectorProfile& c)
{
- std::string id(c.connector_id);
- return m_id == id;
+ std::string id(c.connector_id);
+ return m_id == id;
}
const std::string m_id;
};
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -977,7 +977,7 @@
* @brief [RTObject CORBA interface] Get ExecutionContextAdmin
*
* This operation returns a list containing an ExecutionContextAdmin for
- * every ExecutionContext owned by the RTC.
+ * every ExecutionContext owned by the RTC.
*
* @return ExecutionContextService List
*
@@ -1498,7 +1498,7 @@
*/
virtual char* get_sdo_id()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError);
+ SDOPackage::NotAvailable, SDOPackage::InternalError);
/*!
* @if jp
@@ -1535,7 +1535,7 @@
*/
virtual char* get_sdo_type()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError);
+ SDOPackage::NotAvailable, SDOPackage::InternalError);
/*!
* @if jp
@@ -1575,7 +1575,7 @@
*/
virtual SDOPackage::DeviceProfile* get_device_profile()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError);
+ SDOPackage::NotAvailable, SDOPackage::InternalError);
/*!
* @if jp
@@ -1615,7 +1615,7 @@
*/
virtual SDOPackage::ServiceProfileList* get_service_profiles()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError);
+ SDOPackage::NotAvailable, SDOPackage::InternalError);
/*!
* @if jp
@@ -1660,8 +1660,8 @@
*/
virtual SDOPackage::ServiceProfile* get_service_profile(const char* id)
throw (CORBA::SystemException,
- SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
- SDOPackage::InternalError);
+ SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
+ SDOPackage::InternalError);
/*!
* @if jp
@@ -1712,8 +1712,8 @@
*/
virtual SDOPackage::SDOService_ptr get_sdo_service(const char* id)
throw (CORBA::SystemException,
- SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
- SDOPackage::InternalError);
+ SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
+ SDOPackage::InternalError);
/*!
* @if jp
@@ -1761,8 +1761,8 @@
*/
virtual SDOPackage::Configuration_ptr get_configuration()
throw (CORBA::SystemException,
- SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
- SDOPackage::InternalError);
+ SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
+ SDOPackage::InternalError);
/*!
* @if jp
@@ -1809,8 +1809,8 @@
*/
virtual SDOPackage::Monitoring_ptr get_monitoring()
throw (CORBA::SystemException,
- SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
- SDOPackage::InternalError);
+ SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
+ SDOPackage::InternalError);
/*!
* @if jp
@@ -1849,7 +1849,7 @@
*/
virtual SDOPackage::OrganizationList* get_organizations()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError);
+ SDOPackage::NotAvailable, SDOPackage::InternalError);
/*!
* @if jp
@@ -1884,7 +1884,7 @@
*/
virtual SDOPackage::NVList* get_status_list()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError);
+ SDOPackage::NotAvailable, SDOPackage::InternalError);
/*!
* @if jp
@@ -1924,8 +1924,8 @@
*/
virtual CORBA::Any* get_status(const char* name)
throw (CORBA::SystemException,
- SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
- SDOPackage::InternalError);
+ SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
+ SDOPackage::InternalError);
//============================================================
// Local interfaces
@@ -2249,8 +2249,8 @@
*/
template <typename VarType>
bool bindParameter(const char* param_name, VarType& var,
- const char* def_val,
- bool (*trans)(VarType&, const char*) = coil::stringTo)
+ const char* def_val,
+ bool (*trans)(VarType&, const char*) = coil::stringTo)
{
RTC_TRACE(("bindParameter(%s (default: %s))", param_name, def_val));
m_configsets.bindParameter(param_name, var, def_val, trans);
@@ -4636,7 +4636,7 @@
explicit svc_name (const char* id) : m_id(id) {};
bool operator()(const SDOPackage::ServiceProfile& prof)
{
- return m_id == std::string(prof.id);
+ return m_id == std::string(prof.id);
}
std::string m_id;
}; // struct svc_name
@@ -4905,7 +4905,7 @@
explicit nv_name(const char* name) : m_name(name) {};
bool operator()(const SDOPackage::NameValue& nv)
{
- return m_name == std::string(nv.name);
+ return m_name == std::string(nv.name);
}
std::string m_name;
}; // struct nv_name
@@ -4920,14 +4920,14 @@
struct ec_copy
{
explicit ec_copy(ExecutionContextList& eclist)
- : m_eclist(eclist)
+ : m_eclist(eclist)
{
}
void operator()(ExecutionContextService_ptr ecs)
{
if (!::CORBA::is_nil(ecs))
{
- CORBA_SeqUtil::push_back(m_eclist,
+ CORBA_SeqUtil::push_back(m_eclist,
ExecutionContext::_duplicate(ecs));
}
}
@@ -4943,25 +4943,25 @@
struct ec_find
{
explicit ec_find(ExecutionContext_ptr& ec)
- : m_ec(ExecutionContext::_duplicate(ec))
+ : m_ec(ExecutionContext::_duplicate(ec))
{
}
bool operator()(ExecutionContextService_ptr ecs)
{
- try
- {
+ try
+ {
if (!::CORBA::is_nil(ecs))
{
- ExecutionContext_var ec;
- ec = ExecutionContext::_narrow(ecs);
- return m_ec->_is_equivalent(ec);
+ ExecutionContext_var ec;
+ ec = ExecutionContext::_narrow(ecs);
+ return m_ec->_is_equivalent(ec);
}
- }
- catch (...)
- {
- return false;
- }
- return false;
+ }
+ catch (...)
+ {
+ return false;
+ }
+ return false;
}
ExecutionContext_var m_ec;
@@ -4978,7 +4978,7 @@
struct deactivate_comps
{
explicit deactivate_comps(LightweightRTObject_ptr comp)
- : m_comp(RTC::LightweightRTObject::_duplicate(comp))
+ : m_comp(RTC::LightweightRTObject::_duplicate(comp))
{
}
void operator()(ExecutionContextService_ptr ec)
@@ -4986,7 +4986,7 @@
if (!::CORBA::is_nil(ec) && !ec->_non_existent())
{
- ec->deactivate_component(RTC::LightweightRTObject::_duplicate(m_comp));
+ ec->deactivate_component(RTC::LightweightRTObject::_duplicate(m_comp));
ec->stop();
}
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -475,19 +475,19 @@
put(value);
- {
- Guard eguard(m_empty.mutex);
- if (empty())
- {
- // Guard eguard(m_empty.mutex);
- advanceWptr(1);
- m_empty.cond.signal();
- }
- else
- {
- advanceWptr(1);
- }
- }
+ {
+ Guard eguard(m_empty.mutex);
+ if (empty())
+ {
+ // Guard eguard(m_empty.mutex);
+ advanceWptr(1);
+ m_empty.cond.signal();
+ }
+ else
+ {
+ advanceWptr(1);
+ }
+ }
return ::RTC::BufferStatus::BUFFER_OK;
}
@@ -761,19 +761,19 @@
get(value);
- {
- Guard fguard(m_full.mutex);
- if (full())
- {
- // Guard fguard(m_full.mutex);
- advanceRptr(1);
- m_full.cond.signal();
- }
- else
- {
- advanceRptr(1);
- }
- }
+ {
+ Guard fguard(m_full.mutex);
+ if (full())
+ {
+ // Guard fguard(m_full.mutex);
+ advanceRptr(1);
+ m_full.cond.signal();
+ }
+ else
+ {
+ advanceRptr(1);
+ }
+ }
return ::RTC::BufferStatus::BUFFER_OK;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -244,7 +244,7 @@
*/
virtual CORBA::Boolean set_device_profile(const DeviceProfile& dProfile)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -293,7 +293,7 @@
*/
virtual CORBA::Boolean add_service_profile(const ServiceProfile& sProfile)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -332,7 +332,7 @@
*/
virtual CORBA::Boolean add_organization(Organization_ptr org)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -378,7 +378,7 @@
*/
virtual CORBA::Boolean remove_service_profile(const char* id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -421,7 +421,7 @@
*/
virtual CORBA::Boolean remove_organization(const char* organization_id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -457,7 +457,7 @@
*/
virtual ParameterList* get_configuration_parameters()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -491,7 +491,7 @@
*/
virtual NVList* get_configuration_parameter_values()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -535,7 +535,7 @@
*/
virtual CORBA::Any* get_configuration_parameter_value(const char* name)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -580,9 +580,9 @@
* @endif
*/
virtual CORBA::Boolean set_configuration_parameter(const char* name,
- const CORBA::Any& value)
+ const CORBA::Any& value)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -620,7 +620,7 @@
*/
virtual ConfigurationSetList* get_configuration_sets()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -664,7 +664,7 @@
*/
virtual ConfigurationSet* get_configuration_set(const char* config_id)
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -716,7 +716,7 @@
*/
virtual ConfigurationSet* get_active_configuration_set()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -762,7 +762,7 @@
virtual CORBA::Boolean
add_configuration_set(const ConfigurationSet& configuration_set)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -818,7 +818,7 @@
virtual CORBA::Boolean
set_configuration_set_values(const ConfigurationSet& configuration_set)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -860,7 +860,7 @@
*/
virtual CORBA::Boolean remove_configuration_set(const char* config_id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -914,7 +914,7 @@
*/
virtual CORBA::Boolean activate_configuration_set(const char* config_id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
// end of CORBA interface definition
//============================================================
@@ -1138,7 +1138,7 @@
explicit nv_name(const char* name) : m_name(name) {};
bool operator()(const NameValue& nv)
{
- return m_name == std::string(nv.name);
+ return m_name == std::string(nv.name);
}
std::string m_name;
};
@@ -1155,8 +1155,8 @@
explicit org_id(const char* id) : m_id(id) {};
bool operator()(const Organization_ptr& o)
{
- CORBA::String_var id(o->get_organization_id());
- return m_id == (const char *)id;
+ CORBA::String_var id(o->get_organization_id());
+ return m_id == (const char *)id;
}
const std::string m_id;
};
@@ -1173,8 +1173,8 @@
explicit config_id(const char* id) : m_id(id) {};
bool operator()(const ConfigurationSet& c)
{
- std::string id(c.id);
- return m_id == id;
+ std::string id(c.id);
+ return m_id == id;
}
const std::string m_id;
};
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h 2017-01-16 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -151,7 +151,7 @@
*/
virtual char* get_organization_id()
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -198,7 +198,7 @@
virtual CORBA::Boolean
add_organization_property(const OrganizationProperty& org_property)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -234,7 +234,7 @@
*/
virtual OrganizationProperty* get_organization_property()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -277,7 +277,7 @@
*/
virtual CORBA::Any* get_organization_property_value(const char* name)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -326,7 +326,7 @@
virtual CORBA::Boolean
set_organization_property_value(const char* name, const CORBA::Any& value)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -370,7 +370,7 @@
*/
virtual CORBA::Boolean remove_organization_property(const char* name)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -411,7 +411,7 @@
*/
virtual CORBA::Boolean add_members(const SDOList& sdo_list)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -447,7 +447,7 @@
*/
virtual SDOList* get_members()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -494,7 +494,7 @@
*/
virtual CORBA::Boolean set_members(const SDOList& sdos)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -534,7 +534,7 @@
*/
virtual CORBA::Boolean remove_member(const char* id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -568,7 +568,7 @@
*/
virtual SDOSystemElement_ptr get_owner()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -613,7 +613,7 @@
*/
virtual CORBA::Boolean set_owner(SDOSystemElement_ptr sdo)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError);
+ InvalidParameter, NotAvailable, InternalError);
/*!
* @if jp
@@ -652,7 +652,7 @@
*/
virtual DependencyType get_dependency()
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
/*!
* @if jp
@@ -698,7 +698,7 @@
*/
virtual CORBA::Boolean set_dependency(DependencyType dependency)
throw (CORBA::SystemException,
- NotAvailable, InternalError);
+ NotAvailable, InternalError);
// end of CORBA interface definition
//============================================================
@@ -843,7 +843,7 @@
explicit nv_name(const char* name) : m_name(name) {};
bool operator()(const NameValue& nv)
{
- return m_name == std::string(nv.name);
+ return m_name == std::string(nv.name);
}
std::string m_name;
}; // struct nv_name
@@ -861,7 +861,7 @@
bool operator()(const SDO_ptr sdo)
{
CORBA::String_var id(sdo->get_sdo_id());
- return m_id == (const char*)id;
+ return m_id == (const char*)id;
}
std::string m_id;
}; // struct sdo_id
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -257,10 +257,10 @@
* @endif
*/
template <class State,
- class Listener,
- class States = StateHolder<State>,
- class Callback = void (Listener::*)(const States& states)
- >
+ class Listener,
+ class States = StateHolder<State>,
+ class Callback = void (Listener::*)(const States& states)
+ >
class StateMachine
{
typedef coil::Mutex Mutex;
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 07:00:05 UTC (rev 2841)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h 2017-01-16 07:49:32 UTC (rev 2842)
@@ -402,7 +402,7 @@
*
* @endif
*/
-#define RTC_LOG(LV, fmt) \
+#define RTC_LOG(LV, fmt) \
if (rtclog.isValid(LV)) \
{ \
std::string str = ::coil::sprintf fmt; \
@@ -411,7 +411,7 @@
rtclog.unlock(); \
}
-#define RTC_LOG_STR(LV, str) \
+#define RTC_LOG_STR(LV, str) \
if (rtclog.isValid(LV)) \
{ \
rtclog.lock(); \
More information about the openrtm-commit
mailing list