From 9b800a96ed32720ff60b74e498a0e0a6351004f9 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Fri, 8 Jan 2021 10:16:18 +0000
Subject: Codechange: Remove min/max functions in favour of STL variants
 (#8502)

---
 src/ship.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ship.h')

diff --git a/src/ship.h b/src/ship.h
index f3e56c39f..b5578d1af 100644
--- a/src/ship.h
+++ b/src/ship.h
@@ -43,7 +43,7 @@ struct Ship FINAL : public SpecializedVehicle<Ship, VEH_SHIP> {
 	void GetImage(Direction direction, EngineImageType image_type, VehicleSpriteSeq *result) const;
 	int GetDisplaySpeed() const { return this->cur_speed / 2; }
 	int GetDisplayMaxSpeed() const { return this->vcache.cached_max_speed / 2; }
-	int GetCurrentMaxSpeed() const { return min(this->vcache.cached_max_speed, this->current_order.GetMaxSpeed() * 2); }
+	int GetCurrentMaxSpeed() const { return std::min<int>(this->vcache.cached_max_speed, this->current_order.GetMaxSpeed() * 2); }
 	Money GetRunningCost() const;
 	bool IsInDepot() const { return this->state == TRACK_BIT_DEPOT; }
 	bool Tick();
-- 
cgit v1.2.3-70-g09d2