Merge pull request #2293 from wlbksy/master

fix -Wshadow and -Wunused-local-typedef warning

Author: JohanMabille

include/xtensor/xaccumulator.hpp

@@ -198,11 +198,10 @@ namespace xt
         inline auto accumulator_impl(F&& f, E&& e, std::size_t axis, evaluation_strategy::immediate_type)
         {
             using init_type = typename F::init_value_type;
-            using init_functor_type = typename F::init_functor_type;
             using accumulate_functor_type = typename F::accumulate_functor_type;
             using expr_value_type = typename std::decay_t<E>::value_type;
             //using return_type = std::conditional_t<std::is_same<init_type, void>::value, typename std::decay_t<E>::value_type, init_type>;
-            
+
             using return_type = std::decay_t<decltype(std::declval<accumulate_functor_type>()(std::declval<init_type>(),
                                                                                               std::declval<expr_value_type>()))>;
             using result_type = xaccumulator_return_type_t<std::decay_t<E>, return_type>;
@@ -247,7 +246,7 @@ namespace xt
                 inner_loop_size = inner_loop_size - inner_stride;
 
                 // activate the init loop if we have an init function other than identity
-                if (!std::is_same<std::decay_t<typename F::init_functor_type>, 
+                if (!std::is_same<std::decay_t<typename F::init_functor_type>,
                                   typename detail::accumulator_identity<init_type>>::value)
                 {
                     accumulator_init_with_f(xt::get<1>(f), result, axis);

include/xtensor/xreducer.hpp

@@ -610,7 +610,7 @@ namespace xt
         }
 
     private:
-        
+
         // Workaround for clang-cl
         const base_type& upcast() const
         {
@@ -694,7 +694,7 @@ namespace xt
         using merge_functor_type = typename std::decay_t<F>::merge_functor_type;
         using substepper_type = typename xexpression_type::const_stepper;
         using raw_value_type = std::decay_t<decltype(std::declval<reduce_functor_type>()(
-                                                            std::declval<init_functor_type>()(), 
+                                                            std::declval<init_functor_type>()(),
                                                             *std::declval<substepper_type>())
                                                     )>;
         using value_type = typename detail::evaluated_value_type_t<raw_value_type, is_xexpression<raw_value_type>::value>;
@@ -851,12 +851,11 @@ namespace xt
 
             using reduce_functor_type = typename std::decay_t<F>::reduce_functor_type;
             using init_functor_type = typename std::decay_t<F>::init_functor_type;
-            using init_value_type = typename init_functor_type::value_type;
             using value_type = std::decay_t<decltype(std::declval<reduce_functor_type>()(
                 std::declval<init_functor_type>()(),
                 *std::declval<typename std::decay_t<E>::const_stepper>()))>;
             using evaluated_value_type = evaluated_value_type_t<value_type, is_xexpression<value_type>::value>;
-            
+
             using reducer_type = xreducer<F, const_xclosure_t<E>, xtl::const_closure_type_t<decltype(normalized_axes)>, reducer_options<evaluated_value_type, std::decay_t<O>>>;
             return reducer_type(std::forward<F>(f), std::forward<E>(e), std::forward<decltype(normalized_axes)>(normalized_axes), std::forward<O>(options));
         }
@@ -1091,7 +1090,7 @@ namespace xt
             {
                 return const_value<U>(t.m_value);
             }
-        };        
+        };
     }
 
     /*******************************************

include/xtensor/xrepeat.hpp

@@ -263,8 +263,8 @@ namespace xt
         , m_repeats(std::forward<R>(repeats))
         , m_shape(e.shape())
     {
-        using value_type = typename shape_type::value_type;
-        m_shape[axis] = static_cast<value_type>(std::accumulate(m_repeats.begin(), m_repeats.end(), 0));
+        using shape_value_type = typename shape_type::value_type;
+        m_shape[axis] = static_cast<shape_value_type>(std::accumulate(m_repeats.begin(), m_repeats.end(), 0));
     }
 
     /**