Cleaned up remaining cases of spaced closing template brackets

src/ai/composite/value_translator.hpp

@@ -125,7 +125,7 @@ class leader_aspects_visitor : public boost::static_visitor<std::string> {
 };
 
 template<>
-class config_value_translator< boost::variant<bool, std::vector<std::string>> > {
+class config_value_translator< boost::variant<bool, std::vector<std::string>>> {
 public:
 
 	static boost::variant<bool, std::vector<std::string>> cfg_to_value(const config &cfg)

src/ai/registry.cpp

@@ -224,10 +224,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>>
@@ -295,10 +295,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>>
@@ -370,10 +370,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>>
@@ -450,7 +450,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");
 
 

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<std::vector<std::pair<int, std::string>> > log;
+	utils::optional<std::vector<std::pair<int, std::string>>> log;
 	/** Non-empty if --log-strict was given */
 	utils::optional<int> 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<std::vector<std::pair<unsigned int, std::string>> > multiplayer_ai_config;
+	utils::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. */
-	utils::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_algorithm;
+	utils::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. */
-	utils::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_controller;
+	utils::optional<std::vector<std::pair<unsigned int, std::string>>> multiplayer_controller;
 	/** Non-empty if --era was given on the command line. Dependent on --multiplayer. */
 	utils::optional<std::string> 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<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. */
-	utils::optional<std::vector<std::tuple<unsigned int, std::string, std::string>> > multiplayer_parm;
+	utils::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. */
 	utils::optional<unsigned int> multiplayer_repeat;
 	/** Non-empty if --scenario was given on the command line. Dependent on --multiplayer. */
 	utils::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. */
-	utils::optional<std::vector<std::pair<unsigned int, std::string>> > multiplayer_side;
+	utils::optional<std::vector<std::pair<unsigned int, std::string>>> multiplayer_side;
 	/** Non-empty if --turns was given on the command line. Dependent on --multiplayer. */
 	utils::optional<std::string> multiplayer_turns;
 	/** Max FPS specified by --max-fps option. */

src/editor/controller/editor_controller.hpp

@@ -241,7 +241,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 */

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<std::vector<help::item> > table_spec;
+typedef std::vector<std::vector<help::item>> 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

src/terrain/filter.hpp

@@ -96,7 +96,7 @@ class terrain_filter : public xy_pred {
 		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_;
 	};