diff --git a/include/boost/numeric/odeint/algebra/multi_array_algebra.hpp b/include/boost/numeric/odeint/algebra/multi_array_algebra.hpp index 4d1fc16c..0bc476e6 100644 --- a/include/boost/numeric/odeint/algebra/multi_array_algebra.hpp +++ b/include/boost/numeric/odeint/algebra/multi_array_algebra.hpp @@ -113,13 +113,13 @@ struct multi_array_algebra template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 ,class S7 , class S8 , class S9 , class S10 , class S11 , class S12 , class S13 , class S14 , class Op > static void for_each14( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , S12 &s12 , S13 &s13 , S14 &s14 , Op op ) { - detail::for_each14( s1.data() , s1.data() + s1.num_elements() , s2.data() , s3.data() , s4.data() , s5.data() , s6.data() , s7.data() , s8.data() , s9.data() , s10.data() , s11.data() , s12.data() , s14.data() , op ); + detail::for_each14( s1.data() , s1.data() + s1.num_elements() , s2.data() , s3.data() , s4.data() , s5.data() , s6.data() , s7.data() , s8.data() , s9.data() , s10.data() , s11.data() , s12.data() , s13.data() , s14.data() , op ); } template< class S1 , class S2 , class S3 , class S4 , class S5 , class S6 ,class S7 , class S8 , class S9 , class S10 , class S11 , class S12 , class S13 , class S14 , class S15 , class Op > static void for_each15( S1 &s1 , S2 &s2 , S3 &s3 , S4 &s4 , S5 &s5 , S6 &s6 , S7 &s7 , S8 &s8 , S9 &s9 , S10 &s10 , S11 &s11 , S12 &s12 , S13 &s13 , S14 &s14 , S15 &s15 , Op op ) { - detail::for_each15( s1.data() , s1.data() + s1.num_elements() , s2.data() , s3.data() , s4.data() , s5.data() , s6.data() , s7.data() , s8.data() , s9.data() , s10.data() , s11.data() , s12.data() , s14.data() , s15.data() , op ); + detail::for_each15( s1.data() , s1.data() + s1.num_elements() , s2.data() , s3.data() , s4.data() , s5.data() , s6.data() , s7.data() , s8.data() , s9.data() , s10.data() , s11.data() , s12.data() , s13.data() , s14.data() , s15.data() , op ); } template< typename S > diff --git a/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp b/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp index 643b5393..e5b4b3cf 100644 --- a/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp +++ b/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp @@ -205,7 +205,7 @@ namespace odeint { * \param sys The system function (ODE) to solve. * \param s The initial state. */ - adaptive_iterator_impl( stepper_type stepper , system_type sys , state_type &s ) + adaptive_iterator_impl( stepper_type stepper , system_type sys , state_type& /* s */ ) : base_type( stepper , sys ) { } protected: diff --git a/include/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp b/include/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp index 449acfa7..e23474c7 100644 --- a/include/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp +++ b/include/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp @@ -77,7 +77,7 @@ namespace odeint { * \param sys The system function (ODE) to solve. * \param s The initial state. const_step_iterator stores a reference of s and changes its value during the iteration. */ - const_step_iterator_impl( stepper_type stepper , system_type sys , state_type &s ) + const_step_iterator_impl( stepper_type stepper , system_type sys , state_type& /* s */ ) : base_type( stepper , sys ) { } protected: diff --git a/include/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp b/include/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp index 14779904..f90f8875 100644 --- a/include/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp +++ b/include/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp @@ -48,7 +48,7 @@ Time integrate_n_steps( Observer observer , stepper_tag ) { // ToDo: is there a better way to extract the final time? - Time t; + Time t = start_time; // Assignment is only here to avoid warnings. boost::for_each( make_n_step_time_range( stepper , system , start_state , start_time , dt , num_of_steps ) , obs_caller_time< Observer , Time >( t , observer ) ); @@ -91,7 +91,7 @@ Time integrate_n_steps( Observer observer , dense_output_stepper_tag ) { // ToDo: is there a better way to extract the final time? - Time t; + Time t = start_time; // Assignment is only here to avoid warnings. boost::for_each( make_n_step_time_range( stepper , system , start_state , start_time , dt , num_of_steps ) , obs_caller_time< Observer , Time >( t , observer ) ); diff --git a/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp b/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp index ea3523e5..eb09aefc 100644 --- a/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp +++ b/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp @@ -182,7 +182,7 @@ private: // stepper for systems with function for dq/dt = f(p) and dp/dt = -f(q) template< class System , class StateIn , class StateOut > - void do_step_impl( System system , const StateIn &in , time_type t , StateOut &out , time_type dt , boost::mpl::true_ ) + void do_step_impl( System system , const StateIn &in , time_type /* t */ , StateOut &out , time_type dt , boost::mpl::true_ ) { typedef typename odeint::unwrap_reference< System >::type system_type; typedef typename odeint::unwrap_reference< typename system_type::first_type >::type coor_deriv_func_type; diff --git a/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp b/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp index 168bc692..cc279abb 100644 --- a/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp +++ b/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp @@ -117,7 +117,7 @@ struct adams_bashforth_call_algebra< 7 , Algebra , Operations > { //BOOST_ASSERT( false ); // not implemented typedef typename Coefficients::value_type value_type; - Algebra::for_each9( out , in , steps[0].m_v , steps[1].m_v , steps[2].m_v , steps[3].m_v , steps[4].m_v , steps[5].m_v , steps[6].m_v , + algebra.for_each9( out , in , steps[0].m_v , steps[1].m_v , steps[2].m_v , steps[3].m_v , steps[4].m_v , steps[5].m_v , steps[6].m_v , typename Operations::template scale_sum8< value_type , Time , Time , Time , Time , Time , Time >( 1.0 , dt * coef[0] , dt * coef[1] , dt * coef[2] , dt * coef[3] , dt * coef[4] , dt * coef[5] , dt * coef[6] ) ); } @@ -132,7 +132,7 @@ struct adams_bashforth_call_algebra< 8 , Algebra , Operations > { //BOOST_ASSERT( false ); // not implemented typedef typename Coefficients::value_type value_type; - Algebra::for_each10( out , in , steps[0].m_v , steps[1].m_v , steps[2].m_v , steps[3].m_v , steps[4].m_v , steps[5].m_v , steps[6].m_v , steps[7].m_v , + algebra.for_each10( out , in , steps[0].m_v , steps[1].m_v , steps[2].m_v , steps[3].m_v , steps[4].m_v , steps[5].m_v , steps[6].m_v , steps[7].m_v , typename Operations::template scale_sum9< value_type , Time , Time , Time , Time , Time , Time , Time >( 1.0 , dt * coef[0] , dt * coef[1] , dt * coef[2] , dt * coef[3] , dt * coef[4] , dt * coef[5] , dt * coef[6] , dt * coef[7] ) ); } diff --git a/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp b/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp index f8a15055..b6f5f2a4 100644 --- a/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp +++ b/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp @@ -32,7 +32,7 @@ template< class Algebra , class Operations > struct adams_moulton_call_algebra< 1 , Algebra , Operations > { template< class StateIn , class StateOut , class DerivIn , class StepStorage , class Coefficients , class Time > - void operator()( Algebra &algebra , const StateIn &in , StateOut &out , const DerivIn &dxdt , const StepStorage &steps , const Coefficients &coef , Time dt ) const + void operator()( Algebra &algebra , const StateIn &in , StateOut &out , const DerivIn &dxdt , const StepStorage& /* steps */ , const Coefficients &coef , Time dt ) const { typedef typename Coefficients::value_type value_type; algebra.for_each3( out , in , dxdt , typename Operations::template scale_sum2< value_type , Time >( 1.0 , dt * coef[0] ) ); diff --git a/include/boost/numeric/odeint/stepper/euler.hpp b/include/boost/numeric/odeint/stepper/euler.hpp index 443f9427..1c7c126b 100644 --- a/include/boost/numeric/odeint/stepper/euler.hpp +++ b/include/boost/numeric/odeint/stepper/euler.hpp @@ -76,7 +76,7 @@ public : { } template< class System , class StateIn , class DerivIn , class StateOut > - void do_step_impl( System system , const StateIn &in , const DerivIn &dxdt , time_type t , StateOut &out , time_type dt ) + void do_step_impl( System /* system */ , const StateIn &in , const DerivIn &dxdt , time_type /* t */ , StateOut &out , time_type dt ) { stepper_base_type::m_algebra.for_each3( out , in , dxdt , typename operations_type::template scale_sum2< value_type , time_type >( 1.0 , dt ) ); @@ -84,7 +84,7 @@ public : } template< class StateOut , class StateIn1 , class StateIn2 > - void calc_state( StateOut &x , time_type t , const StateIn1 &old_state , time_type t_old , const StateIn2 ¤t_state , time_type t_new ) const + void calc_state( StateOut &x , time_type t , const StateIn1 &old_state , time_type t_old , const StateIn2 & /*current_state*/ , time_type /* t_new */ ) const { const time_type delta = t - t_old; stepper_base_type::m_algebra.for_each3( x , old_state , stepper_base_type::m_dxdt.m_v , diff --git a/include/boost/numeric/odeint/util/same_instance.hpp b/include/boost/numeric/odeint/util/same_instance.hpp index dc55db30..a889ee19 100644 --- a/include/boost/numeric/odeint/util/same_instance.hpp +++ b/include/boost/numeric/odeint/util/same_instance.hpp @@ -25,7 +25,7 @@ namespace odeint { template< class T1 , class T2 , class Enabler=void > struct same_instance_impl { - static bool same_instance( const T1 &x1 , const T2 &x2 ) + static bool same_instance( const T1& /* x1 */ , const T2& /* x2 */ ) { return false; } diff --git a/test/default_operations.cpp b/test/default_operations.cpp index 2b6a7559..a2634b7f 100644 --- a/test/default_operations.cpp +++ b/test/default_operations.cpp @@ -229,12 +229,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum2_units_test , T , test_types ) typedef unit_fixture< T > fix_type; typedef typename fix_type::value_type value_type; typedef typename fix_type::time_type time_type; - typedef typename fix_type::time_2_type time_2_type; - typedef typename fix_type::time_3_type time_3_type; - typedef typename fix_type::time_4_type time_4_type; - typedef typename fix_type::time_5_type time_5_type; - typedef typename fix_type::time_6_type time_6_type; - typedef typename fix_type::time_7_type time_7_type; fix_type f; typedef default_operations::scale_sum2< value_type , time_type > Op; @@ -249,11 +243,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum3_units_test , T , test_types ) typedef typename fix_type::value_type value_type; typedef typename fix_type::time_type time_type; typedef typename fix_type::time_2_type time_2_type; - typedef typename fix_type::time_3_type time_3_type; - typedef typename fix_type::time_4_type time_4_type; - typedef typename fix_type::time_5_type time_5_type; - typedef typename fix_type::time_6_type time_6_type; - typedef typename fix_type::time_7_type time_7_type; fix_type f; typedef default_operations::scale_sum3< value_type , time_type , time_2_type > Op;