diff --git a/src/actions/create.cpp b/src/actions/create.cpp index 59d4e57c4f53..eeb8a974f17b 100644 --- a/src/actions/create.cpp +++ b/src/actions/create.cpp @@ -660,7 +660,7 @@ place_recruit_result place_recruit(unit_ptr u, const map_location &recruit_locat std::get<0>(res) |= std::get<0>(resources::game_events->pump().fire(event_name, current_loc, recruited_from)); } if ( !validate_recruit_iterator(new_unit_itor, current_loc) ) - return std::make_tuple(true, 0, false); + return std::tuple(true, 0, false); new_unit_itor->set_hidden(true); } preferences::encountered_units().insert(new_unit_itor->type_id()); @@ -681,7 +681,7 @@ place_recruit_result place_recruit(unit_ptr u, const map_location &recruit_locat std::get<1>(res) = resources::gameboard->village_owner(current_loc); std::get<0>(res) |= std::get<0>(actions::get_village(current_loc, new_unit_itor->side(), &std::get<2>(res))); if ( !validate_recruit_iterator(new_unit_itor, current_loc) ) - return std::make_tuple(true, 0, false); + return std::tuple(true, 0, false); } // Fog clearing. diff --git a/src/game_events/pump.cpp b/src/game_events/pump.cpp index 2d88c59fb4f4..c079fcf3abc9 100644 --- a/src/game_events/pump.cpp +++ b/src/game_events/pump.cpp @@ -601,7 +601,7 @@ pump_result_t wml_event_pump::operator()() // This is used to track when moves, recruits, etc. happen. resources::whiteboard->on_gamestate_change(); - return std::make_tuple(undo_disabled(), action_canceled()); + return std::tuple(undo_disabled(), action_canceled()); } void wml_event_pump::flush_messages() diff --git a/src/gui/dialogs/unit_list.cpp b/src/gui/dialogs/unit_list.cpp index 654b7c5ccac9..f5dd434d7313 100644 --- a/src/gui/dialogs/unit_list.cpp +++ b/src/gui/dialogs/unit_list.cpp @@ -165,7 +165,7 @@ void unit_list::pre_show(window& window) list.register_sorting_option(3, [this](const int i) { return unit_list_[i]->hitpoints(); }); list.register_sorting_option(4, [this](const int i) { const unit& u = *unit_list_[i]; - return std::make_tuple(u.level(), -static_cast(u.experience_to_advance())); + return std::tuple(u.level(), -static_cast(u.experience_to_advance())); }); list.register_sorting_option(5, [this](const int i) { return unit_list_[i]->experience(); }); list.register_translatable_sorting_option(6, [this](const int i) { diff --git a/src/gui/dialogs/unit_recall.cpp b/src/gui/dialogs/unit_recall.cpp index 8bce05c76d7f..b786015006c5 100644 --- a/src/gui/dialogs/unit_recall.cpp +++ b/src/gui/dialogs/unit_recall.cpp @@ -296,7 +296,7 @@ void unit_recall::pre_show(window& window) list.register_translatable_sorting_option(1, [this](const int i) { return recall_list_[i]->name().str(); }); list.register_sorting_option(2, [this](const int i) { const unit& u = *recall_list_[i]; - return std::make_tuple(u.level(), -static_cast(u.experience_to_advance())); + return std::tuple(u.level(), -static_cast(u.experience_to_advance())); }); list.register_sorting_option(3, [this](const int i) { return recall_list_[i]->experience(); }); list.register_translatable_sorting_option(4, [this](const int i) { diff --git a/src/units/filter.cpp b/src/units/filter.cpp index 80470bbed960..9bd40c30016f 100644 --- a/src/units/filter.cpp +++ b/src/units/filter.cpp @@ -690,7 +690,7 @@ void unit_filter_compound::fill(vconfig cfg) for(auto child : cfg.all_ordered()) { CONDITIONAL_TYPE cond; if(cond.parse(child.first)) { - cond_children_.emplace_back(std::piecewise_construct_t(), std::make_tuple(cond), std::make_tuple(child.second)); + cond_children_.emplace_back(std::piecewise_construct_t(), std::tuple(cond), std::tuple(child.second)); } else if (child.first == "filter_wml") { create_child(child.second, [](const vconfig& c, const unit_filter_args& args) {