kfr

commit 9e6adbcdd27af4c2fd290fedbaf0313c7515c0ed
parent 677c601f468c50ba5282327a92460435285bba48
Author: [email protected] <[email protected]>
Date:   Wed, 27 Jul 2016 20:53:01 +0300

Better type deduction for expressions

Diffstat:
M
include/kfr/base/expression.hpp
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/kfr/base/expression.hpp b/include/kfr/base/expression.hpp
@@ -110,7 +110,7 @@ private:
     {
         using ratio          = func_ratio<Fn>;
         constexpr size_t Nin = N * ratio::input / ratio::output;
-        using Tout           = conditional<is_same<generic, value_type>::value, T, value_type>;
+        using Tout           = conditional<is_same<generic, value_type>::value, T, common_type<T, value_type>>;
 
         return cast<T>(fn(cast<Tout>(std::get<indices>(this->args)(
             cinput, index * ratio::input / ratio::output, vec_t_for<Args, Nin, Tout>()))...));
@@ -162,7 +162,7 @@ struct generic_result
 template <typename Fn, typename... Args>
 struct generic_result<Fn, ctypes_t<Args...>, void_t<enable_if<!or_t<is_same<generic, Args>...>::value>>>
 {
-    using type = subtype<decltype(std::declval<Fn>()(std::declval<vec<decay<Args>, 1>>()...))>;
+    using type = decltype(std::declval<Fn>()(std::declval<Args>()...));
 };
 
 template <typename Fn, typename... Args>
@@ -266,7 +266,7 @@ struct expressoin_typed : input_expression
     expressoin_typed(E1&& e1) : e1(std::forward<E1>(e1)) {}
 
     template <typename U, size_t N>
-    KFR_INLINE vec<U, N> operator()(cinput_t, size_t index, vec_t<U, N>)
+    KFR_INLINE vec<U, N> operator()(cinput_t, size_t index, vec_t<U, N>) const
     {
         return cast<U>(e1(cinput, index, vec_t<T, N>()));
     }