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

make all local variables static in gui2 test wrappers

Browse source 
This can cause segfaults / exceptions depending on compiler options
or platform apparently...

http://www.wesnoth.org/irclogs/2014/05/%23wesnoth-dev.2014-05-21.log
This commit is contained in:
Chris Beck 2014-05-21 11:21:24 -04:00
parent 2dbca0c3f1
commit acf3776527
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/tests/gui/test_gui2.cpp
View file

@ -75,6 +75,7 @@
#include "video.hpp"
#include "wml_exception.hpp"
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
@ -495,7 +496,7 @@ struct twrapper<gui2::tcampaign_selection>
{
static gui2::tcampaign_selection* create()
{
const config::const_child_itors &ci =
static const config::const_child_itors &ci =
main_config.child_range("campaign");
static std::vector<config> campaigns(ci.first, ci.second);
@ -656,7 +657,7 @@ struct twrapper<gui2::tlobby_player_info>
{
static gui2::tlobby_player_info* create()
{
config c;
static config c;
static fake_chat_handler ch;
static user_info ui(c);
static lobby_info li(c);
@ -715,10 +716,7 @@ struct twrapper<gui2::tmp_depcheck_confirm_change>
{
static gui2::tmp_depcheck_confirm_change* create()
{
std::vector<std::string> mods;
mods.push_back("mod one");
mods.push_back("some other");
mods.push_back("more");
static std::vector<std::string> mods = boost::assign::list_of("mod_one")("some other")("more");
return new gui2::tmp_depcheck_confirm_change(true, mods, "requester");
}
};
@ -728,10 +726,7 @@ struct twrapper<gui2::tmp_depcheck_select_new>
{
static gui2::tmp_depcheck_select_new* create()
{
std::vector<std::string> mods;
mods.push_back("mod one");
mods.push_back("some other");
mods.push_back("more");
static std::vector<std::string> mods = boost::assign::list_of("mod_one")("some other")("more");
return new gui2::tmp_depcheck_select_new(mp::depcheck::MODIFICATION, mods);
}
};
@ -781,11 +776,8 @@ struct twrapper<gui2::ttheme_list>
}
static gui2::ttheme_list* create()
{
std::vector<theme_info> themes;
themes.push_back(make_theme("classic"));
themes.push_back(make_theme("new"));
themes.push_back(make_theme("more"));
themes.push_back(make_theme("themes"));
static std::vector<theme_info> themes = boost::assign::list_of(make_theme("classic"))
(make_theme("new"))(make_theme("more"))(make_theme("themes"));
return new gui2::ttheme_list(themes, 0);
}
};
@ -890,10 +882,7 @@ struct twrapper<gui2::twml_error>
{
static gui2::twml_error* create()
{
std::vector<std::string> files;
files.push_back("some");
files.push_back("files");
files.push_back("here");
static std::vector<std::string> files = boost::assign::list_of("some")("files")("here");
return new gui2::twml_error("Summary", "Post summary", files, "Details");
}
};