Merge pull request #64 from SylvainCorlay/regression-fix

Regression fix w.r.t. has_raw_data_interface
xtensor-stack · Apr 9, 2018 · 65e5353 · 65e5353
2 parents 9e2037c + ea864d9
commit 65e5353
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/include/xtensor-blas/xblas_utils.hpp b/include/xtensor-blas/xblas_utils.hpp
@@ -9,6 +9,10 @@
 #ifndef XBLAS_UTILS_HPP
 #define XBLAS_UTILS_HPP
 
+#include <stdexcept>
+#include <tuple>
+#include <type_traits>
+
 #include "xflens/cxxblas/typedefs.h"
 #include "xtensor/xutils.hpp"
 
@@ -24,7 +28,7 @@ namespace xt
 {
     template <layout_type L = layout_type::row_major, class T>
     inline auto view_eval(T&& t)
-        -> std::enable_if_t<has_raw_data_interface<T>::value && std::decay_t<T>::static_layout == L, T&&>
+        -> std::enable_if_t<has_raw_data_interface<std::decay_t<T>>::value && std::decay_t<T>::static_layout == L, T&&>
     {
         return std::forward<T>(t);
     }
@@ -39,7 +43,7 @@ namespace xt
 
     template <layout_type L = layout_type::row_major, class T, class I = std::decay_t<T>>
     inline auto view_eval(T&& t)
-        -> std::enable_if_t<(!has_raw_data_interface<T>::value || I::static_layout != L)
+        -> std::enable_if_t<(!has_raw_data_interface<std::decay_t<T>>::value || I::static_layout != L)
                             && detail::is_array<typename I::shape_type>::value,
                             xtensor<typename I::value_type,
                                     std::tuple_size<typename I::shape_type>::value,
@@ -50,7 +54,7 @@ namespace xt
 
     template <layout_type L = layout_type::row_major, class T, class I = std::decay_t<T>>
     inline auto view_eval(T&& t)
-        -> std::enable_if_t<(!has_raw_data_interface<T>::value || I::static_layout != L) &&
+        -> std::enable_if_t<(!has_raw_data_interface<std::decay_t<T>>::value || I::static_layout != L) &&
                             !detail::is_array<typename I::shape_type>::value,
                             xarray<typename I::value_type, detail::layout_remove_any(L)>>
     {