Mercurial > mxe-octave

annotate src/wxwidgets-1-c++11-related-fixes.patch @ 4357:74c7af6a36c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* of-image-1-fixes.patch: New file.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Mar 2017 11:37:08 -0500
parents ae1280afbc8c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4353
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
1 From: Boris Pek <tehnick-8@mail.ru>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
2 Date: Thu, 05 May 2016 19:11:19 +0300
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
3 Subject: [PATCH] fix build with GCC >= 6.x
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
4
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
5 diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
6 --- a/src/stc/scintilla/src/Editor.cxx
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
7 +++ b/src/stc/scintilla/src/Editor.cxx
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
8 @@ -10,6 +10,7 @@
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
9 #include <stdio.h>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
10 #include <ctype.h>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
11 #include <assert.h>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
12 +#include <math.h>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
13
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
14 #include <string>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
15 #include <vector>
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
16 @@ -5841,9 +5842,9 @@
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
17 }
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
18
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
19 static bool Close(Point pt1, Point pt2) {
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
20 - if (abs(pt1.x - pt2.x) > 3)
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
21 + if (fabs(pt1.x - pt2.x) > 3)
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
22 return false;
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
23 - if (abs(pt1.y - pt2.y) > 3)
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
24 + if (fabs(pt1.y - pt2.y) > 3)
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
25 return false;
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
26 return true;
ae1280afbc8c wxwidgets: add fixes for stdc++11 issues in later gcc versions
John D
parents:
diff changeset
27 }