diff options
Diffstat (limited to 'boost/test/data/monomorphic/collection.hpp')
| -rw-r--r-- | boost/test/data/monomorphic/collection.hpp | 68 |
1 files changed, 17 insertions, 51 deletions
diff --git a/boost/test/data/monomorphic/collection.hpp b/boost/test/data/monomorphic/collection.hpp index 5666a62f8d..49e81458bf 100644 --- a/boost/test/data/monomorphic/collection.hpp +++ b/boost/test/data/monomorphic/collection.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) @@ -14,7 +14,7 @@ // Boost.Test #include <boost/test/data/config.hpp> -#include <boost/test/data/monomorphic/dataset.hpp> +#include <boost/test/data/monomorphic/fwd.hpp> #include <boost/test/detail/suppress_warnings.hpp> @@ -35,54 +35,28 @@ namespace monomorphic { //! This dataset is applicable to any container implementing a forward iterator. Note that //! container with one element will be considered as singletons. //! This dataset is constructible with the @ref boost::unit_test::data::make function. -//! -//! For compilers supporting r-value references, the collection is moved instead of copied. template<typename C> -class collection : public monomorphic::dataset<typename boost::decay<C>::type::value_type> { +class collection { typedef typename boost::decay<C>::type col_type; - typedef typename col_type::value_type T; - typedef monomorphic::dataset<T> base; - typedef typename base::iter_ptr iter_ptr; - - struct iterator : public base::iterator { - // Constructor - explicit iterator( collection<C> const& owner ) - : m_iter( owner.col().begin() ) - , m_singleton( owner.col().size() == 1 ) - {} - - // forward iterator interface - virtual T const& operator*() { return *m_iter; } - virtual void operator++() { if( !m_singleton ) ++m_iter; } - - private: - // Data members - typename col_type::const_iterator m_iter; - bool m_singleton; - }; - public: + typedef typename col_type::value_type sample; + enum { arity = 1 }; -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - //! Constructor - //! The collection is moved - explicit collection( C&& col ) : m_col( std::forward<C>(col) ) {} + typedef typename col_type::const_iterator iterator; + + //! Constructor consumed a temporary collection or stores a reference + explicit collection( C&& col ) : m_col( std::forward<C>(col) ) {} //! Move constructor collection( collection&& c ) : m_col( std::forward<C>( c.m_col ) ) {} -#else - //! Constructor - //! The collection is copied - explicit collection( C const& col ) : m_col( col ) {} -#endif //! Returns the underlying collection - C const& col() const { return m_col; } + C const& col() const { return m_col; } - // dataset interface - virtual data::size_t size() const { return m_col.size(); } - virtual iter_ptr begin() const { return boost::make_shared<iterator>( *this ); } + //! dataset interface + data::size_t size() const { return m_col.size(); } + iterator begin() const { return m_col.begin(); } private: // Data members @@ -93,27 +67,19 @@ private: //! A collection from a forward iterable container is a dataset. template<typename C> -struct is_dataset<collection<C> > : mpl::true_ {}; +struct is_dataset<collection<C>> : mpl::true_ {}; } // namespace monomorphic +//____________________________________________________________________________// + //! @overload boost::unit_test::data::make() template<typename C> -inline typename BOOST_TEST_ENABLE_IF<is_forward_iterable<C>::value, - monomorphic::collection<C> >::type -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES +inline typename std::enable_if<is_forward_iterable<C>::value,monomorphic::collection<C>>::type make( C&& c ) { return monomorphic::collection<C>( std::forward<C>(c) ); } -#else -make( C const& c ) -{ - return monomorphic::collection<C>( c ); -} -#endif - -//____________________________________________________________________________// } // namespace data } // namespace unit_test |