Update to 1.11.0-beta1

2021-01-23 17:31:11 +03:00
parent d3c06c25c8
commit 5e4506f493
1045 changed files with 23534 additions and 60345 deletions
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -41,8 +41,8 @@ struct SetDateWindow : Window {
 	SetDateWindow(WindowDesc *desc, WindowNumber window_number, Window *parent, Date initial_date, Year min_year, Year max_year, SetDateCallback *callback) :
 			Window(desc),
 			callback(callback),
-			min_year(max(MIN_YEAR, min_year)),
-			max_year(min(MAX_YEAR, max_year))
+			min_year(std::max(MIN_YEAR, min_year)),
+			max_year(std::min(MAX_YEAR, max_year))
 	{
 		assert(this->min_year <= this->max_year);
 		this->parent = parent;