EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

vx const fixup

Browse Source 
std::set iteration really should always be const
as mutation would invalidate the ordering.
This commit is contained in:
Michael Davidsaver
2019-09-05 20:02:46 -07:00
parent bdbf57350b
commit 0e0400022c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pdbApp/pvif.cpp
View File

@ -88,11 +88,11 @@ void ASCred::update(const pva::ChannelRequester::shared_pointer& req)
usertemp = info->authority + "/" + info->account; usertemp = info->authority + "/" + info->account;
} }
static const char role[] = "role/"; const char role[] = "role/";
groups.resize(info->roles.size()); groups.resize(info->roles.size());
size_t idx = 0u; size_t idx = 0u;
for(pva::PeerInfo::roles_t::iterator it(info->roles.begin()), end(info->roles.end()); it!=end; ++it, idx++) { for(pva::PeerInfo::roles_t::const_iterator it(info->roles.begin()), end(info->roles.end()); it!=end; ++it, idx++) {
groups[idx].resize((*it).size()+sizeof(role)); // sizeof(role) includes trailing nil groups[idx].resize((*it).size()+sizeof(role)); // sizeof(role) includes trailing nil
std::copy(role, std::copy(role,
role+sizeof(role)-1, role+sizeof(role)-1,
@ -109,7 +109,7 @@ void ASCred::update(const pva::ChannelRequester::shared_pointer& req)
} }
// remote names have the form "IP:port" // remote names have the form "IP:port"
size_t sep = hosttemp.find_first_of(":"); size_t sep = hosttemp.find_first_of(':');
if(sep == std::string::npos) { if(sep == std::string::npos) {
sep = hosttemp.size(); sep = hosttemp.size();
} }