Fix warning: Extra semicolon

This commit is contained in:
Gregory A Lundberg 2016-11-11 10:57:37 -06:00
parent a2695aca78
commit b3019efd42
9 changed files with 12 additions and 12 deletions

View file

@ -43,7 +43,7 @@ struct target {
(BATTLE_AID, "battle aid")
(MASS, "mass")
(SUPPORT, "support")
);
)
target(const map_location& pos, double val, TYPE target_type=TYPE::VILLAGE) : loc(pos), value(val), type(target_type)
{}

View file

@ -38,7 +38,7 @@ namespace gui2
{
namespace dialogs
{
REGISTER_DIALOG(label_settings);
REGISTER_DIALOG(label_settings)
label_settings::label_settings(display_context& dc) : viewer(dc) {
const std::vector<std::string>& all_categories = resources::screen->labels().all_categories();

View file

@ -246,7 +246,7 @@ template<typename W>
static void disable_widget_on_toggle(window& window, widget& w, const std::string& id)
{
find_widget<W>(&window, id, false).set_active(dynamic_cast<selectable_item&>(w).get_value_bool());
};
}
/**
* Sets up states and callbacks for each of the widgets

View file

@ -33,7 +33,7 @@ namespace gui2
{
namespace dialogs
{
REGISTER_DIALOG(select_orb_colors);
REGISTER_DIALOG(select_orb_colors)
select_orb_colors::select_orb_colors()
: show_unmoved_(preferences::show_unmoved_orb())

View file

@ -256,7 +256,7 @@ public:
[f](int lhs, int rhs) { return f(lhs) < f(rhs); },
[f](int lhs, int rhs) { return f(lhs) > f(rhs); }
}});
};
}
enum SORT_ORDER {
SORT_NONE,

View file

@ -64,7 +64,7 @@ struct MLFixture
BOOST_GLOBAL_FIXTURE ( MLFixture );
BOOST_AUTO_TEST_SUITE ( test_map_location );
BOOST_AUTO_TEST_SUITE ( test_map_location )
//#define MAP_LOCATION_GET_OUTPUT

View file

@ -121,7 +121,7 @@ static ng::side_engine* create_side_engine(const config& defaults,
/* Tests */
BOOST_GLOBAL_FIXTURE( mp_connect_fixture );
BOOST_AUTO_TEST_SUITE( mp_connect );
BOOST_AUTO_TEST_SUITE( mp_connect )
BOOST_AUTO_TEST_CASE( flg_map_settings )

View file

@ -36,7 +36,7 @@ class unit_animation
(MISS, "miss")
(KILL, "kill")
(INVALID, "invalid")
);
)
static const std::vector<std::string>& all_tag_names();
static void fill_initial_animations( std::vector<unit_animation> & animations, const config & cfg);

View file

@ -31,7 +31,7 @@ name_generator_factory::name_generator_factory(const config& config, std::vector
std::string id = *it;
add_name_generator_from_config(config, id, (id + "_"));
}
};
}
void name_generator_factory::add_name_generator_from_config(const config& config, const std::string id, const std::string prefix) {
std::string cfg_name = prefix + "name_generator";
@ -53,7 +53,7 @@ void name_generator_factory::add_name_generator_from_config(const config& config
name_generators_[id] = std::shared_ptr<name_generator>(new markov_generator(utils::split(markov_name_list), config["markov_chain_size"].to_int(2), 12));
}
}
};
}
std::shared_ptr<name_generator> name_generator_factory::get_name_generator() {
std::map<std::string, std::shared_ptr<name_generator>>::const_iterator it = name_generators_.find("");
@ -63,7 +63,7 @@ std::shared_ptr<name_generator> name_generator_factory::get_name_generator() {
}
return it->second;
};
}
std::shared_ptr<name_generator> name_generator_factory::get_name_generator(const std::string id) {
std::map<std::string, std::shared_ptr<name_generator>>::const_iterator it = name_generators_.find(id);
@ -72,4 +72,4 @@ std::shared_ptr<name_generator> name_generator_factory::get_name_generator(const
}
return it->second;
};
}