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

Formatting cleanup: convert remaining cases of > > to >>

Browse source
This commit is contained in:
Charles Dang 2018-05-14 00:09:23 +11:00
parent 2c57dc3705
commit 0d15c1e19e
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ai/registry.cpp
View file

@ -227,10 +227,10 @@ static register_aspect_factory< composite_aspect<double>>
static register_aspect_factory< composite_aspect<config>>
recruitment_instructions__composite_aspect_factory("recruitment_instructions*composite_aspect");
static register_aspect_factory< composite_aspect< std::vector<std::string>> >
static register_aspect_factory< composite_aspect< std::vector<std::string>>>
recruitment_more__composite_aspect_factory("recruitment_more*composite_aspect");
static register_aspect_factory< composite_aspect< std::vector<std::string>> >
static register_aspect_factory< composite_aspect< std::vector<std::string>>>
recruitment_pattern__composite_aspect_factory("recruitment_pattern*composite_aspect");
static register_aspect_factory< composite_aspect<int>>
@ -301,10 +301,10 @@ static register_aspect_factory< standard_aspect<double>>
static register_aspect_factory< default_recruitment::recruitment_aspect >
recruitment_instructions__standard_aspect_factory("recruitment_instructions*standard_aspect");
static register_aspect_factory< standard_aspect< std::vector<std::string>> >
static register_aspect_factory< standard_aspect< std::vector<std::string>>>
recruitment_more__standard_aspect_factory("recruitment_more*standard_aspect");
static register_aspect_factory< standard_aspect< std::vector<std::string>> >
static register_aspect_factory< standard_aspect< std::vector<std::string>>>
recruitment_pattern__standard_aspect_factory("recruitment_pattern*standard_aspect");
static register_aspect_factory< standard_aspect<int>>
@ -379,10 +379,10 @@ static register_aspect_factory< standard_aspect<double>>
static register_aspect_factory< default_recruitment::recruitment_aspect >
recruitment_instructions__standard_aspect_factory2("recruitment_instructions*");
static register_aspect_factory< standard_aspect< std::vector<std::string>> >
static register_aspect_factory< standard_aspect< std::vector<std::string>>>
recruitment_more__standard_aspect_factory2("recruitment_more*");
static register_aspect_factory< standard_aspect< std::vector<std::string>> >
static register_aspect_factory< standard_aspect< std::vector<std::string>>>
recruitment_pattern__standard_aspect_factory2("recruitment_pattern*");
static register_aspect_factory< standard_aspect<int>>
@ -462,7 +462,7 @@ static register_lua_aspect_factory< lua_aspect<double>>
static register_lua_aspect_factory< lua_aspect<int>>
villages_per_scout__lua_aspect_factory("villages_per_scout*lua_aspect");
static register_lua_aspect_factory< lua_aspect< std::vector<std::string>> >
static register_lua_aspect_factory< lua_aspect< std::vector<std::string>>>
recruitment_pattern__lua_aspect_factory("recruitment_pattern*lua_aspect");

12
src/commandline_options.hpp
View file

@ -90,7 +90,7 @@ public:
boost::optional<std::string> language;
/// Contains parsed arguments of --log-* (e.g. --log-debug).
/// Vector of pairs (severity, log domain).
boost::optional<std::vector<std::pair<int, std::string>> > log;
boost::optional<std::vector<std::pair<int, std::string>>> log;
/// Non-empty if --log-strict was given
boost::optional<int> log_strict_level;
/// Non-empty if --load was given on the command line. Savegame specified to load after start.
@ -102,11 +102,11 @@ public:
/// True if --multiplayer was given on the command line. Goes directly into multiplayer mode.
bool multiplayer;
/// Non-empty if --ai-config was given on the command line. Vector of pairs (side number, value). Dependent on --multiplayer.
boost::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_ai_config;
boost::optional<std::vector<std::pair<unsigned int, std::string>>> multiplayer_ai_config;
/// Non-empty if --algorithm was given on the command line. Vector of pairs (side number, value). Dependent on --multiplayer.
boost::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_algorithm;
boost::optional<std::vector<std::pair<unsigned int, std::string>>> multiplayer_algorithm;
/// Non-empty if --controller was given on the command line. Vector of pairs (side number, controller). Dependent on --multiplayer.
boost::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_controller;
boost::optional<std::vector<std::pair<unsigned int, std::string>>> multiplayer_controller;
/// Non-empty if --era was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_era;
/// True if --exit-at-and was given on the command line. Dependent on --multiplayer.
@ -116,13 +116,13 @@ public:
/// Non-empty if --label was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_label;
/// Non-empty if --parm was given on the command line. Vector of pairs (side number, parm name, parm value). Dependent on --multiplayer.
boost::optional<std::vector<std::tuple<unsigned int, std::string, std::string>> > multiplayer_parm;
boost::optional<std::vector<std::tuple<unsigned int, std::string, std::string>>> multiplayer_parm;
/// Repeats specified by --multiplayer-repeat option. Repeats a multiplayer game after it is finished. Dependent on --multiplayer.
boost::optional<unsigned int> multiplayer_repeat;
/// Non-empty if --scenario was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_scenario;
/// Non-empty if --side was given on the command line. Vector of pairs (side number, faction id). Dependent on --multiplayer.
boost::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_side;
boost::optional<std::vector<std::pair<unsigned int, std::string>>> multiplayer_side;
/// Non-empty if --turns was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_turns;
/// Max FPS specified by --max-fps option.

2
src/editor/controller/editor_controller.hpp
View file

@ -244,7 +244,7 @@ class editor_controller : public controller_base,
const std::unique_ptr<editor_display> gui_;
/** Pre-defined time of day lighting settings for the settings dialog */
typedef std::map<std::string, std::pair<std::string ,std::vector<time_of_day>> > tods_map;
typedef std::map<std::string, std::pair<std::string ,std::vector<time_of_day>>> tods_map;
tods_map tods_;
/* managers */

2
src/server/server.cpp
View file

@ -1670,7 +1670,7 @@ void server::handle_player_in_game(socket_ptr socket, std::shared_ptr<simple_wml
<< g.name() << "\" (" << g.id() << ")\n" << data.output();
}
typedef std::map<socket_ptr, std::deque<std::shared_ptr<simple_wml::document>> > SendQueue;
typedef std::map<socket_ptr, std::deque<std::shared_ptr<simple_wml::document>>> SendQueue;
SendQueue send_queue;
void handle_send_to_player(socket_ptr socket);

2
src/terrain/filter.hpp
View file

@ -88,7 +88,7 @@ private:
std::unique_ptr<std::vector<std::set<map_location>>> adjacent_matches;
//adjacent_match_cache: optimize handling of [filter_adjacent_location] for match()
std::vector< std::pair<terrain_filter, std::map<map_location,bool>> > adjacent_match_cache;
std::vector< std::pair<terrain_filter, std::map<map_location,bool>>> adjacent_match_cache;
std::unique_ptr<unit_filter> ufilter_;
};