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

channelList using svector

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-09 22:13:48 +02:00
parent aea156ebbb
commit 4e62a7d4df
7 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pvAccessApp/rpcService/rpcServer.cpp
View File

@@ -375,17 +375,18 @@ public:
if (!channelListRequester.get())
throw std::runtime_error("null requester");
std::set<epics::pvData::String> channelNames;
PVStringArray::svector channelNames;
{
Lock guard(m_mutex);
channelNames.reserve(m_services.size());
for (RPCServiceMap::const_iterator iter = m_services.begin();
iter != m_services.end();
iter++)
channelNames.insert(iter->first);
channelNames.push_back(iter->first);
}
ChannelFind::shared_pointer thisPtr(shared_from_this());
channelListRequester->channelListResult(Status::Ok, thisPtr, channelNames, false);
channelListRequester->channelListResult(Status::Ok, thisPtr, freeze(channelNames), false);
return thisPtr;
}