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/core/geometry_func.cpp

@@ -22,8 +22,8 @@
 Dimension maxdim(const Dimension &d1, const Dimension &d2)
 {
 	Dimension d;
-	d.width  = max(d1.width,  d2.width);
-	d.height = max(d1.height, d2.height);
+	d.width  = std::max(d1.width,  d2.width);
+	d.height = std::max(d1.height, d2.height);
 	return d;
 }
 

src/core/kdtree.hpp

@@ -12,7 +12,6 @@
 
 #include "../stdafx.h"
 #include <vector>
-#include <algorithm>
 #include <limits>
 
 /**
@@ -261,7 +260,7 @@ class Kdtree {
 			best = SelectNearestNodeDistance(best, this->FindNearestRecursive(xy, next, level + 1));
 		}
 
-		limit = min(best.second, limit);
+		limit = std::min(best.second, limit);
 
 		/* Check if the distance from current best is worse than distance from target to splitting line,
 		 * if it is we also need to check the other side of the split. */

src/core/math_func.hpp

@@ -10,66 +10,6 @@
 #ifndef MATH_FUNC_HPP
 #define MATH_FUNC_HPP
 
-/**
- * Returns the maximum of two values.
- *
- * This function returns the greater value of two given values.
- * If they are equal the value of a is returned.
- *
- * @param a The first value
- * @param b The second value
- * @return The greater value or a if equals
- */
-template <typename T>
-static inline T max(const T a, const T b)
-{
-	return (a >= b) ? a : b;
-}
-
-/**
- * Returns the minimum of two values.
- *
- * This function returns the smaller value of two given values.
- * If they are equal the value of b is returned.
- *
- * @param a The first value
- * @param b The second value
- * @return The smaller value or b if equals
- */
-template <typename T>
-static inline T min(const T a, const T b)
-{
-	return (a < b) ? a : b;
-}
-
-/**
- * Returns the minimum of two integer.
- *
- * This function returns the smaller value of two given integers.
- *
- * @param a The first integer
- * @param b The second integer
- * @return The smaller value
- */
-static inline int min(const int a, const int b)
-{
-	return min<int>(a, b);
-}
-
-/**
- * Returns the minimum of two unsigned integers.
- *
- * This function returns the smaller value of two given unsigned integers.
- *
- * @param a The first unsigned integer
- * @param b The second unsigned integer
- * @return The smaller value
- */
-static inline uint minu(const uint a, const uint b)
-{
-	return min<uint>(a, b);
-}
-
 /**
  * Returns the absolute value of (scalar) variable.
  *
@@ -239,7 +179,7 @@ static inline uint16 ClampToU16(const uint64 a)
 	 * match for min(uint64, uint) than uint64 min(uint64, uint64). As such we
 	 * need to cast the UINT16_MAX to prevent MSVC from displaying its
 	 * infinite loads of warnings. */
-	return static_cast<uint16>(min<uint64>(a, static_cast<uint64>(UINT16_MAX)));
+	return static_cast<uint16>(std::min(a, static_cast<uint64>(UINT16_MAX)));
 }
 
 /**

src/core/pool_func.hpp

@@ -55,7 +55,7 @@ DEFINE_POOL_METHOD(inline void)::ResizeFor(size_t index)
 	assert(index >= this->size);
 	assert(index < Tmax_size);
 
-	size_t new_size = min(Tmax_size, Align(index + 1, max<uint>(64, Tgrowth_step)));
+	size_t new_size = std::min(Tmax_size, Align(index + 1, std::max<uint>(64, Tgrowth_step)));
 
 	this->data = ReallocT(this->data, new_size);
 	MemSetT(this->data + this->size, 0, new_size - this->size);
@@ -111,7 +111,7 @@ DEFINE_POOL_METHOD(inline void *)::AllocateItem(size_t size, size_t index)
 {
 	assert(this->data[index] == nullptr);
 
-	this->first_unused = max(this->first_unused, index + 1);
+	this->first_unused = std::max(this->first_unused, index + 1);
 	this->items++;
 
 	Titem *item;
@@ -200,7 +200,7 @@ DEFINE_POOL_METHOD(void)::FreeItem(size_t index)
 	}
 	this->data[index] = nullptr;
 	ClrBit(this->free_bitmap[index / 64], index % 64);
-	this->first_free = min(this->first_free, index);
+	this->first_free = std::min(this->first_free, index);
 	this->items--;
 	if (!this->cleaning) Titem::PostDestructor(index);
 }

src/core/smallmatrix_type.hpp

@@ -234,7 +234,7 @@ public:
 						if (x * new_height > new_capacity) continue;
 						(*copy)(new_data + (x - 1) * new_height,
 								this->data + (x - 1) * this->height,
-								min(this->height, new_height));
+								std::min(this->height, new_height));
 					}
 				} else {
 					/* If matrix is shrinking copy from the front. */
@@ -242,7 +242,7 @@ public:
 						if ((x + 1) * new_height > new_capacity) break;
 						(*copy)(new_data + x * new_height,
 								this->data + x * this->height,
-								min(this->height, new_height));
+								std::min(this->height, new_height));
 					}
 				}
 			}

src/core/smallstack_type.hpp

@@ -38,7 +38,7 @@ public:
 		if (index < Tmax_size) {
 			this->data[index].valid = true;
 			this->first_free = index + 1;
-			this->first_unused = max(this->first_unused, this->first_free);
+			this->first_unused = std::max(this->first_unused, this->first_free);
 		}
 		return index;
 	}
@@ -50,7 +50,7 @@ public:
 	inline void Destroy(Tindex index)
 	{
 		this->data[index].valid = false;
-		this->first_free = min(this->first_free, index);
+		this->first_free = std::min(this->first_free, index);
 	}
 
 private:

src/core/smallvec_type.hpp

@@ -13,7 +13,6 @@
 #include "alloc_func.hpp"
 #include "mem_func.hpp"
 #include <vector>
-#include <algorithm>
 
 /**
  * Helper function to append an item to a vector if it is not already contained