summaryrefslogtreecommitdiff
path: root/idlc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-11 11:36:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-11 13:51:29 +0200
commitdb17a874af37350b3270932175854ee674447bc1 (patch)
treefecc983fb75d3a4072cc7bd344fc824d548deb0d /idlc
parentdd8a400bbbb1b8d5592a870f2036a4df3d005a7d (diff)
convert std::map::insert to std::map::emplace II
Change-Id: Ief8bd59c903625ba65b75114b7b52c3b7ecbd331 Reviewed-on: https://gerrit.libreoffice.org/41019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idlc')
-rw-r--r--idlc/source/astinterface.cxx20
1 files changed, 7 insertions, 13 deletions
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 90e5c060ece4..8fc4ed0f992c 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -80,9 +80,7 @@ AstInterface::DoubleMemberDeclarations AstInterface::checkMemberClashes(
void AstInterface::addMember(AstDeclaration /*TODO: const*/ * member) {
addDeclaration(member);
- m_visibleMembers.insert(
- VisibleMembers::value_type(
- member->getLocalName(), VisibleMember(member)));
+ m_visibleMembers.emplace(member->getLocalName(), VisibleMember(member));
}
void AstInterface::forwardDefined(AstInterface const & def)
@@ -347,8 +345,7 @@ void AstInterface::addVisibleInterface(
? direct ? INTERFACE_DIRECT_OPTIONAL : INTERFACE_INDIRECT_OPTIONAL
: direct ? INTERFACE_DIRECT_MANDATORY : INTERFACE_INDIRECT_MANDATORY;
std::pair< VisibleInterfaces::iterator, bool > result(
- m_visibleInterfaces.insert(
- VisibleInterfaces::value_type(ifc->getScopedName(), kind)));
+ m_visibleInterfaces.emplace(ifc->getScopedName(), kind));
bool seen = !result.second
&& result.first->second >= INTERFACE_INDIRECT_MANDATORY;
if (!result.second && kind > result.first->second) {
@@ -358,9 +355,8 @@ void AstInterface::addVisibleInterface(
for (DeclList::const_iterator i(ifc->getIteratorBegin());
i != ifc->getIteratorEnd(); ++i)
{
- m_visibleMembers.insert(
- VisibleMembers::value_type(
- (*i)->getLocalName(), VisibleMember(*i)));
+ m_visibleMembers.emplace(
+ (*i)->getLocalName(), VisibleMember(*i));
}
for (InheritedInterfaces::const_iterator i(
ifc->m_inheritedInterfaces.begin());
@@ -378,13 +374,11 @@ void AstInterface::addOptionalVisibleMembers(AstInterface const * ifc) {
VisibleMembers::iterator visible(
m_visibleMembers.find((*i)->getLocalName()));
if (visible == m_visibleMembers.end()) {
- visible = m_visibleMembers.insert(
- VisibleMembers::value_type(
- (*i)->getLocalName(), VisibleMember())).first;
+ visible = m_visibleMembers.emplace(
+ (*i)->getLocalName(), VisibleMember()).first;
}
if (visible->second.mandatory == nullptr) {
- visible->second.optionals.insert(
- VisibleMember::Optionals::value_type(ifc->getScopedName(), *i));
+ visible->second.optionals.emplace(ifc->getScopedName(), *i);
}
}
for (InheritedInterfaces::const_iterator i(