File abs.diff of Package wxWidgets-3_0
From: Jan Engelhardt <jengelh@inai.de>
Date: 2016-06-17 08:08:34.610326109 +0200
Pick one of the abses and move on.
./src/stc/scintilla/src/Editor.cxx:5844:23: error: call of overloaded 'abs(XYPOSITION)' is ambiguous
if (abs(pt1.x - pt2.x) > 3)
./src/stc/scintilla/src/Editor.cxx:5846:23: error: call of overloaded 'abs(XYPOSITION)' is ambiguous
if (abs(pt1.y - pt2.y) > 3)
---
src/stc/scintilla/src/Editor.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: wxWidgets-3.0.2/src/stc/scintilla/src/Editor.cxx
===================================================================
--- wxWidgets-3.0.2.orig/src/stc/scintilla/src/Editor.cxx
+++ wxWidgets-3.0.2/src/stc/scintilla/src/Editor.cxx
@@ -981,7 +981,7 @@ void Editor::ScrollTo(int line, bool mov
// Try to optimise small scrolls
#ifndef UNDER_CE
int linesToMove = topLine - topLineNew;
- bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting);
+ bool performBlit = (abs(static_cast<int>(linesToMove)) <= 10) && (paintState == notPainting);
willRedrawAll = !performBlit;
#endif
SetTopLine(topLineNew);
@@ -5841,9 +5841,9 @@ void Editor::GoToLine(int lineNo) {
}
static bool Close(Point pt1, Point pt2) {
- if (abs(pt1.x - pt2.x) > 3)
+ if (abs(static_cast<int>(pt1.x - pt2.x)) > 3)
return false;
- if (abs(pt1.y - pt2.y) > 3)
+ if (abs(static_cast<int>(pt1.y - pt2.y)) > 3)
return false;
return true;
}