[openrtm-commit:02422] r2939 - branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 10日 (金) 19:15:20 JST
Author: n-ando
Date: 2017-02-10 19:15:20 +0900 (Fri, 10 Feb 2017)
New Revision: 2939
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
Log:
[compat,->DEV_IQ_2016] LDRA rule "Procedure contains UR data flow anomalies." has been made a countermeasured. refs #3909
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-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -185,7 +185,7 @@
result[j+1] = 'a' + (v - 10);
}
}
- iorstr = result;
+ iorstr = std::string(result);
delete[] result;
return true;
#else // ORB_IS_RTORB
@@ -248,7 +248,7 @@
*/
std::string formatIORinfo(const char* iorstr)
{
- std::stringstream retstr;
+ std::stringstream retstr("");
#ifndef ORB_IS_RTORB
IOP::IOR ior;
toIOR(iorstr, ior);
@@ -264,7 +264,7 @@
retstr << " Type ID: \"" << (const char*) ior.type_id
<< "\"" << std::endl;
retstr << " Profiles:" << std::endl;
- for (unsigned long count=0; count < ior.profiles.length(); ++count)
+ for (CORBA::ULong count(0); count < ior.profiles.length(); ++count)
{
retstr << " " << count + 1 << ". ";
if (ior.profiles[count].tag == IOP::TAG_INTERNET_IOP)
@@ -319,7 +319,7 @@
{
// Output key as text
sstr << " Object Key: \"";
- for (unsigned int j = 0; j < key.length(); ++j)
+ for (CORBA::ULong j(0); j < key.length(); ++j)
{
if (static_cast<char>(key[j]) >= ' '
&& static_cast<char>(key[j]) <= '~')
@@ -376,7 +376,7 @@
}
else
{
- if (key.length() != sizeof(omniOrbBoaKey))
+ if (key.length() != static_cast<CORBA::ULong>(sizeof(omniOrbBoaKey)))
{
return;
}
@@ -389,7 +389,7 @@
int& transient_out, OctetUSequence& id_out)
{
const char* k = (const char*) key.NP_data();
- int len = key.length();
+ size_t len = static_cast<size_t>(key.length());
const char* kend = k + len;
poas_out.length(1);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -64,7 +64,7 @@
RTC_DEBUG_STR((prop));
m_properties << prop;
- NVList nv;
+ NVList nv(0);
NVUtil::copyFromProperties(nv, m_properties);
CORBA_SeqUtil::push_back_list(m_profile.properties, nv);
RTC_PARANOID(("updated properties:"));
@@ -218,8 +218,7 @@
//------------------------------------------------------------
// old version descriptor
// port.<type_name>.<instance_name>
- std::string olddesc;
- olddesc += "port." + it->descriptor();
+ std::string olddesc = "port." + it->descriptor();
CORBA_SeqUtil::
push_back(properties,
NVUtil::newNV(olddesc.c_str(), it->ior().c_str()));
@@ -266,7 +265,7 @@
CORBA::Long index(NVUtil::find_index(nv, "port.connection.strictness"));
if (index >= 0)
{
- const char* strictness;
+ const char* strictness = NULL;
nv[index].value >>= strictness;
if (std::string("best_effort") == strictness)
{
@@ -278,6 +277,7 @@
}
else
{
+ strict = false;
}
RTC_DEBUG(("Connetion strictness is: %s",
strict ? "strict" : "best_effort"))
@@ -286,7 +286,7 @@
for (CorbaConsumerList::iterator it(m_consumers.begin());
it != m_consumers.end(); ++it)
{
- std::string ior;
+ std::string ior = std::string();
if (findProvider(nv, *it, ior))
{
setObject(ior, *it);
@@ -365,7 +365,7 @@
CORBA::Long cons_index(NVUtil::find_index(nv, newdesc.c_str()));
if (cons_index < 0) { return false; }
- const char* provider;
+ const char* provider(NULL);
if (!(nv[cons_index].value >>= provider))
{
RTC_WARN(("Cannot extract Provider interface descriptor"));
@@ -376,7 +376,7 @@
CORBA::Long prov_index(NVUtil::find_index(nv, provider));
if (prov_index < 0) { return false; }
- const char* ior;
+ const char* ior(NULL);
if (!(nv[prov_index].value >>= ior))
{
RTC_WARN(("Cannot extract Provider IOR string"));
@@ -404,7 +404,7 @@
CORBA::Long index(NVUtil::find_index(nv, olddesc.c_str()));
if (index < 0) { return false; }
- const char* ior;
+ const char* ior(NULL);
if (!(nv[index].value >>= ior))
{
RTC_WARN(("Cannot extract Provider IOR string"));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -358,7 +358,7 @@
{
RTC_TRACE(("getProperties()"));
Guard guard(m_profileMutex);
- coil::Properties props;
+ coil::Properties props = coil::Properties();
NVUtil::copyToProperties(props, m_profile.properties);
RTC_DEBUG_STR((props));
return props;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -215,7 +215,7 @@
return false;
}
- CORBA::Object_var obj;
+ CORBA::Object_var obj = CORBA::Object::_nil();
if (!(properties[index].value >>= CORBA::Any::to_object(obj.out())))
{
RTC_ERROR(("prop[inport_ref] is not objref"));
@@ -256,7 +256,7 @@
return false;
}
- const char* ior;
+ const char* ior = NULL;
if (!(properties[index].value >>= ior))
{
RTC_ERROR(("prop[inport_ior] is not string"));
@@ -291,7 +291,7 @@
"dataport.corba_cdr.inport_ref");
if (index < 0) { return false; }
- CORBA::Object_var obj;
+ CORBA::Object_var obj = CORBA::Object::_nil();
if (!(properties[index].value >>= CORBA::Any::to_object(obj.out())))
{
return false;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/LocalServiceAdmin.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -142,7 +142,7 @@
*/
RTM::LocalServiceProfileList LocalServiceAdmin::getServiceProfiles()
{
- RTM::LocalServiceProfileList profs;
+ RTM::LocalServiceProfileList profs(0);
for (size_t i(0); i < m_services.size(); ++i)
{
profs.push_back(m_services[i]->getProfile());
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-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -430,7 +430,7 @@
RTC_DEBUG(("%s has %d ports.", comp0_name.c_str(), ports0->length()));
RTC_DEBUG(("%s has %d ports.", comp1_name.c_str(), ports1->length()));
- PortService_var port0_var;
+ PortService_var port0_var = PortService::_nil();
for (size_t p(0); p < ports0->length(); ++p)
{
PortProfile_var pp = ports0[p]->get_port_profile();
@@ -441,7 +441,7 @@
port0_var = ports0[p];
}
}
- PortService_var port1_var;
+ PortService_var port1_var = PortService::_nil();
for (size_t p(0); p < ports1->length(); ++p)
{
PortProfile_var pp = ports1[p]->get_port_profile();
@@ -726,7 +726,8 @@
m_listeners.rtclifecycle_.preCreate(argstr);
//------------------------------------------------------------
// extract "comp_type" and "comp_prop" from comp_arg
- coil::Properties comp_prop, comp_id;
+ coil::Properties comp_prop = coil::Properties();
+ coil::Properties comp_id = coil::Properties();
if (!procComponentArgs(argstr.c_str(), comp_id, comp_prop)) return NULL;
//------------------------------------------------------------
@@ -952,8 +953,8 @@
RTC_TRACE(("ExecutionContext type: %s",
m_config.getProperty("exec_cxt.periodic.type").c_str()));
- std::string ec_id;
- coil::Properties ec_prop;
+ std::string ec_id = std::string();
+ coil::Properties ec_prop = coil::Properties();
if (!procContextArgs(ec_args, ec_id, ec_prop)) return NULL;
ECFactoryBase* factory(m_ecfactory.find(ec_id.c_str()));
@@ -1242,7 +1243,7 @@
coil::TimeValue tm(10, 0);
if (m_config.findNode("manager.auto_shutdown_duration") != NULL)
{
- double duration;
+ double duration(10.0);
const char* s = m_config["manager.auto_shutdown_duration"].c_str();
if (coil::stringTo(duration, s))
{
@@ -1475,7 +1476,7 @@
RTC_DEBUG_STR((m_config));
- coil::vstring endpoints;
+ coil::vstring endpoints(0);
createORBEndpoints(endpoints);
createORBEndpointOption(opt, endpoints);
@@ -1861,7 +1862,7 @@
}
else
{
- std::string refstring;
+ std::string refstring = std::string();
otherref >> refstring;
otherref.close();
@@ -2229,7 +2230,7 @@
if (*it == '{' || *it == '(')
{
++it;
- std::string env;
+ std::string env = std::string();
for ( ; it != it_end && (*it) != '}' && (*it) != ')'; ++it)
{
env += *it;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -164,7 +164,7 @@
break;
case 'p': // ORB's port number
{
- int portnum;
+ int portnum(2810);
if (coil::stringTo(portnum, get_opts.optarg))
{
std::string arg(":"); arg += get_opts.optarg;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -300,7 +300,7 @@
{
RTC_TRACE(("getLoadedModules()"));
std::vector< DLLEntity* > dlls(m_modules.getObjects());
- std::vector<coil::Properties> modules;
+ std::vector<coil::Properties> modules(0);
for (int i(0), len(dlls.size()); i < len; ++i)
{
modules.push_back(dlls[i]->properties);
@@ -328,12 +328,12 @@
for (size_t l(0); l < langs.size(); ++l)
{
// 1. getting loadable files list
- coil::vstring modules;
+ coil::vstring modules(0);
getModuleList(langs[l], modules);
RTC_DEBUG(("%s: %s", langs[l].c_str(), coil::flatten(modules).c_str()));
// 2. getting module properties from loadable modules
- vProperties tmpprops;
+ vProperties tmpprops(0);
getModuleProfiles(langs[l], modules, tmpprops);
RTC_DEBUG(("Modile profile size: %d (newly founded modules)",
tmpprops.size()));
@@ -474,7 +474,7 @@
RTC_DEBUG(("Module load path: %s", path.c_str()));
// get file list for each suffixes
- coil::vstring flist;
+ coil::vstring flist(0);
for (size_t s(0); s < suffixes.size(); ++s)
{
std::string glob("*."); glob += suffixes[s];
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -140,7 +140,7 @@
{
for (CORBA::ULong i(0), len(nv.length()); i < len; ++i)
{
- const char* value;
+ const char* value(NULL);
if (nv[i].value >>= value)
{
const char* name(nv[i].name);
@@ -159,11 +159,12 @@
struct to_prop
{
to_prop()
+ : m_prop(coil::Properties())
{
};
void operator()(const SDOPackage::NameValue& nv)
{
- const char* value;
+ const char* value(NULL);
if (nv.value >>= value)
{
m_prop.setProperty(CORBA::string_dup(nv.name), value);
@@ -244,7 +245,7 @@
{
CORBA::Any value;
value = find(nv, name);
- const char* str_value = NULL;
+ const char* str_value(NULL);
return value >>= str_value;
}
catch (...)
@@ -283,7 +284,7 @@
*/
std::string toString(const SDOPackage::NVList& nv, const char* name)
{
- const char* str_value;
+ const char* str_value(NULL);
try
{
if (!(find(nv, name) >>= str_value))
@@ -330,7 +331,7 @@
}
else
{
- const char* tmp_char;
+ const char* tmp_char(NULL);
nv[index].value >>= tmp_char;
std::string tmp_str(tmp_char);
@@ -372,7 +373,7 @@
{
for (CORBA::ULong i(0), n(nv.length()); i < n; ++i)
{
- const char* str_value;
+ const char* str_value(NULL);
if (nv[i].value >>= str_value)
{
out << nv[i].name << ": " << str_value << std::endl;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrConsumer.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -160,7 +160,7 @@
"dataport.corba_cdr.outport_ior"))
{
RTC_DEBUG(("dataport.corba_cdr.outport_ior found."));
- const char* ior;
+ const char* ior(NULL);
properties[index].value >>= ior;
CORBA::ORB_var orb = ::RTC::Manager::instance().getORB();
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -158,7 +158,7 @@
return ::OpenRTM::UNKNOWN_ERROR;
}
- cdrMemoryStream cdr;
+ cdrMemoryStream cdr = cdrMemoryStream();
CdrBufferBase::ReturnCode ret(m_buffer->read(cdr));
if (ret == CdrBufferBase::BUFFER_OK)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -125,7 +125,7 @@
{
#ifndef ORB_IS_RTORB
- PortProfileList port_profs;
+ PortProfileList port_profs(0);
// port_prof_collect p(port_profs);
port_prof_collect2 p(port_profs);
// m_portServants.for_each(p);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -348,7 +348,7 @@
m_task->executionMeasure(coil::toBool(prop["measurement.exec_time"],
"enable", "disable", true));
- int ecount;
+ int ecount(1000);
if (coil::stringTo(ecount, prop["measurement.exec_count"].c_str()))
{
m_task->executionMeasureCount(ecount);
@@ -356,7 +356,7 @@
m_task->periodicMeasure(coil::toBool(prop["measurement.period_time"],
"enable", "disable", true));
- int pcount;
+ int pcount(1000);
if (coil::stringTo(pcount, prop["measurement.period_count"].c_str()))
{
m_task->periodicMeasureCount(pcount);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -477,7 +477,7 @@
RTC_PARANOID(("Task creation succeeded."));
// Extracting publisher's period time
- double hz;
+ double hz(100);
if (!coil::stringTo(hz, prop["publisher.push_rate"].c_str()) &&
// for 0.4 compatibility
!coil::stringTo(hz, prop["push_rate"].c_str()))
@@ -497,7 +497,7 @@
m_task->executionMeasure(coil::toBool(prop["measurement.exec_time"],
"enable", "disable", true));
- int ecount;
+ int ecount(1000);
if (coil::stringTo(ecount, prop["measurement.exec_count"].c_str()))
{
m_task->executionMeasureCount(ecount);
@@ -505,7 +505,7 @@
m_task->periodicMeasure(coil::toBool(prop["measurement.period_time"],
"enable", "disable", true));
- int pcount;
+ int pcount(1000);
if (coil::stringTo(pcount, prop["measurement.period_count"].c_str()))
{
m_task->periodicMeasureCount(pcount);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -592,12 +592,8 @@
{
Guard gurad(m_config_mutex);
const char* config_id(configuration_set.id);
-// const char* config_value(configuration_set.description);
-// RTC::Properties config(config_id);
coil::Properties config(config_id);
-// coil::Properties config(config_id,config_value);
toProperties(config, configuration_set);
-// config["description"] = configuration_set.description;
return m_configsets.addConfigurationSet(config);
}
catch (...)
@@ -724,7 +720,7 @@
*/
const std::string Configuration_impl::getUUID() const
{
- coil::UUID_Generator uugen;
+ coil::UUID_Generator uugen = coil::UUID_Generator();
uugen.init();
std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -37,7 +37,7 @@
{
m_varOwner = sdo.in();
- coil::UUID_Generator uugen;
+ coil::UUID_Generator uugen = coil::UUID_Generato();
uugen.init();
std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
m_pId = uuid->to_string();
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-02-10 09:08:47 UTC (rev 2938)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-02-10 10:15:20 UTC (rev 2939)
@@ -489,7 +489,7 @@
const std::string SdoServiceAdmin::getUUID() const
{
- coil::UUID_Generator uugen;
+ coil::UUID_Generator uugen = coil::UUID_Generator();
uugen.init();
std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
More information about the openrtm-commit
mailing list