Formatting cleanup: > > to '>>`

Allowed since C++11. Might as well use it everywhere.

src/actions/vision.cpp

@@ -649,7 +649,7 @@ game_events::pump_result_t actor_sighted(const unit & target, const std::vector<
 		needs_event[i] = needs_event[i] && target.is_visible_to_team(teams[i], *resources::gameboard, false);
 
 	// Cache "jamming".
-	std::vector< std::map<map_location, int> > jamming_cache(teams_size);
+	std::vector< std::map<map_location, int>> jamming_cache(teams_size);
 	for ( size_t i = 0; i != teams_size; ++i )
 		if ( needs_event[i] )
 			create_jamming_map(jamming_cache[i], teams[i]);

src/addon/manager.cpp

@@ -182,7 +182,7 @@ static std::string strip_cr(std::string str, bool strip)
 }
 
 namespace {
-	void append_default_ignore_patterns(std::pair<std::vector<std::string>, std::vector<std::string> >& patterns)
+	void append_default_ignore_patterns(std::pair<std::vector<std::string>, std::vector<std::string>>& patterns)
 	{
 		std::vector<std::string>& files = patterns.first;
 		std::vector<std::string>& dirs  = patterns.second;
@@ -224,12 +224,12 @@ namespace {
     }
 }
 
-static std::pair<std::vector<std::string>, std::vector<std::string> > read_ignore_patterns(const std::string& addon_name)
+static std::pair<std::vector<std::string>, std::vector<std::string>> read_ignore_patterns(const std::string& addon_name)
 {
 	const std::string parentd = filesystem::get_addons_dir();
 	const std::string ign_file = parentd + "/" + addon_name + "/_server.ign";
 
-	std::pair<std::vector<std::string>, std::vector<std::string> > patterns;
+	std::pair<std::vector<std::string>, std::vector<std::string>> patterns;
 	LOG_CFG << "searching for .ign file for '" << addon_name << "'...\n";
 	if (!filesystem::file_exists(ign_file)) {
 		LOG_CFG << "no .ign file found for '" << addon_name << "'\n"
@@ -261,7 +261,7 @@ static void archive_file(const std::string& path, const std::string& fname, conf
 	cfg["contents"] = encode_binary(strip_cr(filesystem::read_file(path + '/' + fname),is_cfg));
 }
 
-static void archive_dir(const std::string& path, const std::string& dirname, config& cfg, std::pair<std::vector<std::string>, std::vector<std::string> >& ignore_patterns)
+static void archive_dir(const std::string& path, const std::string& dirname, config& cfg, std::pair<std::vector<std::string>, std::vector<std::string>>& ignore_patterns)
 {
 	cfg["name"] = dirname;
 	const std::string dir = path + '/' + dirname;
@@ -299,7 +299,7 @@ void archive_addon(const std::string& addon_name, config& cfg)
 {
 	const std::string parentd = filesystem::get_addons_dir();
 
-	std::pair<std::vector<std::string>, std::vector<std::string> > ignore_patterns;
+	std::pair<std::vector<std::string>, std::vector<std::string>> ignore_patterns;
 	ignore_patterns = read_ignore_patterns(addon_name);
 	archive_dir(parentd, addon_name, cfg.add_child("dir"), ignore_patterns);
 }

src/ai/composite/aspect.hpp

@@ -187,7 +187,7 @@ class typesafe_aspect : public aspect {
 protected:
 	mutable std::shared_ptr<T> value_;
 	mutable std::shared_ptr<wfl::variant> value_variant_;
-	mutable std::shared_ptr< lua_object<T> > value_lua_;
+	mutable std::shared_ptr< lua_object<T>> value_lua_;
 };
 
 
@@ -218,14 +218,14 @@ class composite_aspect;
 template<typename T>
 class typesafe_known_aspect : public known_aspect {
 public:
-	typesafe_known_aspect(const std::string &name, std::shared_ptr< typesafe_aspect<T> > &where, aspect_map &aspects)
+	typesafe_known_aspect(const std::string &name, std::shared_ptr< typesafe_aspect<T>> &where, aspect_map &aspects)
 	: known_aspect(name), where_(where), aspects_(aspects)
 	{
 	}
 
 	void set(aspect_ptr a)
 	{
-		std::shared_ptr< typesafe_aspect <T> > c = std::dynamic_pointer_cast< typesafe_aspect<T> >(a);
+		std::shared_ptr< typesafe_aspect <T>> c = std::dynamic_pointer_cast< typesafe_aspect<T>>(a);
 		if (c) {
 			assert (c->get_id()== this->get_name());
 			where_ = c;
@@ -237,7 +237,7 @@ class typesafe_known_aspect : public known_aspect {
 
 	virtual void add_facet(const config &cfg)
 	{
-		std::shared_ptr< composite_aspect <T> > c = std::dynamic_pointer_cast< composite_aspect<T> >(where_);
+		std::shared_ptr< composite_aspect <T>> c = std::dynamic_pointer_cast< composite_aspect<T>>(where_);
 		if (c) {
 			assert (c->get_id()==this->get_name());
 			c->add_facet(-1, cfg);
@@ -248,7 +248,7 @@ class typesafe_known_aspect : public known_aspect {
 	}
 
 protected:
-	std::shared_ptr<typesafe_aspect <T> > &where_;
+	std::shared_ptr<typesafe_aspect <T>> &where_;
 	aspect_map &aspects_;
 
 };
@@ -274,7 +274,7 @@ class composite_aspect : public typesafe_aspect<T> {
 			std::vector< aspect_ptr > default_aspects;
 			engine::parse_aspect_from_config(*this,_default,parent_id_,std::back_inserter(default_aspects));
 			if (!default_aspects.empty()) {
-				typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T> >(default_aspects.front());
+				typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T>>(default_aspects.front());
 				if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
 					c->parent_id_ = parent_id_;
 				}
@@ -295,7 +295,7 @@ class composite_aspect : public typesafe_aspect<T> {
 		std::vector<aspect_ptr> facets_base;
 		engine::parse_aspect_from_config(*this,cfg,parent_id_,std::back_inserter(facets_base));
 		for (aspect_ptr a : facets_base) {
-			typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T> > (a);
+			typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T>> (a);
 			if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
 				c->parent_id_ = parent_id_;
 			}
@@ -344,7 +344,7 @@ class composite_aspect : public typesafe_aspect<T> {
 		engine::parse_aspect_from_config(*this,cfg,parent_id_,std::back_inserter(facets));
 		int j=0;
 		for (aspect_ptr a : facets) {
-			typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T> > (a);
+			typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T>> (a);
 			if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
 				c->parent_id_ = parent_id_;
 			}

src/ai/composite/engine.cpp

@@ -48,7 +48,7 @@ bool engine::is_ok() const
 	return true;
 }
 
-void engine::parse_aspect_from_config( readonly_context &context, const config &cfg, const std::string &id, std::back_insert_iterator< std::vector< aspect_ptr > > b )
+void engine::parse_aspect_from_config( readonly_context &context, const config &cfg, const std::string &id, std::back_insert_iterator< std::vector< aspect_ptr >> b )
 {
 	engine_ptr eng = context.get_engine_by_cfg(cfg);
 	if (eng){
@@ -57,7 +57,7 @@ void engine::parse_aspect_from_config( readonly_context &context, const config &
 	}
 }
 
-void engine::parse_candidate_action_from_config( rca_context &context, const config &cfg, std::back_insert_iterator<std::vector< candidate_action_ptr > > b )
+void engine::parse_candidate_action_from_config( rca_context &context, const config &cfg, std::back_insert_iterator<std::vector< candidate_action_ptr >> b )
 {
 	engine_ptr eng = context.get_engine_by_cfg(cfg);
 	if (eng){
@@ -66,7 +66,7 @@ void engine::parse_candidate_action_from_config( rca_context &context, const con
 	}
 }
 
-void engine::parse_engine_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< engine_ptr > > b )
+void engine::parse_engine_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< engine_ptr >> b )
 {
 	engine_ptr eng = context.get_engine_by_cfg(cfg);
 	if (eng){
@@ -76,7 +76,7 @@ void engine::parse_engine_from_config( readonly_context &context, const config &
 }
 
 
-void engine::parse_goal_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< goal_ptr > > b )
+void engine::parse_goal_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< goal_ptr >> b )
 {
 	engine_ptr eng = context.get_engine_by_cfg(cfg);
 	if (eng){
@@ -86,7 +86,7 @@ void engine::parse_goal_from_config( readonly_context &context, const config &cf
 }
 
 
-void engine::parse_stage_from_config( ai_context &context, const config &cfg, std::back_insert_iterator<std::vector< stage_ptr > > b )
+void engine::parse_stage_from_config( ai_context &context, const config &cfg, std::back_insert_iterator<std::vector< stage_ptr >> b )
 {
 	engine_ptr eng = context.get_engine_by_cfg(cfg);
 	if (eng){
@@ -95,27 +95,27 @@ void engine::parse_stage_from_config( ai_context &context, const config &cfg, st
 	}
 }
 
-void engine::do_parse_aspect_from_config( const config &/*cfg*/, const std::string &/*id*/, std::back_insert_iterator< std::vector<aspect_ptr> > /*b*/ )
+void engine::do_parse_aspect_from_config( const config &/*cfg*/, const std::string &/*id*/, std::back_insert_iterator< std::vector<aspect_ptr>> /*b*/ )
 {
 
 }
 
 
-void engine::do_parse_candidate_action_from_config( rca_context &/*context*/, const config &/*cfg*/, std::back_insert_iterator<std::vector< candidate_action_ptr > > /*b*/ ){
+void engine::do_parse_candidate_action_from_config( rca_context &/*context*/, const config &/*cfg*/, std::back_insert_iterator<std::vector< candidate_action_ptr >> /*b*/ ){
 
 }
 
-void engine::do_parse_engine_from_config( const config &/*cfg*/, std::back_insert_iterator<std::vector< engine_ptr > > /*b*/ ){
+void engine::do_parse_engine_from_config( const config &/*cfg*/, std::back_insert_iterator<std::vector< engine_ptr >> /*b*/ ){
 
 }
 
 
-void engine::do_parse_goal_from_config( const config &/*cfg*/, std::back_insert_iterator<std::vector< goal_ptr > > /*b*/ ){
+void engine::do_parse_goal_from_config( const config &/*cfg*/, std::back_insert_iterator<std::vector< goal_ptr >> /*b*/ ){
 
 }
 
 
-void engine::do_parse_stage_from_config( ai_context &/*context*/, const config &/*cfg*/, std::back_insert_iterator<std::vector< stage_ptr > > /*b*/ )
+void engine::do_parse_stage_from_config( ai_context &/*context*/, const config &/*cfg*/, std::back_insert_iterator<std::vector< stage_ptr >> /*b*/ )
 {
 
 }

src/ai/composite/engine.hpp

@@ -43,37 +43,37 @@ class engine : public component {
 
 	virtual bool is_ok() const;
 
-	static void parse_aspect_from_config( readonly_context &context, const config &cfg, const std::string &id, std::back_insert_iterator<std::vector< aspect_ptr > > b );
+	static void parse_aspect_from_config( readonly_context &context, const config &cfg, const std::string &id, std::back_insert_iterator<std::vector< aspect_ptr >> b );
 
 
-	static void parse_goal_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< goal_ptr > > b );
+	static void parse_goal_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< goal_ptr >> b );
 
 
-	static void parse_candidate_action_from_config( rca_context &context, const config &cfg, std::back_insert_iterator<std::vector< candidate_action_ptr > > b );
+	static void parse_candidate_action_from_config( rca_context &context, const config &cfg, std::back_insert_iterator<std::vector< candidate_action_ptr >> b );
 
 
-	static void parse_engine_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< engine_ptr > > b );
+	static void parse_engine_from_config( readonly_context &context, const config &cfg, std::back_insert_iterator<std::vector< engine_ptr >> b );
 
 
-	static void parse_stage_from_config( ai_context &context, const config &cfg, std::back_insert_iterator<std::vector< stage_ptr > > b );
+	static void parse_stage_from_config( ai_context &context, const config &cfg, std::back_insert_iterator<std::vector< stage_ptr >> b );
 
 
 	//do not override that method in subclasses which cannot create aspects
-	virtual void do_parse_aspect_from_config( const config &cfg, const std::string &id, std::back_insert_iterator< std::vector< aspect_ptr> > b );
+	virtual void do_parse_aspect_from_config( const config &cfg, const std::string &id, std::back_insert_iterator< std::vector< aspect_ptr>> b );
 
 
 	//do not override that method in subclasses which cannot create candidate_actions
-	virtual void do_parse_candidate_action_from_config( rca_context &context, const config &cfg, std::back_insert_iterator<std::vector< candidate_action_ptr > > b );
+	virtual void do_parse_candidate_action_from_config( rca_context &context, const config &cfg, std::back_insert_iterator<std::vector< candidate_action_ptr >> b );
 
 	//do not override that method in subclasses which cannot create goals
-	virtual void do_parse_goal_from_config( const config &cfg, std::back_insert_iterator<std::vector< goal_ptr > > b );
+	virtual void do_parse_goal_from_config( const config &cfg, std::back_insert_iterator<std::vector< goal_ptr >> b );
 
 	//do not override that method in subclasses which cannot create engines
-	virtual void do_parse_engine_from_config( const config &cfg, std::back_insert_iterator<std::vector< engine_ptr > > b );
+	virtual void do_parse_engine_from_config( const config &cfg, std::back_insert_iterator<std::vector< engine_ptr >> b );
 
 
 	//do not override that method in subclasses which cannot create stages
-	virtual void do_parse_stage_from_config( ai_context &context, const config &cfg, std::back_insert_iterator<std::vector< stage_ptr > > b );
+	virtual void do_parse_stage_from_config( ai_context &context, const config &cfg, std::back_insert_iterator<std::vector< stage_ptr >> b );
 
 	//do not override that method in subclasses which cannot evaluate formulas
 	virtual std::string evaluate(const std::string& str);

src/ai/composite/goal.cpp

@@ -75,7 +75,7 @@ goal::~goal()
 }
 
 
-void goal::add_targets(std::back_insert_iterator< std::vector< target > > /*target_list*/)
+void goal::add_targets(std::back_insert_iterator< std::vector< target >> /*target_list*/)
 {
 }
 
@@ -135,7 +135,7 @@ void target_unit_goal::on_create()
 	}
 }
 
-void target_unit_goal::add_targets(std::back_insert_iterator< std::vector< target > > target_list)
+void target_unit_goal::add_targets(std::back_insert_iterator< std::vector< target >> target_list)
 {
 	if (!(this)->active()) {
 		return;
@@ -181,7 +181,7 @@ void target_location_goal::on_create()
 	}
 }
 
-void target_location_goal::add_targets(std::back_insert_iterator< std::vector< target > > target_list)
+void target_location_goal::add_targets(std::back_insert_iterator< std::vector< target >> target_list)
 {
 	if (!(this)->active()) {
 		return;
@@ -235,7 +235,7 @@ void protect_goal::on_create()
 }
 
 
-void protect_goal::add_targets(std::back_insert_iterator< std::vector< target > > target_list)
+void protect_goal::add_targets(std::back_insert_iterator< std::vector< target >> target_list)
 {
 	std::string goal_type;
 	if (protect_unit_) {
@@ -323,7 +323,7 @@ void lua_goal::on_create(std::shared_ptr<ai::lua_ai_context> l_ctx)
 	handler_.reset(resources::lua_kernel->create_lua_ai_action_handler(code_.c_str(), *l_ctx));
 }
 
-void lua_goal::add_targets(std::back_insert_iterator< std::vector< target > > target_list)
+void lua_goal::add_targets(std::back_insert_iterator< std::vector< target >> target_list)
 {
 	std::shared_ptr<lua_object<std::vector<target>>> l_obj = std::make_shared<lua_object<std::vector<target>>>();
 	config c(cfg_.child_or_empty("args"));

src/ai/composite/goal.hpp

@@ -53,7 +53,7 @@ class goal : public readonly_context_proxy, public component {
 	virtual ~goal();
 
 
-	virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
+	virtual void add_targets(std::back_insert_iterator< std::vector< target >> target_list);
 
 
 	virtual config to_config() const;
@@ -86,7 +86,7 @@ class target_unit_goal : public goal {
 	target_unit_goal(readonly_context &context, const config &cfg);
 
 
-	virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
+	virtual void add_targets(std::back_insert_iterator< std::vector< target >> target_list);
 
 
 	virtual void on_create();
@@ -105,7 +105,7 @@ class target_location_goal : public goal {
 	target_location_goal(readonly_context &context, const config &cfg);
 
 
-	virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
+	virtual void add_targets(std::back_insert_iterator< std::vector< target >> target_list);
 
 
 	virtual void on_create();
@@ -125,7 +125,7 @@ class protect_goal : public goal {
 	protect_goal(readonly_context &context, const config &cfg, bool protect_unit);
 
 
-	virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
+	virtual void add_targets(std::back_insert_iterator< std::vector< target >> target_list);
 
 
 	virtual void on_create();
@@ -164,7 +164,7 @@ class protect_unit_goal : public protect_goal {
 class lua_goal : public goal {
 public:
 	lua_goal(readonly_context& context, const config& cfg);
-	virtual void add_targets(std::back_insert_iterator< std::vector< target > > target_list);
+	virtual void add_targets(std::back_insert_iterator< std::vector< target >> target_list);
 	void on_create(std::shared_ptr<ai::lua_ai_context>);
 
 private:

src/ai/composite/property_handler.hpp

@@ -74,7 +74,7 @@ template<typename T>
 class vector_property_handler : public base_property_handler {
 public:
 	typedef std::shared_ptr<T> ptr;
-	typedef std::vector< std::shared_ptr<T> > ptr_vector;
+	typedef std::vector< std::shared_ptr<T>> ptr_vector;
 
 	vector_property_handler(const std::string &property, ptr_vector &values, std::function<void(ptr_vector&, const config&)> &construction_factory)
 		: factory_(construction_factory), property_(property), values_(values){}

src/ai/composite/value_translator.hpp

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

src/ai/configuration.cpp

@@ -282,7 +282,7 @@ void configuration::expand_simplified_aspects(side_number side, config &cfg) {
 				lg::wml_error() << "side " << side << " has two [ai] tags with contradictory ai_algorithm - the first one will take precedence.\n";
 			}
 		}
-		std::deque<std::pair<std::string, config> > facet_configs;
+		std::deque<std::pair<std::string, config>> facet_configs;
 		for (const config::attribute &attr : aiparam.attribute_range()) {
 			if (non_aspect_attributes.count(attr.first)) {
 				continue;

src/ai/contexts.cpp

@@ -174,9 +174,9 @@ synced_command_result_ptr readonly_context_impl::check_synced_command_action(con
 
 
 template<typename T>
-void readonly_context_impl::add_known_aspect(const std::string &name, std::shared_ptr< typesafe_aspect <T> > &where)
+void readonly_context_impl::add_known_aspect(const std::string &name, std::shared_ptr< typesafe_aspect <T>> &where)
 {
-	std::shared_ptr< typesafe_known_aspect <T> > ka_ptr(new typesafe_known_aspect<T>(name,where,aspects_));
+	std::shared_ptr< typesafe_known_aspect <T>> ka_ptr(new typesafe_known_aspect<T>(name,where,aspects_));
 	known_aspects_.emplace(name,ka_ptr);
 }