Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp

src/linkgraph/demands.cpp

@@ -47,7 +47,7 @@ public:
 	 */
 	inline void SetDemandPerNode(uint num_demands)
 	{
-		this->demand_per_node = max(this->supply_sum / num_demands, 1U);
+		this->demand_per_node = std::max(this->supply_sum / num_demands, 1U);
 	}
 
 	/**
@@ -59,7 +59,7 @@ public:
 	 */
 	inline uint EffectiveSupply(const Node &from, const Node &to)
 	{
-		return max(from.Supply() * max(1U, to.Supply()) * this->mod_size / 100 / this->demand_per_node, 1U);
+		return std::max(from.Supply() * std::max(1U, to.Supply()) * this->mod_size / 100 / this->demand_per_node, 1U);
 	}
 
 	/**
@@ -161,7 +161,7 @@ public:
 	 */
 	inline void AdjustDemandNodes(LinkGraphJob &job, const std::vector<NodeID> &demands)
 	{
-		const uint count = min<uint>(demands.size(), this->missing_supply);
+		const uint count = std::min<uint>(demands.size(), this->missing_supply);
 		this->missing_supply = 0;
 		for (uint i = 0; i < count; i++) {
 			job[demands[i]].ReceiveDemand(1);
@@ -177,7 +177,7 @@ public:
 	 */
 	inline uint EffectiveSupply(const Node &from, const Node &to)
 	{
-		return max<int>(min<int>(from.Supply(), ((int) this->demand_per_node) - ((int) to.ReceivedDemand())), 1);
+		return std::max<int>(std::min<int>(from.Supply(), ((int) this->demand_per_node) - ((int) to.ReceivedDemand())), 1);
 	}
 
 	/**
@@ -213,7 +213,7 @@ void SymmetricScaler::SetDemands(LinkGraphJob &job, NodeID from_id, NodeID to_id
 		uint undelivered = job[to_id].UndeliveredSupply();
 		if (demand_back > undelivered) {
 			demand_back = undelivered;
-			demand_forw = max(1U, demand_back * 100 / this->mod_size);
+			demand_forw = std::max(1U, demand_back * 100 / this->mod_size);
 		}
 		this->Scaler::SetDemands(job, to_id, from_id, demand_back);
 	}
@@ -325,7 +325,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, const std::vector<bool> &re
 				demand_forw = 1;
 			}
 
-			demand_forw = min(demand_forw, job[from_id].UndeliveredSupply());
+			demand_forw = std::min(demand_forw, job[from_id].UndeliveredSupply());
 
 			scaler.SetDemands(job, from_id, to_id, demand_forw);
 
@@ -380,7 +380,7 @@ void DemandCalculator::CalcMinimisedDistanceDemand(LinkGraphJob &job, const std:
 		uint distance;
 	};
 	std::vector<EdgeCandidate> candidates;
-	candidates.reserve(supplies.size() * demands.size() - min(supplies.size(), demands.size()));
+	candidates.reserve(supplies.size() * demands.size() - std::min(supplies.size(), demands.size()));
 	for (NodeID from_id : supplies) {
 		for (NodeID to_id : demands) {
 			if (from_id != to_id) {
@@ -395,7 +395,7 @@ void DemandCalculator::CalcMinimisedDistanceDemand(LinkGraphJob &job, const std:
 		if (job[candidate.from_id].UndeliveredSupply() == 0) continue;
 		if (!scaler.HasDemandLeft(job[candidate.to_id])) continue;
 
-		scaler.SetDemands(job, candidate.from_id, candidate.to_id, min(job[candidate.from_id].UndeliveredSupply(), scaler.EffectiveSupply(job[candidate.from_id], job[candidate.to_id])));
+		scaler.SetDemands(job, candidate.from_id, candidate.to_id, std::min(job[candidate.from_id].UndeliveredSupply(), scaler.EffectiveSupply(job[candidate.from_id], job[candidate.to_id])));
 	}
 }