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

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
ln-zookeeper 2016-08-30 18:56:28 +03:00
commit 90b0d66433
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/widgets/listbox.cpp
View file

@ -844,13 +844,13 @@ tlistbox_definition::tresolution::tresolution(const config& cfg)
namespace implementation
{
static std::vector<std::map<std::string, string_map>> parse_list_data(const config& data, const int req_cols)
static std::vector<std::map<std::string, string_map>> parse_list_data(const config& data, const unsigned int req_cols)
{
std::vector<std::map<std::string, string_map>> list_data;
for(const auto & row : data.child_range("row"))
{
auto cols = row.child_range("column");
VALIDATE(cols.size() == static_cast<unsigned>(req_cols), _("'list_data' must have the same number of columns as the 'list_definition'."));
VALIDATE(static_cast<unsigned>(cols.size()) == req_cols, _("'list_data' must have the same number of columns as the 'list_definition'."));
for(const auto & c : cols)
{