From 91e85ffa9fb176b9c87dac1a3849a99ab594d899 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 9 Jun 2017 11:31:14 +1000
Subject: Use min and max from std instead of own version from platform.

---
 cocoa/ScintillaCocoa.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index eeb0daf8f..90d6aa4d7 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -1887,7 +1887,7 @@ void ScintillaCocoa::Resize() {
 void ScintillaCocoa::UpdateForScroll() {
 	Point ptOrigin = GetVisibleOriginInMain();
 	xOffset = static_cast<int>(ptOrigin.x);
-	int newTop = Platform::Minimum(static_cast<int>(ptOrigin.y / vs.lineHeight), MaxScrollPos());
+	Sci::Line newTop = std::min(static_cast<Sci::Line>(ptOrigin.y / vs.lineHeight), MaxScrollPos());
 	SetTopLine(newTop);
 }
 
-- 
cgit v1.2.3