[openrtm-commit:02246] r2854 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/ace/coil coil/common coil/posix/coil coil/tests/DynamicLib coil/win32/coil rtm rtm/tests/ManagerServant rtm/tests/ModuleManager
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 18日 (水) 11:16:36 JST
Author: sec_fukai
Date: 2017-01-18 11:16:36 +0900 (Wed, 18 Jan 2017)
New Revision: 2854
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/tests/DynamicLib/libDll.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
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/PortCallback.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3816
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Condition.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -84,5 +84,5 @@
ACE_cond_t m_cond;
Mutex& m_mutex;
};
-};
+}; // namespace coil
#endif // COIL_CONDITION_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/File.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -34,6 +34,6 @@
{
return ACE::basename(path);
}
-};
+}; // namespace coil
#endif // COIL_FILE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Mutex.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -66,5 +66,5 @@
Mutex(const Mutex&);
Mutex& operator=(const Mutex &);
};
-};
+}; // namespace coil
#endif // COIL_MUTEX_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/OS.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -51,6 +51,6 @@
}
typedef ACE_Get_Opt GetOpt;
-};
+}; // namespace coil
#endif // COIL_OS_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/Time.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -77,6 +77,6 @@
}
-};
+}; // namespace coil
#endif // COIL_TIME_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/ace/coil/UUID.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -48,5 +48,5 @@
}
#endif
};
-};
+}; // namespace coil
#endif // COIL_UUID_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -69,5 +69,5 @@
{
operator delete[](p);
}
-};
+}; // namespace coil
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -153,5 +153,5 @@
virtual void DeleteArray(void* p) throw ();
};
-};
+}; // namespace coil
#endif // COIL_ALLOCATOR_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Async.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -587,6 +587,6 @@
}
-};
+}; // namespace coil
#endif // COIL_ASYNC_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Guard.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -91,5 +91,5 @@
Guard& operator=(const Guard&);
M& m_mutex;
};
-};
+}; // namespace coil
#endif // COIL_GUARD_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Logger.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -933,5 +933,5 @@
typedef log_streambuf<char> LogStreamBuffer;
typedef log_stream<char> LogStream;
-};
+}; // namespace coil
#endif // LOGGER_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/NonCopyable.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -165,6 +165,6 @@
NonCopyableCRTP(const NonCopyableCRTP &);
T & operator=(const T &);
};
-};
+}; // namespace coil
#endif // COIL_NONCOPYABLE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -346,11 +346,18 @@
coil::eraseHeadBlank(tmp);
// Skip comments or empty lines
- if (tmp.empty()) { continue; }
- if (tmp[0] == '#' || tmp[0] == '!') { continue; }
+ if (tmp.empty())
+ {
+ continue;
+ }
+ if (tmp[0] == '#' || tmp[0] == '!')
+ {
+ continue;
+ }
// line-end '\' continues entry
- if (tmp[tmp.size() - 1] == '\\' && !coil::isEscaped(tmp, tmp.size() - 1))
+ if (tmp[tmp.size() - 1] == '\\'
+ && !coil::isEscaped(tmp, tmp.size() - 1))
{
tmp.erase(tmp.size() - 1);
pline += tmp;
@@ -359,7 +366,10 @@
pline += tmp;
// Skip empty line (made of only ' ' or '\t')
- if (pline.empty()) { continue; }
+ if (pline.empty())
+ {
+ continue;
+ }
std::string key, value;
splitKeyValue(pline, key, value);
@@ -443,7 +453,10 @@
*/
Properties* const Properties::findNode(const std::string& key) const
{
- if (key.empty()) { return 0; }
+ if (key.empty())
+ {
+ return 0;
+ }
std::vector<std::string> keys;
// std::string value;
split(key, '.', keys);
@@ -459,7 +472,10 @@
*/
Properties& Properties::getNode(const std::string& key)
{
- if (key.empty()) { return *this; }
+ if (key.empty())
+ {
+ return *this;
+ }
Properties* const leaf(findNode(key));
if (leaf != 0)
{
@@ -478,7 +494,10 @@
*/
bool Properties::createNode(const std::string& key)
{
- if (key.empty()) { return false; }
+ if (key.empty())
+ {
+ return false;
+ }
if (findNode(key) != 0)
{
@@ -524,7 +543,9 @@
for (size_t i(0), len(leaf.size()); i < len; ++i)
{
if (leaf[i]->name == key)
- return leaf[i];
+ {
+ return leaf[i];
+ }
}
return NULL;
}
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Singleton.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -209,6 +209,6 @@
template <class SingletonClass>
typename Singleton<SingletonClass>::Mutex
Singleton<SingletonClass>::m_mutex;
-}; // namepsace coil
+}; // namespace coil
#endif // COIL_SINGLETON_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -213,4 +213,4 @@
}
}
-};
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -271,6 +271,6 @@
long int m_sec;
long int m_usec;
};
-};
+}; // namespace coil
#endif // COIL_TIMEVALUE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -178,4 +178,4 @@
}
return false;
}
-}; // namespace RTC
+}; // namespace coil
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -333,6 +333,6 @@
std::vector<Task> m_tasks;
Mutex m_taskMutex;
};
-};
+}; // namespace coil
#endif // Timer_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -33,7 +33,7 @@
namespace std
{
typedef basic_string<wchar_t> wstring;
-}
+} // namespace std
#endif
namespace coil
@@ -838,5 +838,5 @@
*/
std::string sprintf(char const * __restrict fmt, ...);
-}; // namepsace coil
+}; // namespace coil
#endif // COIL_STRINGUTIL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Condition.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -196,5 +196,5 @@
pthread_cond_t m_cond;
M& m_mutex;
};
-};
+}; // namespace coil
#endif // COIL_CONDITION_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -162,7 +162,7 @@
{
return ::dlerror();
}
-};
+}; // namespace coil
/*!
* for unit test.
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/DynamicLib.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -287,6 +287,6 @@
int m_error;
};
-};
+}; // namespace coil
#endif // DynamicLib_h
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -189,6 +189,6 @@
return flist;
}
-};
+}; // namespace coil
#endif // COIL_FILE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Mutex.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -161,5 +161,5 @@
Mutex(const Mutex&);
Mutex& operator=(const Mutex &);
};
-};
+}; // namespace coil
#endif // COIL_MUTEX_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -273,6 +273,6 @@
int m_flag;
};
-};
+}; // namespace coil
#endif // COIL_OS_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -84,4 +84,4 @@
m_flags = 0;
}
-};
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Signal.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -108,5 +108,5 @@
int m_flags;
};
-};
+}; // namespace coil
#endif // COIL_SIGNAL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -180,6 +180,6 @@
t->finalize();
return 0;
}
-};
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Task.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -262,6 +262,6 @@
void* m_args;
};
-};
+}; // namespace coil
#endif // COIL_TASK_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Time.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -192,6 +192,6 @@
}
-};
+}; // namespace coil
#endif // COIL_TIME_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -129,4 +129,4 @@
}
#endif
-};
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -47,7 +47,7 @@
void init();
coil::UUID* generateUUID(int n, int h);
};
-};
+}; // namespace coil
#endif
#if defined(COIL_OS_LINUX) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
#include <uuid/uuid.h>
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/tests/DynamicLib/libDll.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/tests/DynamicLib/libDll.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/tests/DynamicLib/libDll.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -25,7 +25,7 @@
public:
libDllTest(){};
~libDllTest(){};
- static int FuncTest(void);
+ static int FuncTest(void);
};
};
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Condition.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -406,5 +406,5 @@
M& m_mutex;
}; // class Condition
-}; // namespace Coil
+}; // namespace coil
#endif // COIL_CONDITION_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -166,10 +166,10 @@
/* Because it is a normal termination when the error code is 0, */
/* return NULL. */
- if (dwcode == 0 )
- {
- return NULL;
- }
+ if (dwcode == 0)
+ {
+ return NULL;
+ }
/* Convert the error code into the message. */
::FormatMessage(
@@ -184,7 +184,7 @@
);
return cstr;
}
-};
+}; // namespace coil
/*!
* for Testing UnitTest.
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -453,6 +453,6 @@
}
-};
+}; // namespace coil
#endif // COIL_FILE_H
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Mutex.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -70,7 +70,7 @@
m_Security_attr.nLength = sizeof(SECURITY_ATTRIBUTES);
m_Security_attr.lpSecurityDescriptor = &sd_buffer;
m_Security_attr.bInheritHandle = TRUE;
- mutex_ = ::CreateMutexA( &m_Security_attr,FALSE,name );
+ mutex_ = ::CreateMutexA( &m_Security_attr, FALSE,name );
}
@@ -175,5 +175,5 @@
Mutex(const Mutex&);
Mutex& operator=(const Mutex &);
};
-};
+}; // namespace coil
#endif // COIL_MUTEX_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/OS.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -461,6 +461,6 @@
};
-};
+}; // namespace coil
#endif // COIL_OS_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -68,4 +68,4 @@
{
}
-};
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -121,5 +121,5 @@
int m_flags;
};
-};
+}; // namespace coil
#endif // COIL_SIGNAL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -182,6 +182,6 @@
t->finalize();
return 0;
}
-};
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -261,6 +261,6 @@
int m_count;
HANDLE m_thread;
};
-};
+}; // namespace coil
#endif // COIL_TASK_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -98,7 +98,7 @@
int iret;
//The WSAStartup function initiates use of the Winsock DLL by a process.
- ver = MAKEWORD(2,2);
+ ver = MAKEWORD(2, 2);
iret = ::WSAStartup(ver, &wsa);
if ( iret != 0 )
{
@@ -349,6 +349,6 @@
}
-};
+}; // namespace coil
#endif // COIL_TIME_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -127,7 +127,7 @@
UUID* UUID_Generator::generateUUID(int n, int h)
{
uuid_t uuid;
- if(::UuidCreate(&uuid) != RPC_S_OK)
+ if (::UuidCreate(&uuid) != RPC_S_OK)
{
return 0;
}
@@ -136,4 +136,4 @@
return new UUID(uuid);
}
}
-}; // coil
+}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/UUID.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -160,6 +160,6 @@
*/
coil::UUID* generateUUID(int n, int h);
}; // class UUID_Generator
-}; // coil
+}; // namespace coil
#endif // COIL_UUID_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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -322,7 +322,8 @@
sstr << " Object Key: \"";
for (unsigned int j = 0; j < key.length(); ++j)
{
- if ( static_cast<char>(key[j]) >= ' ' && static_cast<char>(key[j]) <= '~')
+ if (static_cast<char>(key[j]) >= ' '
+ && static_cast<char>(key[j]) <= '~')
{
sstr << static_cast<char>(key[j]);
}
@@ -459,4 +460,4 @@
#endif // defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
}
#endif // ORB_IS_RTORB
-};
+}; // namespace CORBA_IORUtil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -324,6 +324,6 @@
}
}
-};
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -249,6 +249,6 @@
}
}
-};
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -460,4 +460,4 @@
return false;
}
-};
+}; // namespace RTC
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -1236,7 +1236,6 @@
}
catch(...)
{
- ;
}
CORBA::Object_var obj;
obj = poa->id_to_reference(m_oid);
@@ -1274,11 +1273,9 @@
}
catch(const ::PortableServer::POA::ServantAlreadyActive &)
{
- ; // do nothing
}
catch(...)
{
- ; // do nothing
}
}
void deactivate()
@@ -1289,7 +1286,6 @@
}
catch(...)
{
- ; // do nothing
}
}
private:
@@ -1391,5 +1387,5 @@
CorbaConsumerList& m_consumers;
};
};
-};
+}; // namespace RTC
#endif // RTC_CORBAPORT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DataPortStatus.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -205,7 +205,7 @@
typedef std::vector<DataPortStatus::Enum> DataPortStatusList;
-};
+}; // namespace RTC
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -39,77 +39,77 @@
*/
static const char* default_config[] =
{
- "config.version", openrtm_version,
- "openrtm.name", openrtm_name,
- "openrtm.version", openrtm_version,
- "manager.instance_name", "manager",
- "manager.name", "manager",
- "manager.naming_formats", "%h.host_cxt/%n.mgr",
- "manager.pid", "",
- "manager.refstring_path", "/var/log/rtcmanager.ref",
- "os.name", "",
- "os.release", "",
- "os.version", "",
- "os.arch", "",
- "os.hostname", "",
- "logger.enable", "YES",
- "logger.file_name", "./rtc%p.log",
- "logger.date_format", "%b %d %H:%M:%S.%Q",
- "logger.log_level", "INFO",
- "logger.stream_lock", "NO",
- "logger.master_logger", "",
- "module.conf_path", "",
- "module.load_path", "",
- "naming.enable", "YES",
- "naming.type", "corba",
- "naming.formats", "%h.host_cxt/%n.rtc",
- "naming.update.enable", "YES",
- "naming.update.interval", "10.0",
- "timer.enable", "YES",
- "timer.tick", "0.1",
- "corba.args", "",
- "corba.endpoint", "", // hostname:port_number
- "corba.id", corba_name,
- "corba.nameservers", "localhost",
- "corba.master_manager", "localhost:2810",
- "corba.nameservice.replace_endpoint", "NO",
- "exec_cxt.periodic.type", "PeriodicExecutionContext",
- "exec_cxt.periodic.rate", "1000",
- "exec_cxt.sync_transition", "YES",
- "exec_cxt.transition_timeout", "0.5",
- "manager.modules.load_path", "./",
- "manager.modules.abs_path_allowed", "YES",
- "manager.is_master", "NO",
- "manager.corba_servant", "YES",
- "manager.shutdown_on_nortcs", "YES",
- "manager.shutdown_auto", "YES",
- "manager.auto_shutdown_duration", "10.0",
- "manager.name", "manager",
- "manager.command", "rtcd",
- "manager.supported_languages", "C++, Python, Java",
- "manager.modules.C++.manager_cmd", "rtcd",
- "manager.modules.C++.profile_cmd", "rtcprof",
+ "config.version", openrtm_version,
+ "openrtm.name", openrtm_name,
+ "openrtm.version", openrtm_version,
+ "manager.instance_name", "manager",
+ "manager.name", "manager",
+ "manager.naming_formats", "%h.host_cxt/%n.mgr",
+ "manager.pid", "",
+ "manager.refstring_path", "/var/log/rtcmanager.ref",
+ "os.name", "",
+ "os.release", "",
+ "os.version", "",
+ "os.arch", "",
+ "os.hostname", "",
+ "logger.enable", "YES",
+ "logger.file_name", "./rtc%p.log",
+ "logger.date_format", "%b %d %H:%M:%S.%Q",
+ "logger.log_level", "INFO",
+ "logger.stream_lock", "NO",
+ "logger.master_logger", "",
+ "module.conf_path", "",
+ "module.load_path", "",
+ "naming.enable", "YES",
+ "naming.type", "corba",
+ "naming.formats", "%h.host_cxt/%n.rtc",
+ "naming.update.enable", "YES",
+ "naming.update.interval", "10.0",
+ "timer.enable", "YES",
+ "timer.tick", "0.1",
+ "corba.args", "",
+ "corba.endpoint", "", // hostname:port_number
+ "corba.id", corba_name,
+ "corba.nameservers", "localhost",
+ "corba.master_manager", "localhost:2810",
+ "corba.nameservice.replace_endpoint", "NO",
+ "exec_cxt.periodic.type", "PeriodicExecutionContext",
+ "exec_cxt.periodic.rate", "1000",
+ "exec_cxt.sync_transition", "YES",
+ "exec_cxt.transition_timeout", "0.5",
+ "manager.modules.load_path", "./",
+ "manager.modules.abs_path_allowed", "YES",
+ "manager.is_master", "NO",
+ "manager.corba_servant", "YES",
+ "manager.shutdown_on_nortcs", "YES",
+ "manager.shutdown_auto", "YES",
+ "manager.auto_shutdown_duration", "10.0",
+ "manager.name", "manager",
+ "manager.command", "rtcd",
+ "manager.supported_languages", "C++, Python, Java",
+ "manager.modules.C++.manager_cmd", "rtcd",
+ "manager.modules.C++.profile_cmd", "rtcprof",
#ifdef WIN32
- "manager.modules.C++.suffixes", "dll",
+ "manager.modules.C++.suffixes", "dll",
#else
#ifdef RTM_OS_DARWIN
- "manager.modules.C++.suffixes", "dylib",
+ "manager.modules.C++.suffixes", "dylib",
#else
- "manager.modules.C++.suffixes", "so",
+ "manager.modules.C++.suffixes", "so",
#endif
#endif
- "manager.modules.C++.load_paths", "./",
- "manager.modules.Python.manager_cmd", "rtcd_python",
- "manager.modules.Python.profile_cmd", "rtcprof_python",
- "manager.modules.Python.suffixes", "py",
- "manager.modules.Python.load_paths", "./",
- "manager.modules.Java.manager_cmd", "rtcd_java",
- "manager.modules.Java.profile_cmd", "rtcprof_java",
- "manager.modules.Java.suffixes", "class",
- "manager.modules.Java.load_paths", "./",
- "manager.local_service.enabled_services","ALL",
- "sdo.service.provider.enabled_service", "ALL",
- "sdo.service.consumer.enabled_service", "ALL",
+ "manager.modules.C++.load_paths", "./",
+ "manager.modules.Python.manager_cmd", "rtcd_python",
+ "manager.modules.Python.profile_cmd", "rtcprof_python",
+ "manager.modules.Python.suffixes", "py",
+ "manager.modules.Python.load_paths", "./",
+ "manager.modules.Java.manager_cmd", "rtcd_java",
+ "manager.modules.Java.profile_cmd", "rtcprof_java",
+ "manager.modules.Java.suffixes", "class",
+ "manager.modules.Java.load_paths", "./",
+ "manager.local_service.enabled_services", "ALL",
+ "sdo.service.provider.enabled_service", "ALL",
+ "sdo.service.consumer.enabled_service", "ALL",
""
};
#endif //RTM_DEFAULTCONFIGURATION_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -357,5 +357,5 @@
*/
ECDeleteFunc m_Delete;
};
-};
+}; // namespace RTC
#endif // RTC_ECFACTORY_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -1,4 +1,5 @@
-/*!
+// -*- C++ -*-
+/*!
* @file ExecutionContext.h
* @brief ExecutionContext class
* @date $Date: 2007-04-13 15:45:29 $
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -376,7 +376,8 @@
return ret;
}
long int cycle =
- static_cast<long int>(static_cast<double>(m_activationTimeout) / static_cast<double>(getPeriod()));
+ static_cast<long int>(static_cast<double>(m_activationTimeout)
+ / static_cast<double>(getPeriod()));
RTC_DEBUG(("Timeout is %f [s] (%f [s] in %d times)",
static_cast<double>(m_activationTimeout), getRate(), cycle));
// Wating INACTIVE -> ACTIVE
@@ -464,7 +465,8 @@
return ret;
}
long int cycle =
- static_cast<long int>(static_cast<double>(m_deactivationTimeout) / static_cast<double>(getPeriod()));
+ static_cast<long int>(static_cast<double>(m_deactivationTimeout)
+ / static_cast<double>(getPeriod()));
RTC_DEBUG(("Timeout is %f [s] (%f [s] in %d times)",
static_cast<double>(m_deactivationTimeout), getRate(), cycle));
// Wating ACTIVE -> INACTIVE
@@ -551,7 +553,8 @@
return ret;
}
long int cycle =
- static_cast<long int>(static_cast<double>(m_resetTimeout) / static_cast<double>(getPeriod()));
+ static_cast<long int>(static_cast<double>(m_resetTimeout)
+ / static_cast<double>(getPeriod()));
RTC_DEBUG(("Timeout is %f [s] (%f [s] in %d times)",
static_cast<double>(m_resetTimeout), getRate(), cycle));
// Wating ERROR -> INACTIVE
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -576,7 +576,7 @@
}
};
}; // class ExecutionContextProfile
-}; // namespace RTC
+}; // namespace RTC_impl
#ifdef WIN32
#pragma warning( default : 4290 )
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -37,7 +37,7 @@
namespace RTC
{
class RTObject_impl;
-};
+}; // namespace RTC
namespace RTC_impl
{
class RTObjectStateMachine;
@@ -600,7 +600,7 @@
typedef std::vector<RTC_impl::RTObjectStateMachine*>::iterator CompItr;
}; // class PeriodicExecutionContext
-}; // namespace RTC
+}; // namespace RTC_impl
#ifdef WIN32
#pragma warning( default : 4290 )
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -470,7 +470,7 @@
m_worker.cond_.signal();
return RTC::RTC_OK;
}
-};
+}; // namespace RTC
extern "C"
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -139,4 +139,4 @@
}
}
-};
+}; // namespace RTC
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -404,5 +404,5 @@
*/
NumberingPolicy* m_policy;
};
-};
+}; // namespace RTC
#endif // RTC_FACTORY_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPort.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -700,6 +700,6 @@
*/
bool m_directNewData;
};
-}; // End of namesepace RTM
+}; // namespace RTC
#endif // RTC_INPORT_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -125,7 +125,7 @@
initConsumers();
int num(-1);
if (!coil::stringTo(num,
- m_properties.getProperty("connection_limit", "-1").c_str()))
+ m_properties.getProperty("connection_limit", "-1").c_str()))
{
RTC_ERROR(("invalid connection_limit value: %s",
m_properties.getProperty("connection_limit").c_str()));
@@ -1026,4 +1026,4 @@
{
return m_listeners;
}
-};
+}; // namespace RTC
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -224,7 +224,8 @@
*/
struct publishInterfaceProfileFunc
{
- explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop) : m_prop(prop) {}
+ explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop)
+ : m_prop(prop) {}
void operator()(InPortConsumer* consumer)
{
consumer->publishInterfaceProfile(m_prop);
@@ -241,7 +242,8 @@
*/
struct subscribeInterfaceFunc
{
- explicit subscribeInterfaceFunc(SDOPackage::NVList& prop) : m_prop(prop) {}
+ explicit subscribeInterfaceFunc(SDOPackage::NVList& prop)
+ : m_prop(prop) {}
bool operator()(InPortConsumer* consumer)
{
return consumer->subscribeInterface(m_prop);
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -485,7 +485,8 @@
*/
struct publishInterfaceProfileFunc
{
- explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop) : m_prop(prop) {}
+ explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop)
+ : m_prop(prop) {}
void operator()(InPortProvider* provider)
{
provider->publishInterfaceProfile(m_prop);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -143,5 +143,5 @@
{
m_listeners.connector_[ON_DISCONNECT].notify(m_profile);
}
-};
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -177,5 +177,5 @@
m_listeners.connector_[ON_DISCONNECT].notify(m_profile);
}
-};
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ListenerHolder.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -242,8 +242,8 @@
*/
EntryList m_listeners;
};
-}; // util
-}; // RTM
+}; // namespace util
+}; // namespace RTM
#define LISTENERHOLDER_CALLBACK(func, args) \
{ \
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -286,4 +286,4 @@
return true;
}
-}; // namepsace RTM
+}; // namespace RTM
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -273,6 +273,6 @@
*/
::RTC::Logger rtclog;
};
-}; // RTM
+}; // namespace RTM
#endif // RTC_LOCALSERVICEADMIN_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -681,7 +681,7 @@
{
ECFactoryBase* factory;
factory = new ECFactoryCXX(name, new_func, delete_func);
- if(m_ecfactory.registerObject(factory))
+ if (m_ecfactory.registerObject(factory))
{
return true;
}
@@ -1913,7 +1913,6 @@
}
catch (...)
{
- ;
}
}
for (CORBA::ULong i(0), len(m_ecs.size()); i < len; ++i)
@@ -1931,7 +1930,6 @@
}
catch (...)
{
- ;
}
}
return;
@@ -2268,4 +2266,4 @@
return str;
}
-};
+}; // namespace RTC
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -1980,7 +1980,7 @@
// 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()) {}
bool operator()(ECFactoryBase* factory)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -520,4 +520,4 @@
LISTENERHOLDER_CALLBACK(preServiceFinalize, (service_name, service));
}
-};
+}; // namespace RTM
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -282,4 +282,4 @@
}
return false;
}
-}
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -877,4 +877,4 @@
-};
+}; // namespace RTM
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -284,7 +284,7 @@
const char* str_value;
try
{
- if(!(find(nv, name) >>= str_value))
+ if (!(find(nv, name) >>= str_value))
{
str_value = "";
}
@@ -409,4 +409,4 @@
dump_to_stream(s, nv);
return s.str();
}
-};
+}; // namespace NVUtil
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -590,5 +590,5 @@
std::string toString(const SDOPackage::NVList& nv);
-};
+}; // namespace NVUtil
#endif // NVUTIL_NVUTIL_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -75,7 +75,7 @@
*
* @endif
*/
- virtual ~NumberingPolicy(void){};
+ virtual ~NumberingPolicy(void) {}
/*!
* @if jp
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -142,7 +142,7 @@
initProviders();
int num(-1);
if (!coil::stringTo(num,
- m_properties.getProperty("connection_limit", "-1").c_str()))
+ m_properties.getProperty("connection_limit", "-1").c_str()))
{
RTC_ERROR(("invalid connection_limit value: %s",
m_properties.getProperty("connection_limit").c_str()));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -106,7 +106,8 @@
if (ret == ::OpenRTM::PORT_OK)
{
RTC_DEBUG(("get() successful"));
- data.put_octet_array(&(cdr_data[0]), static_cast<int>(cdr_data->length()));
+ data.put_octet_array(&(cdr_data[0]),
+ static_cast<int>(cdr_data->length()));
RTC_PARANOID(("CDR data length: %d", cdr_data->length()));
onReceived(data);
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-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -507,7 +507,8 @@
*/
struct publishInterfaceProfileFunc
{
- explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop) : m_prop(prop) {}
+ explicit publishInterfaceProfileFunc(SDOPackage::NVList& prop)
+ : m_prop(prop) {}
void operator()(OutPortProvider* provider)
{
provider->publishInterfaceProfile(m_prop);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -167,5 +167,5 @@
{
m_listeners.connector_[ON_DISCONNECT].notify(m_profile);
}
-};
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -231,5 +231,5 @@
{
m_listeners.connector_[ON_DISCONNECT].notify(m_profile);
}
-};
+}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -68,7 +68,6 @@
*/
PeriodicECOrganization::~PeriodicECOrganization()
{
- ;
}
/*!
@@ -520,8 +519,7 @@
{
std::vector<std::string>& oldPorts(m_expPorts);
std::sort(oldPorts.begin(), oldPorts.end());
- std::vector<std::string>
- newPorts(coil::split(m_rtobj->getProperties()["conf.default.exported_ports"], ","));
+ std::vector<std::string> newPorts(coil::split(m_rtobj->getProperties()["conf.default.exported_ports"], ","));
std::sort(newPorts.begin(), newPorts.end());
std::vector<std::string> removedPorts; // oldPorts - interPorts
@@ -548,7 +546,7 @@
m_expPorts = newPorts;
}
-};
+}; // namespace SDOPackage
@@ -565,8 +563,9 @@
: public OnSetConfigurationSetCallback
{
public:
- explicit setCallback(::SDOPackage::PeriodicECOrganization* org) : m_org(org) {}
- virtual ~setCallback(){}
+ explicit setCallback(::SDOPackage::PeriodicECOrganization* org)
+ : m_org(org) {}
+ virtual ~setCallback() {}
virtual void operator()(const coil::Properties& config_set)
{
m_org->updateDelegatedPorts();
@@ -580,8 +579,9 @@
: public OnAddConfigurationAddCallback
{
public:
- explicit addCallback(::SDOPackage::PeriodicECOrganization* org) : m_org(org) {}
- virtual ~addCallback(){}
+ explicit addCallback(::SDOPackage::PeriodicECOrganization* org)
+ : m_org(org) {}
+ virtual ~addCallback() {}
virtual void operator()(const coil::Properties& config_set)
{
m_org->updateDelegatedPorts();
@@ -767,7 +767,7 @@
return RTC::RTC_OK;
}
-}; // namespace RTC
+}; // namespace RTC
extern "C"
{
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -423,7 +423,7 @@
}
}
};
-};
+}; // namespace SDOPackage
/*!
@@ -671,7 +671,7 @@
*/
SDOPackage::PeriodicECOrganization* m_org;
}; // class PeriodicECOrganization
-}; // namespace RTC
+}; // namespace RTC
#ifdef WIN32
#pragma warning( default : 4290 )
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -719,7 +719,7 @@
std::vector<int> m_cpu;
}; // class PeriodicExecutionContext
-}; // namespace RTC
+}; // namespace RTC_exp
#ifdef WIN32
#pragma warning( default : 4290 )
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortCallback.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -431,5 +431,5 @@
};
-};
+}; // namespace RTC
#endif // RTC_PORTCALLBACK_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -217,6 +217,5 @@
}
}
-};
+}; // namespace RTC
-
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -22,13 +22,11 @@
{
PortProfileHelper::PortProfileHelper()
{
- ;
}
PortProfileHelper::~PortProfileHelper()
{
- ;
}
@@ -356,4 +354,4 @@
return m_properties;
}
-};
+}; // namespace RTC
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherBase.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -29,7 +29,7 @@
namespace coil
{
class Properties;
-}
+} // namespace coil
namespace RTC
{
class InPortConsumer;
@@ -366,5 +366,5 @@
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
EXTERN template class DLL_PLUGIN coil::GlobalFactory<PublisherBase>;
#endif
-};
+}; // namespace RTC
#endif // RTC_PUBLISHERBASE_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -738,7 +738,6 @@
}
catch (...)
{
- ; // This operation throws no exception.
}
assert(false);
return 0;
@@ -761,7 +760,6 @@
}
catch (...)
{
- ; // This operation throws no exception.
}
assert(false);
return 0;
@@ -2818,4 +2816,4 @@
}
-}
+}; // namespace RTC
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -3340,7 +3340,7 @@
*
* @endif
*/
- void setWriteAll(bool write=true, bool completion=false);
+ void setWriteAll(bool write = true, bool completion = false);
/*!
@@ -4988,7 +4988,8 @@
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/RTObjectStateMachine.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObjectStateMachine.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -36,7 +36,7 @@
namespace RTC
{
class RTObject_impl;
-}
+} // namespace RTC
namespace RTC_impl
{
typedef RTC::ExecutionContextHandle_t Ecid;
@@ -123,7 +123,7 @@
coil::TimeMeasure m_svtMeasure;
coil::TimeMeasure m_refMeasure;
};
-}; // namespace RTC
+}; // namespace RTC_impl
#ifdef WIN32
#pragma warning( default : 4290 )
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -727,4 +727,4 @@
return (const char*) uuid->to_string();
}
-};
+}; // namespace SDOPackage
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -434,4 +434,4 @@
}
return false;
}
-};
+}; // namespace SDOPackage
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-01-18 02:16:36 UTC (rev 2854)
@@ -489,4 +489,4 @@
}
-}; // namepsace RTC
+}; // namespace RTC
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 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -20,6 +20,7 @@
#define RTC_SDOSERVICEADMIN_H
#include <string>
+#include <vector>
#include <coil/Mutex.h>
#include <coil/Factory.h>
@@ -371,6 +372,6 @@
};
-};
+}; // namespace RTC
#endif // RTC_SDOSERVICEADMIN_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*!
* @file DummyModule1.h
- * @brief
+ * @brief
* @date $Date: 2008-02-29 04:55:01 $
*
* $Id: DummyModule1.h 849 2008-09-25 11:20:51Z n-ando $
@@ -37,7 +37,7 @@
virtual ~DummyModule1();
// The initialize action (on CREATED->ALIVE transition)
- // formaer rtc_init_entry()
+ // formaer rtc_init_entry()
// virtual RTC::ReturnCode_t onInitialize();
// The finalize action (on ALIVE->END transition)
@@ -75,7 +75,7 @@
// The reset action that is invoked resetting
// This is same but different the former rtc_init_entry()
// virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
-
+
// The state update action that is invoked after onExecute() action
// no corresponding operation exists in OpenRTm-aist-0.2.0
// virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
@@ -88,7 +88,7 @@
protected:
// DataInPort declaration
// <rtc-template block="inport_declare">
-
+
// </rtc-template>
@@ -96,22 +96,22 @@
// <rtc-template block="outport_declare">
// TimedLong m_out;
// OutPort<TimedLong> m_outOut;
-
+
// </rtc-template>
// CORBA Port declaration
// <rtc-template block="corbaport_declare">
-
+
// </rtc-template>
// Service declaration
// <rtc-template block="service_declare">
-
+
// </rtc-template>
// Consumer declaration
// <rtc-template block="consumer_declare">
-
+
// </rtc-template>
private:
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -37,7 +37,7 @@
virtual ~DummyModule2();
// The initialize action (on CREATED->ALIVE transition)
- // formaer rtc_init_entry()
+ // formaer rtc_init_entry()
// virtual RTC::ReturnCode_t onInitialize();
// The finalize action (on ALIVE->END transition)
@@ -75,7 +75,7 @@
// The reset action that is invoked resetting
// This is same but different the former rtc_init_entry()
// virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
-
+
// The state update action that is invoked after onExecute() action
// no corresponding operation exists in OpenRTm-aist-0.2.0
// virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
@@ -90,28 +90,28 @@
// <rtc-template block="inport_declare">
// TimedLong m_in;
// InPort<TimedLong> m_inIn;
-
+
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
-
+
// </rtc-template>
// CORBA Port declaration
// <rtc-template block="corbaport_declare">
-
+
// </rtc-template>
// Service declaration
// <rtc-template block="service_declare">
-
+
// </rtc-template>
// Consumer declaration
// <rtc-template block="consumer_declare">
-
+
// </rtc-template>
private:
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h 2017-01-17 12:54:56 UTC (rev 2853)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h 2017-01-18 02:16:36 UTC (rev 2854)
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*!
* @file DummyModule1.h
- * @brief
+ * @brief
* @date $Date: 2008-02-29 04:55:01 $
*
* $Id: DummyModule1.h 849 2008-09-25 11:20:51Z n-ando $
@@ -37,7 +37,7 @@
virtual ~DummyModule1();
// The initialize action (on CREATED->ALIVE transition)
- // formaer rtc_init_entry()
+ // formaer rtc_init_entry()
// virtual RTC::ReturnCode_t onInitialize();
// The finalize action (on ALIVE->END transition)
@@ -75,7 +75,7 @@
// The reset action that is invoked resetting
// This is same but different the former rtc_init_entry()
// virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
-
+
// The state update action that is invoked after onExecute() action
// no corresponding operation exists in OpenRTm-aist-0.2.0
// virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
@@ -88,7 +88,7 @@
protected:
// DataInPort declaration
// <rtc-template block="inport_declare">
-
+
// </rtc-template>
@@ -96,22 +96,22 @@
// <rtc-template block="outport_declare">
// TimedLong m_out;
// OutPort<TimedLong> m_outOut;
-
+
// </rtc-template>
// CORBA Port declaration
// <rtc-template block="corbaport_declare">
-
+
// </rtc-template>
// Service declaration
// <rtc-template block="service_declare">
-
+
// </rtc-template>
// Consumer declaration
// <rtc-template block="consumer_declare">
-
+
// </rtc-template>
private:
More information about the openrtm-commit
mailing list