| author | viskov |
| Thu, 03 Nov 2011 23:39:26 +0000 | |
| changeset 7886 | ac90abc80863 |
| parent 3684 | ce1a7a75c649 |
| 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 |
--- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2010-07-09 13:23:51.817496928 +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
|
2 |
+++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h 2010-07-09 13:26:40.436662765 +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
|
3 |
@@ -190,7 +190,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
|
4 |
inline float rad2grad(float r) { return r * 200.0f / piFloat; }
|
|
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 |
inline float grad2rad(float g) { return g * piFloat / 200.0f; }
|
|
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 |
|
|
7886
ac90abc80863
SFEqt-gpp.spec: update to 4.7.4, reworking two patches and adding another
viskov
parents:
3684
diff
changeset
|
7 |
-#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) |
|
ac90abc80863
SFEqt-gpp.spec: update to 4.7.4, reworking two patches and adding another
viskov
parents:
3684
diff
changeset
|
8 |
+#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) && !OS(SOLARIS) |
|
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
|
9 |
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
|
10 |
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
|
11 |
using std::isnan; |