From 0adf380a4baa2e879279e35b9a5b48fb7d860444 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 28 Jan 2018 08:56:08 +1100
Subject: Backport: Use std::abs in preference to abs as std::abs is generic
 and abs casts to int which may drop information.

Backport of changeset 6434:ed27432729c3.
---
 src/Document.cxx | 3 ++-
 src/Editor.cxx   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Document.cxx b/src/Document.cxx
index 90dfb52bc..30295ae04 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -10,6 +10,7 @@
 #include <cassert>
 #include <cstring>
 #include <cstdio>
+#include <cmath>
 
 #include <stdexcept>
 #include <string>
@@ -881,7 +882,7 @@ Sci::Position Document::GetRelativePositionUTF16(Sci::Position positionStart, Sc
 			const Sci::Position posNext = NextPosition(pos, increment);
 			if (posNext == pos)
 				return INVALID_POSITION;
-			if (abs(pos-posNext) > 3)	// 4 byte character = 2*UTF16.
+			if (std::abs(pos-posNext) > 3)	// 4 byte character = 2*UTF16.
 				characterOffset -= increment;
 			pos = posNext;
 			characterOffset -= increment;
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 8125d322b..f997181ad 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -11,8 +11,8 @@
 #include <cstring>
 #include <cctype>
 #include <cstdio>
-
 #include <cmath>
+
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -934,7 +934,7 @@ void Editor::ScrollTo(Sci::Line line, bool moveThumb) {
 		// Try to optimise small scrolls
 #ifndef UNDER_CE
 		const Sci::Line linesToMove = topLine - topLineNew;
-		const bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting);
+		const bool performBlit = (std::abs(linesToMove) <= 10) && (paintState == notPainting);
 		willRedrawAll = !performBlit;
 #endif
 		SetTopLine(topLineNew);
-- 
cgit v1.2.3