From 9a881ac796dd46b4bdde7f48d8003160c2242c2d Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 7 Oct 2018 00:55:59 +0200
Subject: fix GCC build errors

Issue: #726
---
 compat/qhash.hpp         | 2 +-
 logic/pipeline.cpp       | 4 ++--
 options/value-traits.hpp | 1 +
 options/value.hpp        | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compat/qhash.hpp b/compat/qhash.hpp
index ba569285..c2be4fc5 100644
--- a/compat/qhash.hpp
+++ b/compat/qhash.hpp
@@ -6,7 +6,7 @@
 namespace std {
 template<> struct hash<QString>
 {
-    constexpr unsigned operator()(const QString& value) const
+    unsigned operator()(const QString& value) const
     {
         return qHash(value);
     }
diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp
index 4ebfedc8..c701a815 100644
--- a/logic/pipeline.cpp
+++ b/logic/pipeline.cpp
@@ -215,14 +215,14 @@ static bool is_nan(const dmat<u,w>& r)
 }
 
 template<typename x>
-static cc_forceinline
+static inline
 bool nan_check_(const x& datum)
 {
     return is_nan(datum);
 }
 
 template<typename x, typename y, typename... xs>
-static cc_forceinline
+static inline
 bool nan_check_(const x& datum, const y& next, const xs&... rest)
 {
     return nan_check_(datum) || nan_check_(next, rest...);
diff --git a/options/value-traits.hpp b/options/value-traits.hpp
index 3ab623da..31b6b534 100644
--- a/options/value-traits.hpp
+++ b/options/value-traits.hpp
@@ -5,6 +5,7 @@
 
 #include <QString>
 
+#include <cmath>
 #include <cinttypes>
 #include <type_traits>
 
diff --git a/options/value.hpp b/options/value.hpp
index 887f0d39..1bf6820d 100644
--- a/options/value.hpp
+++ b/options/value.hpp
@@ -112,8 +112,8 @@ public:
 
     operator t() const { return get(); }
 
-    template<typename u, typename = decltype(static_cast<u>(std::declval<t>()))>
-    explicit cc_forceinline operator u() const { return to<u>(); }
+    template<typename w, typename = decltype(static_cast<w>(std::declval<t>()))>
+    explicit cc_forceinline operator w() const { return to<w>(); }
 
     auto operator->() const
     {
-- 
cgit v1.2.3