diff --git a/src/ai/registry.cpp b/src/ai/registry.cpp index cb925b605885..5e37220ce9aa 100644 --- a/src/ai/registry.cpp +++ b/src/ai/registry.cpp @@ -227,10 +227,10 @@ static register_aspect_factory< composite_aspect> static register_aspect_factory< composite_aspect> recruitment_instructions__composite_aspect_factory("recruitment_instructions*composite_aspect"); -static register_aspect_factory< composite_aspect< std::vector> > +static register_aspect_factory< composite_aspect< std::vector>> recruitment_more__composite_aspect_factory("recruitment_more*composite_aspect"); -static register_aspect_factory< composite_aspect< std::vector> > +static register_aspect_factory< composite_aspect< std::vector>> recruitment_pattern__composite_aspect_factory("recruitment_pattern*composite_aspect"); static register_aspect_factory< composite_aspect> @@ -301,10 +301,10 @@ static register_aspect_factory< standard_aspect> 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> > +static register_aspect_factory< standard_aspect< std::vector>> recruitment_more__standard_aspect_factory("recruitment_more*standard_aspect"); -static register_aspect_factory< standard_aspect< std::vector> > +static register_aspect_factory< standard_aspect< std::vector>> recruitment_pattern__standard_aspect_factory("recruitment_pattern*standard_aspect"); static register_aspect_factory< standard_aspect> @@ -379,10 +379,10 @@ static register_aspect_factory< standard_aspect> static register_aspect_factory< default_recruitment::recruitment_aspect > recruitment_instructions__standard_aspect_factory2("recruitment_instructions*"); -static register_aspect_factory< standard_aspect< std::vector> > +static register_aspect_factory< standard_aspect< std::vector>> recruitment_more__standard_aspect_factory2("recruitment_more*"); -static register_aspect_factory< standard_aspect< std::vector> > +static register_aspect_factory< standard_aspect< std::vector>> recruitment_pattern__standard_aspect_factory2("recruitment_pattern*"); static register_aspect_factory< standard_aspect> @@ -462,7 +462,7 @@ static register_lua_aspect_factory< lua_aspect> static register_lua_aspect_factory< lua_aspect> villages_per_scout__lua_aspect_factory("villages_per_scout*lua_aspect"); -static register_lua_aspect_factory< lua_aspect< std::vector> > +static register_lua_aspect_factory< lua_aspect< std::vector>> recruitment_pattern__lua_aspect_factory("recruitment_pattern*lua_aspect"); diff --git a/src/commandline_options.hpp b/src/commandline_options.hpp index 03badf1cc633..01054db0367d 100644 --- a/src/commandline_options.hpp +++ b/src/commandline_options.hpp @@ -90,7 +90,7 @@ friend std::ostream& operator<<(std::ostream &os, const commandline_options& cmd boost::optional language; /// Contains parsed arguments of --log-* (e.g. --log-debug). /// Vector of pairs (severity, log domain). - boost::optional> > log; + boost::optional>> log; /// Non-empty if --log-strict was given boost::optional log_strict_level; /// Non-empty if --load was given on the command line. Savegame specified to load after start. @@ -102,11 +102,11 @@ friend std::ostream& operator<<(std::ostream &os, const commandline_options& cmd /// 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> > multiplayer_ai_config; + boost::optional>> multiplayer_ai_config; /// Non-empty if --algorithm was given on the command line. Vector of pairs (side number, value). Dependent on --multiplayer. - boost::optional> > multiplayer_algorithm; + boost::optional>> multiplayer_algorithm; /// Non-empty if --controller was given on the command line. Vector of pairs (side number, controller). Dependent on --multiplayer. - boost::optional> > multiplayer_controller; + boost::optional>> multiplayer_controller; /// Non-empty if --era was given on the command line. Dependent on --multiplayer. boost::optional multiplayer_era; /// True if --exit-at-and was given on the command line. Dependent on --multiplayer. @@ -116,13 +116,13 @@ friend std::ostream& operator<<(std::ostream &os, const commandline_options& cmd /// Non-empty if --label was given on the command line. Dependent on --multiplayer. boost::optional 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> > multiplayer_parm; + boost::optional>> multiplayer_parm; /// Repeats specified by --multiplayer-repeat option. Repeats a multiplayer game after it is finished. Dependent on --multiplayer. boost::optional multiplayer_repeat; /// Non-empty if --scenario was given on the command line. Dependent on --multiplayer. boost::optional multiplayer_scenario; /// Non-empty if --side was given on the command line. Vector of pairs (side number, faction id). Dependent on --multiplayer. - boost::optional> > multiplayer_side; + boost::optional>> multiplayer_side; /// Non-empty if --turns was given on the command line. Dependent on --multiplayer. boost::optional multiplayer_turns; /// Max FPS specified by --max-fps option. diff --git a/src/editor/controller/editor_controller.hpp b/src/editor/controller/editor_controller.hpp index c263b3e7dae5..6f4ddeb15f12 100644 --- a/src/editor/controller/editor_controller.hpp +++ b/src/editor/controller/editor_controller.hpp @@ -244,7 +244,7 @@ class editor_controller : public controller_base, const std::unique_ptr gui_; /** Pre-defined time of day lighting settings for the settings dialog */ - typedef std::map> > tods_map; + typedef std::map>> tods_map; tods_map tods_; /* managers */ diff --git a/src/server/server.cpp b/src/server/server.cpp index a3f30975f26f..3b387e2b7739 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -1670,7 +1670,7 @@ void server::handle_player_in_game(socket_ptr socket, std::shared_ptr> > SendQueue; +typedef std::map>> SendQueue; SendQueue send_queue; void handle_send_to_player(socket_ptr socket); diff --git a/src/terrain/filter.hpp b/src/terrain/filter.hpp index 7d8382f8c754..011c218133dd 100644 --- a/src/terrain/filter.hpp +++ b/src/terrain/filter.hpp @@ -88,7 +88,7 @@ class terrain_filter : public xy_pred { std::unique_ptr>> adjacent_matches; //adjacent_match_cache: optimize handling of [filter_adjacent_location] for match() - std::vector< std::pair> > adjacent_match_cache; + std::vector< std::pair>> adjacent_match_cache; std::unique_ptr ufilter_; };