@@ -608,7 +608,7 @@ void string_refinementt::set_to(const exprt &expr, bool value)
608
608
// If lhs is not a symbol, let supert::set_to() handle it.
609
609
if (lhs.id ()!=ID_symbol)
610
610
{
611
- non_string_axioms.push_back ( std::make_pair ( expr, value) );
611
+ non_string_axioms.emplace_back ( expr, value);
612
612
return ;
613
613
}
614
614
@@ -663,16 +663,15 @@ void string_refinementt::set_to(const exprt &expr, bool value)
663
663
664
664
// Push the substituted equality to the list of axioms to be given to
665
665
// supert::set_to.
666
- non_string_axioms.push_back (
667
- std::make_pair (equal_exprt (lhs, subst_rhs), value));
666
+ non_string_axioms.emplace_back (equal_exprt (lhs, subst_rhs), value);
668
667
}
669
668
// Push the unmodified equality to the list of axioms to be given to
670
669
// supert::set_to.
671
670
else
672
671
{
673
672
// TODO: Verify that the expression contains no string.
674
673
// This will be easy once exprt iterators will have been implemented.
675
- non_string_axioms.push_back ( std::make_pair ( expr, value) );
674
+ non_string_axioms.emplace_back ( expr, value);
676
675
}
677
676
}
678
677
@@ -1546,7 +1545,7 @@ static std::map<exprt, int> map_representation_of_sum(const exprt &f)
1546
1545
std::map<exprt, int > elems;
1547
1546
1548
1547
std::list<std::pair<exprt, bool > > to_process;
1549
- to_process.push_back ( std::make_pair ( f, true ) );
1548
+ to_process.emplace_back ( f, true );
1550
1549
1551
1550
while (!to_process.empty ())
1552
1551
{
@@ -1556,16 +1555,16 @@ static std::map<exprt, int> map_representation_of_sum(const exprt &f)
1556
1555
if (cur.id ()==ID_plus)
1557
1556
{
1558
1557
for (const auto &op : cur.operands ())
1559
- to_process.push_back ( std::make_pair ( op, positive) );
1558
+ to_process.emplace_back ( op, positive);
1560
1559
}
1561
1560
else if (cur.id ()==ID_minus)
1562
1561
{
1563
- to_process.push_back ( std::make_pair ( cur.op1 (), !positive) );
1564
- to_process.push_back ( std::make_pair ( cur.op0 (), positive) );
1562
+ to_process.emplace_back ( cur.op1 (), !positive);
1563
+ to_process.emplace_back ( cur.op0 (), positive);
1565
1564
}
1566
1565
else if (cur.id ()==ID_unary_minus)
1567
1566
{
1568
- to_process.push_back ( std::make_pair ( cur.op0 (), !positive) );
1567
+ to_process.emplace_back ( cur.op0 (), !positive);
1569
1568
}
1570
1569
else
1571
1570
{
0 commit comments