[openrtm-commit:02437] r2948 - branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 14日 (火) 10:23:56 JST
Author: n-ando
Date: 2017-02-14 10:23:56 +0900 (Tue, 14 Feb 2017)
New Revision: 2948
Modified:
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/FactoryInit.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
Log:
[compat,->DEV_IQ_2016] LDRA rule "At least one declaration in global namespace." has been made a countermeasured. refs #3908
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-02-14 01:23:56 UTC (rev 2948)
@@ -80,7 +80,7 @@
FactoryCXX::FactoryCXX(const coil::Properties& profile,
RtcNewFunc new_func,
RtcDeleteFunc delete_func,
- NumberingPolicy* policy)
+ RTM::NumberingPolicy* policy)
: FactoryBase(profile),
m_New(new_func),
m_Delete(delete_func),
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.h 2017-02-14 01:23:56 UTC (rev 2948)
@@ -323,7 +323,7 @@
FactoryCXX(const coil::Properties& profile,
RtcNewFunc new_func,
RtcDeleteFunc delete_func,
- NumberingPolicy* policy = new DefaultNumberingPolicy());
+ RTM::NumberingPolicy* policy = new RTM::DefaultNumberingPolicy());
virtual ~FactoryCXX()
{
@@ -402,7 +402,7 @@
* @brief The naming policy on creating the components
* @endif
*/
- NumberingPolicy* m_policy;
+ RTM::NumberingPolicy* m_policy;
};
}; // namespace RTC
#endif // RTC_FACTORY_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp 2017-02-14 01:23:56 UTC (rev 2948)
@@ -37,6 +37,8 @@
#include <rtm/InPortDirectProvider.h>
#include <rtm/InPortDirectConsumer.h>
+namespace RTM
+{
void FactoryInit()
{
// Buffers
@@ -58,3 +60,4 @@
InPortDirectProviderInit();
InPortDirectConsumerInit();
}
+}; // namespace RTM
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/FactoryInit.h 2017-02-14 01:23:56 UTC (rev 2948)
@@ -17,5 +17,9 @@
*/
#ifndef RTM_FACTORYINIT_H
#define RTM_FACTORYINIT_H
-void FactoryInit();
+
+namespace RTM
+{
+ void FactoryInit();
+}; // namespace RTM
#endif // RTM_FACTORYINIT_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-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-02-14 01:23:56 UTC (rev 2948)
@@ -1766,7 +1766,7 @@
bool Manager::initFactories()
{
RTC_TRACE(("Manager::initFactories()"));
- FactoryInit();
+ RTM::FactoryInit();
return true;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp 2017-02-14 01:23:56 UTC (rev 2948)
@@ -20,6 +20,8 @@
#include <rtm/NumberingPolicy.h>
#include <coil/stringutil.h>
+namespace RTM
+{
//============================================================
// DefaultNumberingPolicy
//============================================================
@@ -86,4 +88,4 @@
throw ObjectNotFound();
return i;
}
-
+}; // namespace RTM
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.h 2017-02-14 01:23:56 UTC (rev 2948)
@@ -23,6 +23,8 @@
#include <string>
#include <vector>
+namespace RTM
+{
/*!
* @if jp
*
@@ -262,4 +264,5 @@
int m_num;
std::vector<void*> m_objects;
};
+}; // namespace RTM
#endif // RTC_NUMBERINGPOLICY_H
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-02-12 00:13:57 UTC (rev 2947)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-02-14 01:23:56 UTC (rev 2948)
@@ -25,25 +25,6 @@
#include <iterator>
#include <string>
-
-static const char* periodicecsharedcomposite_spec[] =
- {
- "implementation_id", "PeriodicECSharedComposite",
- "type_name", "PeriodicECSharedComposite",
- "description", "PeriodicECSharedComposite",
- "version", "1.0",
- "vendor", "jp.go.aist",
- "category", "composite.PeriodicECShared",
- "activity_type", "DataFlowComponent",
- "max_instance", "0",
- "language", "C++",
- "lang_type", "compile",
- "exported_ports", "",
- "conf.default.members", "",
- "conf.default.exported_ports", "",
- ""
- };
-
namespace SDOPackage
{
/*!
@@ -562,6 +543,24 @@
namespace RTC
{
+ static const char* periodicecsharedcomposite_spec[] =
+ {
+ "implementation_id", "PeriodicECSharedComposite",
+ "type_name", "PeriodicECSharedComposite",
+ "description", "PeriodicECSharedComposite",
+ "version", "1.0",
+ "vendor", "jp.go.aist",
+ "category", "composite.PeriodicECShared",
+ "activity_type", "DataFlowComponent",
+ "max_instance", "0",
+ "language", "C++",
+ "lang_type", "compile",
+ "exported_ports", "",
+ "conf.default.members", "",
+ "conf.default.exported_ports", "",
+ ""
+ };
+
class setCallback
: public OnSetConfigurationSetCallback
{
@@ -776,7 +775,7 @@
{
void PeriodicECSharedCompositeInit(RTC::Manager* manager)
{
- coil::Properties profile(periodicecsharedcomposite_spec);
+ coil::Properties profile(RTC::periodicecsharedcomposite_spec);
manager->registerFactory(profile,
RTC::Create<RTC::PeriodicECSharedComposite>,
RTC::Delete<RTC::PeriodicECSharedComposite>);
More information about the openrtm-commit
mailing list