[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qtcurve] /: Fix compilation on gcc5
From:       Yichao Yu <yyc1992 () gmail ! com>
Date:       2016-02-27 15:34:24
Message-ID: E1aZgsy-0007Kj-1C () scm ! kde ! org
[Download RAW message or body]

Git commit 34a1e3277aa21c59029576bffe2576a9ddd4b1a7 by Yichao Yu.
Committed on 27/02/2016 at 15:34.
Pushed by yuyichao into branch 'master'.

Fix compilation on gcc5

M  +1    -1    gtk2/style/qt_settings.cpp
M  +2    -2    lib/utils/color.cpp

http://commits.kde.org/qtcurve/34a1e3277aa21c59029576bffe2576a9ddd4b1a7

diff --git a/gtk2/style/qt_settings.cpp b/gtk2/style/qt_settings.cpp
index 0c0b1fc..cb079fc 100644
--- a/gtk2/style/qt_settings.cpp
+++ b/gtk2/style/qt_settings.cpp
@@ -467,7 +467,7 @@ setFont(QtFontDetails *font, int f)
 #define MIX(a, b, bias) (a + ((b - a) * bias))
 GdkColor mixColors(const GdkColor *c1, const GdkColor *c2, double bias)
 {
-    if (bias <= 0.0 || isnan(bias))
+    if (bias <= 0.0 || std::isnan(bias))
         return *c1;
     if (bias >= 1.0)
         return *c2;
diff --git a/lib/utils/color.cpp b/lib/utils/color.cpp
index 831b918..6ecb9f2 100644
--- a/lib/utils/color.cpp
+++ b/lib/utils/color.cpp
@@ -177,7 +177,7 @@ QTC_EXPORT void
 _qtcColorTint(const QtcColor *base, const QtcColor *col,
               double amount, QtcColor *out)
 {
-    if (qtcUnlikely(amount <= 0.0 || isnan(amount))) {
+    if (qtcUnlikely(amount <= 0.0 || std::isnan(amount))) {
         *out = *base;
         return;
     }
@@ -205,7 +205,7 @@ _qtcColorTint(const QtcColor *base, const QtcColor *col,
 QTC_EXPORT void
 _qtcColorMix(const QtcColor *c1, const QtcColor *c2, double bias, QtcColor *out)
 {
-    if (qtcUnlikely(bias <= 0.0 || isnan(bias))) {
+    if (qtcUnlikely(bias <= 0.0 || std::isnan(bias))) {
         *out = *c1;
         return;
     }
[prev in list] [next in list] [prev in thread] [next in thread]