From 30c2141182f4eed1d3549603a7aa92c57b35d129 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 18 Apr 2015 19:25:22 +0200 Subject: Replace all make_pair calls with initializer lists --- src/generator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/generator.cpp') diff --git a/src/generator.cpp b/src/generator.cpp index 1a4c79f..59f96b1 100644 --- a/src/generator.cpp +++ b/src/generator.cpp @@ -87,7 +87,7 @@ void generator_t::generate() { item_t shifted = item; shifted.shift(); - std::set &set = new_sets.insert(std::make_pair(sym, empty_set)).first->second; + std::set &set = new_sets.insert({sym, empty_set}).first->second; set.insert(std::move(shifted)); } @@ -122,11 +122,11 @@ generator_t::generator_t(const grammar_t &grammar0) : grammar(grammar0) { item_t rule = grammar.rules[i].item; nonterminals.insert(rule.get_lhs()); - nonterms.insert(std::make_pair(rule.get_lhs(), i)); + nonterms.insert({rule.get_lhs(), i}); while (rule.has_next()) { const symbol_t &sym = rule.get_next_symbol(); - items.insert(std::make_pair(sym, rule)); + items.insert({sym, rule}); if (sym.get_type() != SYMBOL_TYPE_NONTERM) terminals.insert(sym); @@ -134,7 +134,7 @@ generator_t::generator_t(const grammar_t &grammar0) : grammar(grammar0) { rule.shift(); } - rule_ids.insert(std::make_pair(rule, i)); + rule_ids.insert({rule, i}); } } -- cgit v1.2.3