Use const xview stepper when underlying expression is const

xtensor-stack · Aug 12, 2017 · a6ed09f · a6ed09f
1 parent 0266181
commit a6ed09f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/xtensor/xoptional.hpp b/include/xtensor/xoptional.hpp
@@ -89,6 +89,7 @@ namespace xt
     class xoptional
     {
     public:
+
         using value_closure = CT;
         using flag_closure = CB;
 
@@ -178,6 +179,7 @@ namespace xt
         disable_xoptional<CTO, bool> equal(const CTO& rhs) const noexcept;
 
     private:
+
         template <class CTO, class CBO>
         friend class xoptional;
 

diff --git a/include/xtensor/xview.hpp b/include/xtensor/xview.hpp
@@ -48,8 +48,8 @@ namespace xt
     {
         using xexpression_type = std::decay_t<CT>;
         using inner_shape_type = typename xview_shape_type<typename xexpression_type::shape_type, S...>::type;
-        using stepper = xview_stepper<false, CT, S...>;
-        using const_stepper = xview_stepper<true, CT, S...>;
+        using stepper = xview_stepper<std::is_const<std::remove_reference_t<CT>>::value, std::remove_cv_t<CT>, S...>;
+        using const_stepper = xview_stepper<true, std::remove_cv_t<CT>, S...>;
     };
 
     /**