diff --git a/src/ai/composite/value_translator.hpp b/src/ai/composite/value_translator.hpp index d35a3a7d112c..57ec5fadc752 100644 --- a/src/ai/composite/value_translator.hpp +++ b/src/ai/composite/value_translator.hpp @@ -125,7 +125,7 @@ class leader_aspects_visitor : public boost::static_visitor { }; template<> -class config_value_translator< boost::variant> > { +class config_value_translator< boost::variant>> { public: static boost::variant> cfg_to_value(const config &cfg) diff --git a/src/ai/registry.cpp b/src/ai/registry.cpp index 444ca732422d..80c76983a99d 100644 --- a/src/ai/registry.cpp +++ b/src/ai/registry.cpp @@ -224,10 +224,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> @@ -295,10 +295,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> @@ -370,10 +370,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> @@ -450,7 +450,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 66fe53b55098..040fff21c0a7 100644 --- a/src/commandline_options.hpp +++ b/src/commandline_options.hpp @@ -98,7 +98,7 @@ class commandline_options * Contains parsed arguments of --log-* (e.g. --log-debug). * Vector of pairs (severity, log domain). */ - utils::optional> > log; + utils::optional>> log; /** Non-empty if --log-strict was given */ utils::optional log_strict_level; /** Non-empty if --load was given on the command line. Savegame specified to load after start. */ @@ -110,11 +110,11 @@ class commandline_options /** 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. */ - utils::optional> > multiplayer_ai_config; + utils::optional>> multiplayer_ai_config; /** Non-empty if --algorithm was given on the command line. Vector of pairs (side number, value). Dependent on --multiplayer. */ - utils::optional> > multiplayer_algorithm; + utils::optional>> multiplayer_algorithm; /** Non-empty if --controller was given on the command line. Vector of pairs (side number, controller). Dependent on --multiplayer. */ - utils::optional> > multiplayer_controller; + utils::optional>> multiplayer_controller; /** Non-empty if --era was given on the command line. Dependent on --multiplayer. */ utils::optional multiplayer_era; /** True if --exit-at-and was given on the command line. Dependent on --multiplayer. */ @@ -124,13 +124,13 @@ class commandline_options /** Non-empty if --label was given on the command line. Dependent on --multiplayer. */ utils::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. */ - utils::optional> > multiplayer_parm; + utils::optional>> multiplayer_parm; /** Repeats specified by --multiplayer-repeat option. Repeats a multiplayer game after it is finished. Dependent on --multiplayer. */ utils::optional multiplayer_repeat; /** Non-empty if --scenario was given on the command line. Dependent on --multiplayer. */ utils::optional multiplayer_scenario; /** Non-empty if --side was given on the command line. Vector of pairs (side number, faction id). Dependent on --multiplayer. */ - utils::optional> > multiplayer_side; + utils::optional>> multiplayer_side; /** Non-empty if --turns was given on the command line. Dependent on --multiplayer. */ utils::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 71231d426fa8..88db369b241c 100644 --- a/src/editor/controller/editor_controller.hpp +++ b/src/editor/controller/editor_controller.hpp @@ -241,7 +241,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/help/help_impl.hpp b/src/help/help_impl.hpp index c62438c1b132..c15309988bf1 100644 --- a/src/help/help_impl.hpp +++ b/src/help/help_impl.hpp @@ -407,7 +407,7 @@ inline std::string bold(const std::string &s) // A string to be displayed and its width. typedef std::pair< std::string, unsigned > item; -typedef std::vector > table_spec; +typedef std::vector> table_spec; // Create a table using the table specs. Return markup with jumps // that create a table. The table spec contains a vector with // vectors with pairs. The pairs are the markup string that should diff --git a/src/terrain/filter.hpp b/src/terrain/filter.hpp index 9b8bf99189d3..8956b3007576 100644 --- a/src/terrain/filter.hpp +++ b/src/terrain/filter.hpp @@ -96,7 +96,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_; };