epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge https://github.com/epics-base/pvAccessCPP

Browse Source 
get up to date with master
This commit is contained in:
mrkraimer
2017-08-16 10:15:49 -04:00
parent 631e5969f9 561ea53198
commit 5f1b7259d9
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pvtoolsSrc/pvutils.cpp
View File

@@ -105,11 +105,11 @@ std::ostream& terse(std::ostream& o, PVField::shared_pointer const & pv)
std::ostream& printEnumT(std::ostream& o, epics::pvData::PVStructure const & pvEnumT)
{
PVInt::shared_pointer pvIndex = pvEnumT.getSubField<PVInt>("index");
PVInt::const_shared_pointer pvIndex = pvEnumT.getSubField<PVInt>("index");
if (!pvIndex)
throw std::runtime_error("enum_t structure does not have 'int index' field");
PVStringArray::shared_pointer pvChoices = pvEnumT.getSubField<PVStringArray>("choices");
PVStringArray::const_shared_pointer pvChoices = pvEnumT.getSubField<PVStringArray>("choices");
if (!pvChoices)
throw std::runtime_error("enum_t structure does not have 'string choices[]' field");

16
src/remoteClient/clientContextImpl.cpp
View File

@@ -3912,15 +3912,25 @@ public:
m_needSubscriptionUpdate = true;
// make a copy so that ResponseRequest::reportStatus() can
// remove itself from m_responseRequests
size_t count = 0;
std::vector<ResponseRequest::weak_pointer> rrs(m_responseRequests.size());
for (IOIDResponseRequestMap::iterator iter = m_responseRequests.begin();
iter != m_responseRequests.end();
iter++)
{
ResponseRequest::shared_pointer ptr(iter->second.lock());
if(ptr)
EXCEPTION_GUARD(ptr->reportStatus(state));
rrs[count++] = iter->second;
}
ResponseRequest::shared_pointer ptr;
for (size_t i = 0; i< count; i++)
{
if((ptr = rrs[i].lock()))
{
EXCEPTION_GUARD(ptr->reportStatus(state));
}
}
}
/**