0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid brace init for visitor classes

Browse source 
Doesn't play nice with boost::static_visitor for c++20...
This commit is contained in:
Charles Dang 2024-07-29 12:02:24 -04:00
parent d77700f2f2
commit 698bc98ff2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/lua_unit.cpp
View file

@ -345,7 +345,7 @@ static int impl_unit_get(lua_State *L)
if(int* v = utils::get_if<int>(&upkeep)) {
lua_push(L, *v);
} else {
const std::string type = utils::visit(unit::upkeep_type_visitor{}, upkeep);
const std::string type = utils::visit(unit::upkeep_type_visitor(), upkeep);
lua_push(L, type);
}

4
src/units/unit.cpp
View file

@ -2857,7 +2857,7 @@ void unit::parse_upkeep(const config::attribute_value& upkeep)
}
try {
upkeep_ = upkeep.apply_visitor(upkeep_parser_visitor{});
upkeep_ = upkeep.apply_visitor(upkeep_parser_visitor());
} catch(std::invalid_argument& e) {
WRN_UT << "Found invalid upkeep=\"" << e.what() << "\" in a unit";
upkeep_ = upkeep_full{};
@ -2866,7 +2866,7 @@ void unit::parse_upkeep(const config::attribute_value& upkeep)
void unit::write_upkeep(config::attribute_value& upkeep) const
{
upkeep = utils::visit(upkeep_type_visitor{}, upkeep_);
upkeep = utils::visit(upkeep_type_visitor(), upkeep_);
}
void unit::clear_changed_attributes()