Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/qt-gpp-02-MathExtras.diff
author tom68
Sat, 06 Aug 2011 15:07:25 +0000
changeset 3684 ce1a7a75c649
child 7886 ac90abc80863
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
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
 
-#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW)
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
 
+#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
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;
upstream/spec-files-extra