1 commit 73e9e18ea09ffffcaac50237def0d9728a213c02
2 Author: Scott Talbert <swt@techie.net>
3 Date: Sat Feb 20 00:08:14 2016 -0500
5 Fix STC compilation with GCC6
7 Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
8 with ambiguous overloads.
12 Closes https://github.com/wxWidgets/wxWidgets/pull/222
14 diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
15 index cd72953a..2081df28 100644
16 --- a/src/stc/scintilla/src/Editor.cxx
17 +++ b/src/stc/scintilla/src/Editor.cxx
26 @@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
29 static bool Close(Point pt1, Point pt2) {
30 - if (abs(pt1.x - pt2.x) > 3)
31 + if (std::abs(pt1.x - pt2.x) > 3)
33 - if (abs(pt1.y - pt2.y) > 3)
34 + if (std::abs(pt1.y - pt2.y) > 3)
38 --- wxWidgets-3.0.2/utils/ifacecheck/src/xmlparser.cpp~ 2014-10-06 23:33:44.000000000 +0200
39 +++ wxWidgets-3.0.2/utils/ifacecheck/src/xmlparser.cpp 2017-04-16 02:00:59.184716773 +0200
42 wxLogError("Could not find parent '%s' of class '%s'...",
43 m_parents[i], GetName());
48 const wxMethod *parentMethod = parent->RecursiveUpwardFindMethod(m, allclasses);