[openrtm-commit:02245] r2853 - 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日 (火) 21:54:57 JST
Author: sec_fukai
Date: 2017-01-17 21:54:56 +0900 (Tue, 17 Jan 2017)
New Revision: 2853
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.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/InPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.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/PublisherBase.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/SdoServiceAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3816
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -39,7 +39,7 @@
: public ACE_Utils::UUID_Generator
{
public:
- UUID_Generator() : ACE_Utils::UUID_Generator() {};
+ UUID_Generator() : ACE_Utils::UUID_Generator() {}
#ifndef ACE_5_6_1_OR_EARLIER
coil::UUID*
generateUUID(ACE_UINT16 version = 0x0001, u_char variant = 0x80)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -58,7 +58,7 @@
*
* @endif
*/
- virtual ~Allocator(){};
+ virtual ~Allocator() {}
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -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/Factory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Factory.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,10 +20,12 @@
#ifndef COIL_FACTORY_H
#define COIL_FACTORY_H
+#include <functional>
#include <assert.h>
+#include <algorithm>
+#include <functional>
#include <string>
#include <map>
-#include <algorithm>
#include <vector>
#include <coil/Singleton.h>
@@ -515,7 +517,7 @@
class FactoryEntry
{
public:
- explicit FactoryEntry()
+ FactoryEntry()
{
}
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,11 +20,12 @@
#ifndef LOGGER_H
#define LOGGER_H
+#include <fstream>
+#include <iostream>
#include <limits.h>
-#include <iostream>
-#include <fstream>
+#include <string>
+#include <utility>
#include <vector>
-#include <string>
#include <coil/Mutex.h>
#include <coil/Guard.h>
@@ -825,7 +826,7 @@
*
* @endif
*/
- ~log_stream(){};
+ ~log_stream() {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTaskBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -209,7 +209,7 @@
*
* @endif
*/
- virtual ~PeriodicTaskBase(){};
+ virtual ~PeriodicTaskBase() {}
/*!
* @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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -159,7 +159,7 @@
*
* @endif
*/
- Singleton(){};
+ Singleton() {}
/*!
* @if jp
@@ -176,7 +176,7 @@
*
* @endif
*/
- ~Singleton(){};
+ ~Singleton() {}
private:
Singleton(const Singleton& x);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,9 +20,10 @@
#define COIL_FILE_H
#include <cstring>
-#include <sys/types.h>
#include <dirent.h>
#include <libgen.h>
+#include <string>
+#include <sys/types.h>
#include <coil/config_coil.h>
#include <coil/stringutil.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,9 +20,10 @@
#ifndef COIL_PROCESS_H
#define COIL_PROCESS_H
+#include <libgen.h>
#include <stdlib.h>
+#include <string>
#include <unistd.h>
-#include <libgen.h>
#include <coil/stringutil.h>
namespace coil
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,7 @@
#ifndef COIL_FILE_H
#define COIL_FILE_H
+#include <string>
#include <windows.h>
#include <coil/config_coil.h>
#include <coil/stringutil.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-17 12:54:56 UTC (rev 2853)
@@ -79,7 +79,7 @@
p += 4;
cdrMemoryStream buf((CORBA::ULong)size, 0);
- for (int i(0); i < (int)size; ++i)
+ for (int i(0); i < static_cast<int>(size); ++i)
{
CORBA::Octet v;
// upper digit
@@ -162,7 +162,7 @@
result[2] = 'R';
result[3] = ':';
- for (int i(0); i < (int)s; ++i)
+ for (int i(0); i < static_cast<int>(s); ++i)
{
int j = 4 + i * 2;
int v = (data[i] & 0xf0);
@@ -273,9 +273,9 @@
IIOP::ProfileBody pBody;
IIOP::unmarshalProfile(ior.profiles[count], pBody);
- retstr << "IIOP " << (int) pBody.version.major << "."
- << (int) pBody.version.minor << " ";
- retstr << (const char*) pBody.address.host
+ retstr << "IIOP " << static_cast<int>(pBody.version.major) << "."
+ << static_cast<int>(pBody.version.minor) << " ";
+ retstr << (const char*) pBody.address.host
<< " " << pBody.address.port << std::endl;
print_omni_key(retstr, pBody.object_key);
@@ -300,7 +300,7 @@
{
retstr << "Unrecognised profile tag: 0x"
<< std::hex
- << (unsigned)(ior.profiles[count].tag)
+ << static_cast<unsigned>(ior.profiles[count].tag)
<< std::dec
<< std::endl;
}
@@ -322,9 +322,9 @@
sstr << " Object Key: \"";
for (unsigned int j = 0; j < key.length(); ++j)
{
- if ( (char) key[j] >= ' ' && (char) key[j] <= '~')
+ if ( static_cast<char>(key[j]) >= ' ' && static_cast<char>(key[j]) <= '~')
{
- sstr << (char) key[j];
+ sstr << static_cast<char>(key[j]);
}
else
{
@@ -340,15 +340,15 @@
int v = (key[j] & 0xf0) >> 4;
if (v < 10)
{
- sstr << (char)('0' + v);
+ sstr << static_cast<char>('0' + v);
}
else
{
- sstr << (char)('a' + (v - 10));
+ sstr << static_cast<char>('a' + (v - 10));
}
v = key[j] & 0xf;
- if (v < 10) { sstr << (char)('0' + v); }
- else { sstr << (char)('a' + (v - 10)); }
+ if (v < 10) { sstr << static_cast<char>('0' + v); }
+ else { sstr << static_cast<char>('a' + (v - 10)); }
}
sstr << " (" << key.length() << " bytes)" << std::endl;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -18,6 +18,7 @@
#ifndef CORBA_IORUTIL_H
#define CORBA_IORUTIL_H
+#include <string>
#include <rtm/RTC.h>
/*!
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -199,7 +199,7 @@
*
* @endif
*/
- virtual ~ConfigBase(void){};
+ virtual ~ConfigBase(void) {}
// typedef of ConfigAdmin's member function
typedef void (ConfigAdmin::*CallbackFunc)(const char*, const char*);
@@ -1545,7 +1545,7 @@
struct find_conf
{
std::string m_name;
- explicit find_conf(const char* name) : m_name(name) {};
+ explicit find_conf(const char* name) : m_name(name) {}
bool operator()(ConfigBase* conf)
{
if (conf == 0) { return false; }
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,7 @@
#ifndef RTC_CONFIGURATIONLISTENER_H
#define RTC_CONFIGURATIONLISTENER_H
+#include <utility>
#include <vector>
#include <coil/Properties.h>
#include <coil/Mutex.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,8 @@
#ifndef RTC_CONNECTORBASE_H
#define RTC_CONNECTORBASE_H
+#include <string>
+#include <vector>
#include <coil/stringutil.h>
#include <coil/Properties.h>
@@ -188,7 +190,7 @@
* @brief Destructor
* @endif
*/
- virtual ~ConnectorBase(){};
+ virtual ~ConnectorBase() {}
/*!
* @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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#ifndef RTC_CONNECTORLISTENER_H
#define RTC_CONNECTORLISTENER_H
+#include <string>
#include <vector>
#include <utility>
#include <coil/Mutex.h>
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaConsumer.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#ifndef RTC_CORBACONSUMER_H
#define RTC_CORBACONSUMER_H
+#include <utility>
#include <iostream>
#ifdef ORB_IS_MICO
#include <CORBA.h>
@@ -105,7 +106,7 @@
*
* @endif
*/
- CorbaConsumerBase(){};
+ CorbaConsumerBase() {}
/*!
* @if jp
@@ -350,7 +351,7 @@
*
* @endif
*/
- CorbaConsumer(){};
+ CorbaConsumer() {}
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -136,7 +136,7 @@
*
* @endif
*/
- virtual ~CorbaNaming(void){};
+ virtual ~CorbaNaming(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,10 +20,12 @@
#ifndef RTC_CORBAPORT_H
#define RTC_CORBAPORT_H
+#include <list>
+#include <string>
+#include <vector>
#include <rtm/PortBase.h>
#include <rtm/CorbaConsumer.h>
#include <rtm/NVUtil.h>
-#include <list>
/*!
* @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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -130,7 +130,7 @@
*
* @endif
*/
- virtual ~ECFactoryBase(void){};
+ virtual ~ECFactoryBase(void) {}
/*!
* @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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -650,7 +650,7 @@
*/
struct Worker
{
- Worker() : cond_(mutex_), ticked_(false) {};
+ Worker() : cond_(mutex_), ticked_(false) {}
Mutex mutex_;
Condition cond_;
bool ticked_;
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -174,7 +174,7 @@
*
* @endif
*/
- virtual ~InPort(void){};
+ virtual ~InPort(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#ifndef RTC_INPORTBASE_H
#define RTC_INPORTBASE_H
+#include <vector>
#include <rtm/PortBase.h>
#include <rtm/DataPortStatus.h>
#include <rtm/CdrBufferBase.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -92,7 +92,7 @@
*
* @endif
*/
- virtual ~InPortConsumer(void){};
+ virtual ~InPortConsumer(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -214,7 +214,7 @@
*
* @endif
*/
- virtual void activate(){}; // do nothing
+ virtual void activate() {} // do nothing
/*!
* @if jp
@@ -230,7 +230,7 @@
*
* @endif
*/
- virtual void deactivate(){}; // do nothing
+ virtual void deactivate() {} // do nothing
protected:
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -214,7 +214,7 @@
*
* @endif
*/
- virtual void activate(){}; // do nothing
+ virtual void activate() {} // do nothing
/*!
* @if jp
@@ -230,7 +230,7 @@
*
* @endif
*/
- virtual void deactivate(){}; // do nothing
+ virtual void deactivate() {} // do nothing
protected:
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,8 @@
#ifndef RTC_LOCALSERVICEADMIN_H
#define RTC_LOCALSERVICEADMIN_H
+#include <string>
+#include <vector>
#include <coil/Mutex.h>
#include <coil/Factory.h>
#include <coil/Singleton.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,7 @@
#ifndef RTM_LOCALSERVICEBASE_H
#define RTM_LOCALSERVICEBASE_H
+#include <string>
#include <vector>
#include <coil/Mutex.h>
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -1980,9 +1980,9 @@
// ECファクトリへ渡す述語クラス
struct ECFactoryPredicate
{
- explicit ECFactoryPredicate(const char* name) : m_name(name){};
+ 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();
@@ -2196,7 +2196,7 @@
*
* @endif
*/
- explicit Terminator(Manager* manager) : m_manager(manager) {};
+ explicit Terminator(Manager* manager) : m_manager(manager) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,7 @@
#ifndef RTM_MANAGERACTIONLISTENER_H
#define RTM_MANAGERACTIONLISTENER_H
+#include <string>
#include <vector>
#include <utility>
#include <coil/Mutex.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#ifndef RTC_MANAGERCONFIG_H
#define RTC_MANAGERCONFIG_H
+#include <string>
#include <coil/Properties.h>
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,8 @@
#ifndef RTC_NAMINGMANAGER_H
#define RTC_NAMINGMANAGER_H
+#include <string>
+#include <vector>
#include <rtm/RTC.h>
#include <coil/Task.h>
@@ -76,7 +78,7 @@
*
* @endif
*/
- NamingBase() {};
+ NamingBase() {}
/*!
* @if jp
@@ -89,7 +91,7 @@
*
* @endif
*/
- virtual ~NamingBase(void) {};
+ virtual ~NamingBase(void) {}
/*!
* @if jp
@@ -261,7 +263,7 @@
*
* @endif
*/
- virtual ~NamingOnCorba(void){};
+ virtual ~NamingOnCorba(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -165,7 +165,7 @@
*
* @endif
*/
- DefaultNumberingPolicy() : m_num(0) {};
+ DefaultNumberingPolicy() : m_num(0) {}
/*!
* @if jp
@@ -178,7 +178,7 @@
*
* @endif
*/
- virtual ~DefaultNumberingPolicy(void){};
+ virtual ~DefaultNumberingPolicy(void) {}
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -71,7 +71,7 @@
*
* @endif
*/
- ObjectManager(){};
+ ObjectManager() {}
/*!
* @if jp
@@ -88,7 +88,7 @@
*
* @endif
*/
- ~ObjectManager(void){};
+ ~ObjectManager(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -22,6 +22,7 @@
#include <functional>
#include <string>
+#include <vector>
#include <coil/TimeValue.h>
#include <coil/Time.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -188,7 +188,7 @@
*
* @endif
*/
- virtual ~OutPortConsumer(void){};
+ virtual ~OutPortConsumer(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -210,7 +210,7 @@
*
* @endif
*/
- virtual void activate(){}; // do nothing
+ virtual void activate() {} // do nothing
/*!
* @if jp
@@ -226,7 +226,7 @@
*
* @endif
*/
- virtual void deactivate(){}; // do nothing
+ virtual void deactivate() {} // do nothing
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,9 @@
#ifndef RTC_PERIODICECSHAREDCOMPOSITE_H
#define RTC_PERIODICECSHAREDCOMPOSITE_H
+#include <string>
+#include <utility>
+#include <vector>
#include <rtm/idl/RTCSkel.h>
#include <rtm/idl/OpenRTMSkel.h>
#include <rtm/RTObject.h>
@@ -680,4 +683,4 @@
DLL_EXPORT void PeriodicECSharedCompositeInit(RTC::Manager* manager);
};
-#endif // RTC_PERIODICECSHAREDCOMPOSITE_H
+#endif // RTC_PERIODICECSHAREDCOMPOSITE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -688,7 +688,7 @@
*/
struct WorkerThreadCtrl
{
- WorkerThreadCtrl() : cond_(mutex_), running_(false) {};
+ WorkerThreadCtrl() : cond_(mutex_), running_(false) {}
coil::Mutex mutex_;
coil::Condition<coil::Mutex> cond_;
bool running_;
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#ifndef RTC_PORTADMIN_H
#define RTC_PORTADMIN_H
+#include <string>
#include <rtm/idl/RTCSkel.h>
#include <rtm/PortBase.h>
#include <rtm/ObjectManager.h>
@@ -86,7 +87,7 @@
*
* @endif
*/
- virtual ~PortAdmin(void){};
+ virtual ~PortAdmin(void) {}
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -2222,7 +2222,7 @@
*/
struct find_conn_id
{
- explicit find_conn_id(const char* id) : m_id(id) {};
+ explicit find_conn_id(const char* id) : m_id(id) {}
bool operator()(const ConnectorProfile& cprof)
{
return m_id == std::string(cprof.connector_id);
@@ -2239,7 +2239,7 @@
*/
struct find_port_ref
{
- explicit find_port_ref(PortService_ptr port_ref) : m_port(port_ref) {};
+ 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);
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#define RTC_PORTPROFILEHELPER_H
+#include <string>
// RTC header include
#include <rtm/RTC.h>
#include <rtm/Util.h>
@@ -587,7 +588,7 @@
// Functor to find PortInterfaceProfile by name
struct if_name
{
- explicit if_name(const char* name) : m_name(name) {};
+ explicit if_name(const char* name) : m_name(name) {}
bool operator()(const PortInterfaceProfile& p)
{
std::string name(p.instance_name);
@@ -599,7 +600,7 @@
// Functor to find ConnectorProfile by name
struct conn_name
{
- explicit conn_name(const char* name) : m_name(name) {};
+ explicit conn_name(const char* name) : m_name(name) {}
bool operator()(const ConnectorProfile& c)
{
std::string name(c.name);
@@ -611,7 +612,7 @@
// Functor to find ConnectorProfile by id
struct conn_id
{
- explicit conn_id(const char* id) : m_id(id) {};
+ explicit conn_id(const char* id) : m_id(id) {}
bool operator()(const ConnectorProfile& c)
{
std::string id(c.connector_id);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -76,7 +76,7 @@
*
* @endif
*/
- virtual ~PublisherBase(void){};
+ virtual ~PublisherBase(void) {}
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -18,6 +18,8 @@
#ifndef RTC_RTOBJECT_H
#define RTC_RTOBJECT_H
+#include <string>
+#include <vector>
// CORBA header include
#include <coil/Properties.h>
@@ -2577,8 +2579,8 @@
* @endif
*/
bool addInPort(const char* name, InPortBase& inport);
- const std::vector<InPortBase*>& getInPorts() const {return m_inports;};
- const std::vector<OutPortBase*>& getOutPorts() const {return m_outports;};
+ const std::vector<InPortBase*>& getInPorts() const {return m_inports;}
+ const std::vector<OutPortBase*>& getOutPorts() const {return m_outports;}
/*!
* @if jp
*
@@ -4633,7 +4635,7 @@
*/
struct svc_name
{
- explicit svc_name (const char* id) : m_id(id) {};
+ explicit svc_name (const char* id) : m_id(id) {}
bool operator()(const SDOPackage::ServiceProfile& prof)
{
return m_id == std::string(prof.id);
@@ -4902,7 +4904,7 @@
*/
struct nv_name
{
- explicit nv_name(const char* name) : m_name(name) {};
+ explicit nv_name(const char* name) : m_name(name) {}
bool operator()(const SDOPackage::NameValue& nv)
{
return m_name == std::string(nv.name);
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RingBuffer.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#ifndef RTC_RINGBUFFER_H
#define RTC_RINGBUFFER_H
+#include <string>
#include <vector>
#include <algorithm>
#include <iostream>
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -1135,7 +1135,7 @@
*/
struct nv_name
{
- explicit nv_name(const char* name) : m_name(name) {};
+ explicit nv_name(const char* name) : m_name(name) {}
bool operator()(const NameValue& nv)
{
return m_name == std::string(nv.name);
@@ -1152,7 +1152,7 @@
*/
struct org_id
{
- explicit org_id(const char* id) : m_id(id) {};
+ explicit org_id(const char* id) : m_id(id) {}
bool operator()(const Organization_ptr& o)
{
CORBA::String_var id(o->get_organization_id());
@@ -1170,7 +1170,7 @@
*/
struct config_id
{
- explicit config_id(const char* id) : m_id(id) {};
+ explicit config_id(const char* id) : m_id(id) {}
bool operator()(const ConfigurationSet& c)
{
std::string id(c.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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -702,7 +702,9 @@
// end of CORBA interface definition
//============================================================
- Organization_ptr getObjRef() {return m_objref;};
+ Organization_ptr getObjRef() {
+ return m_objref;
+ }
protected:
::RTC::Logger rtclog;
@@ -840,7 +842,7 @@
*/
struct nv_name
{
- explicit nv_name(const char* name) : m_name(name) {};
+ explicit nv_name(const char* name) : m_name(name) {}
bool operator()(const NameValue& nv)
{
return m_name == std::string(nv.name);
@@ -857,7 +859,7 @@
*/
struct sdo_id
{
- explicit sdo_id(const char* id) : m_id(id) {};
+ explicit sdo_id(const char* id) : m_id(id) {}
bool operator()(const SDO_ptr sdo)
{
CORBA::String_var id(sdo->get_sdo_id());
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,7 @@
#ifndef RTC_SDOSERVICEADMIN_H
#define RTC_SDOSERVICEADMIN_H
+#include <string>
#include <coil/Mutex.h>
#include <coil/Factory.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceConsumerBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -144,7 +144,7 @@
* @brief virtual destructor
* @endif
*/
- virtual ~SdoServiceConsumerBase() {};
+ virtual ~SdoServiceConsumerBase() {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h 2017-01-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceProviderBase.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -143,7 +143,7 @@
* @brief virtual destructor
* @endif
*/
- virtual ~SdoServiceProviderBase() {};
+ virtual ~SdoServiceProviderBase() {}
/*!
* @if jp
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/StateMachine.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -20,6 +20,7 @@
#define RTC_STATEMACHINE_H
#include <cassert>
+#include <utility>
#include <vector>
#include <coil/Mutex.h>
#include <coil/Guard.h>
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-17 11:19:10 UTC (rev 2852)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.h 2017-01-17 12:54:56 UTC (rev 2853)
@@ -19,6 +19,7 @@
#ifndef RTC_SYSTEMLOGGER_H
#define RTC_SYSTEMLOGGER_H
+#include <string>
#include <rtm/config_rtc.h>
// COIL
More information about the openrtm-commit
mailing list