diff options
Diffstat (limited to 'boost/test/data/monomorphic/generators/xrange.hpp')
| -rw-r--r-- | boost/test/data/monomorphic/generators/xrange.hpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/boost/test/data/monomorphic/generators/xrange.hpp b/boost/test/data/monomorphic/generators/xrange.hpp index 55a51110b4..02da352adf 100644 --- a/boost/test/data/monomorphic/generators/xrange.hpp +++ b/boost/test/data/monomorphic/generators/xrange.hpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2011-2014. +// (C) Copyright Gennadiy Rozental 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -49,14 +49,14 @@ namespace monomorphic { template<typename SampleType, typename StepType=SampleType> class xrange_t { public: - typedef SampleType data_type; + typedef SampleType sample; - xrange_t( SampleType const& begin, StepType const& step, data::size_t size ) - : m_begin( begin ) - , m_curr( begin ) - , m_step( step ) + xrange_t( SampleType const& begin_, StepType const& step_, data::size_t size_ ) + : m_begin( begin_ ) + , m_curr( begin_ ) + , m_step( step_ ) , m_index( 0 ) - , m_size( size ) + , m_size( size_ ) {} // Generator interface @@ -159,7 +159,7 @@ struct make_xrange { //! //! @note the step size cannot be null, and it should be positive if @c begin_val < @c end_val, negative otherwise. template<typename SampleType, typename Params> -inline monomorphic::generated_by<monomorphic::xrange_t<SampleType> > +inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>> xrange( Params const& params ) { return monomorphic::ds_detail::make_xrange<SampleType>::_( params ); @@ -169,7 +169,7 @@ xrange( Params const& params ) /// @overload boost::unit_test::data::xrange() template<typename SampleType> -inline monomorphic::generated_by<monomorphic::xrange_t<SampleType> > +inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>> xrange( SampleType const& end_val ) { return monomorphic::ds_detail::make_xrange<SampleType>::_( data::end=end_val ); @@ -179,22 +179,23 @@ xrange( SampleType const& end_val ) /// @overload boost::unit_test::data::xrange() template<typename SampleType, typename Params> -inline typename enable_if_c<nfp::is_named_params<Params>::value,monomorphic::generated_by<monomorphic::xrange_t<SampleType> > >::type +inline typename enable_if_c<nfp::is_named_param_pack<Params>::value, + monomorphic::generated_by<monomorphic::xrange_t<SampleType>>>::type xrange( SampleType const& end_val, Params const& params ) { - return monomorphic::ds_detail::make_xrange<SampleType>:: - _(( params, data::end=end_val )); + return monomorphic::ds_detail::make_xrange<SampleType>::_(( params, data::end=end_val )); } //____________________________________________________________________________// /// @overload boost::unit_test::data::xrange() template<typename SampleType> -inline monomorphic::generated_by<monomorphic::xrange_t<SampleType> > +inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>> xrange( SampleType const& begin_val, SampleType const& end_val ) { - return monomorphic::ds_detail::make_xrange<SampleType>:: - _(( data::begin=begin_val, data::end=end_val )); + return monomorphic::ds_detail::make_xrange<SampleType>::_(( + data::begin=begin_val, + data::end=end_val )); } //____________________________________________________________________________// @@ -203,11 +204,13 @@ xrange( SampleType const& begin_val, SampleType const& end_val ) /// @overload boost::unit_test::data::xrange() template<typename SampleType,typename StepType> -inline monomorphic::generated_by<monomorphic::xrange_t<SampleType> > +inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>> xrange( SampleType const& begin_val, SampleType const& end_val, StepType const& step_val ) { - return monomorphic::ds_detail::make_xrange<SampleType,StepType>:: - _(( data::begin=begin_val, data::end=end_val, data::step=step_val )); + return monomorphic::ds_detail::make_xrange<SampleType,StepType>::_(( + data::begin=begin_val, + data::end=end_val, + data::step=step_val )); } //____________________________________________________________________________// |