improve indexview, and stepper, fix bug in forward_shape, add nonzero…

… and single argument where
xtensor-stack · Feb 1, 2017 · dc096c6 · dc096c6
1 parent eab207d
commit dc096c6
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 166 deletions.
diff --git a/include/xtensor/xbroadcast.hpp b/include/xtensor/xbroadcast.hpp
@@ -141,7 +141,7 @@ namespace xt
 
     namespace detail
     {
-        template <class R, class A>
+        template <class R, class A, class E = void>
         struct shape_forwarder
         {
             static inline R run(const A& r)
@@ -151,7 +151,8 @@ namespace xt
         };
 
         template <class I, std::size_t L, class A>
-        struct shape_forwarder<std::array<I, L>, A>
+        struct shape_forwarder<std::array<I, L>, A,
+                               typename std::enable_if<!std::is_same<std::array<I, L>, A>::value>::type>
         {
             using R = std::array<I, L>;