| author | jurikm |
| Sun, 12 Feb 2012 14:04:10 +0000 | |
| changeset 8245 | 383896da4129 |
| parent 3684 | ce1a7a75c649 |
| child 8979 | 52fce199c876 |
| permissions | -rw-r--r-- |
|
3684
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
1 |
Attention! There is a fix circling which seems to be wrong. |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
2 |
(using __GXX_EXPERIMENTAL_CXX0X__ and editing std:: into the calls) |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
3 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
4 |
This is the (template)source for the fix we use here: |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
5 |
https://bug-41953-attachments.webkit.org/attachment.cgi?id=87253 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
6 |
https://bugs.webkit.org/show_bug.cgi?id=41953 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
7 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
8 |
A fix is already in webkit-trunk, but this would need to be |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
9 |
updated in this bundled webkit in QT |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
10 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
11 |
Tested with SFEgcc 4.5.3 on OI147/OI148 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
12 |
Tested with SFEgcc 4.6.1 on Solaris 11 (Express) Build 170 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
13 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
14 |
--- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h Mi. M�r 30 07:18:55 2011 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
15 |
+++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig Fr. Aug 5 16:33:25 2011 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
16 |
@@ -26,9 +26,13 @@ |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
17 |
#ifndef WTF_MathExtras_h |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
18 |
#define WTF_MathExtras_h |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
19 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
20 |
+#include <algorithm> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
21 |
#include <cmath> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
22 |
#include <float.h> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
23 |
+#include <limits> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
24 |
+#include <stdint.h> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
25 |
#include <stdlib.h> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
26 |
+#include <wtf/StdLibExtras.h> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
27 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
28 |
#if OS(SOLARIS) |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
29 |
#include <ieeefp.h> |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
30 |
--- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2011-08-06 01:00:30.146198980 +0200 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
31 |
+++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h 2011-08-05 23:06:06.154424000 +0200 |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
32 |
@@ -201,4 +201,11 @@ |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
33 |
using std::signbit; |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
34 |
#endif |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
35 |
|
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
36 |
+#if ( GCC_VERSION >= 40600 ) |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
37 |
+using std::isfinite; |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
38 |
+using std::isinf; |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
39 |
+using std::isnan; |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
40 |
+using std::signbit; |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
41 |
+#endif |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
42 |
+ |
|
ce1a7a75c649
SFEqt-gpp.spec: move patches out of qt-gpp/ and rework, patch2+patch6 rework to avoid gcc 4.5.3+4.6.1 std::isinf std::isnan problem
tom68
parents:
diff
changeset
|
43 |
#endif // #ifndef WTF_MathExtras_h |