diff options
Diffstat (limited to 'boost/test/data/monomorphic/fwd.hpp')
| -rw-r--r-- | boost/test/data/monomorphic/fwd.hpp | 201 |
1 files changed, 32 insertions, 169 deletions
diff --git a/boost/test/data/monomorphic/fwd.hpp b/boost/test/data/monomorphic/fwd.hpp index 9ff4955432..26c36743df 100644 --- a/boost/test/data/monomorphic/fwd.hpp +++ b/boost/test/data/monomorphic/fwd.hpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2012-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) @@ -18,22 +18,17 @@ #include <boost/test/utils/is_forward_iterable.hpp> - // Boost -#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES -#include <boost/utility/enable_if.hpp> -#include <boost/type_traits/add_const.hpp> -#else -#include <boost/utility/declval.hpp> -#endif #include <boost/type_traits/remove_const.hpp> +#include <boost/type_traits/remove_reference.hpp> +#include <boost/type_traits/is_array.hpp> #include <boost/mpl/bool.hpp> -#include <boost/smart_ptr/make_shared.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/type_traits/decay.hpp> #include <boost/test/detail/suppress_warnings.hpp> +// STL +#include <initializer_list> + //____________________________________________________________________________// namespace boost { @@ -44,10 +39,8 @@ namespace monomorphic { #if !defined(BOOST_TEST_DOXYGEN_DOC__) -template<typename T> -struct traits; -template<typename T> +template<typename T, typename Specific> class dataset; template<typename T> @@ -58,12 +51,10 @@ class collection; template<typename T> class array; -#endif -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES -# define BOOST_TEST_ENABLE_IF std::enable_if -#else -# define BOOST_TEST_ENABLE_IF boost::enable_if_c +template<typename T> +class init_list; + #endif // ************************************************************************** // @@ -74,25 +65,24 @@ class array; template<typename DataSet> struct is_dataset : mpl::false_ {}; +//____________________________________________________________________________// + //! A reference to a dataset is a dataset template<typename DataSet> struct is_dataset<DataSet&> : is_dataset<DataSet> {}; +//____________________________________________________________________________// + //! A const dataset is a dataset template<typename DataSet> struct is_dataset<DataSet const> : is_dataset<DataSet> {}; -//____________________________________________________________________________// - } // namespace monomorphic // ************************************************************************** // // ************** data::make ************** // // ************************************************************************** // -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - - //! @brief Creates a dataset from a value, a collection or an array //! //! This function has several overloads: @@ -113,201 +103,74 @@ struct is_dataset<DataSet const> : is_dataset<DataSet> {}; //! template<typename T, std::size_t size> monomorphic::array<T> make( T (&a)[size] ); //! @endcode template<typename DataSet> -inline typename BOOST_TEST_ENABLE_IF<monomorphic::is_dataset<DataSet>::value,DataSet>::type +inline typename std::enable_if<monomorphic::is_dataset<DataSet>::value,DataSet>::type make(DataSet&& ds) { return std::forward<DataSet>( ds ); } +//____________________________________________________________________________// // warning: doxygen is apparently unable to handle @overload from different files, so if the overloads // below are not declared with @overload in THIS file, they do not appear in the documentation. -// fwrd declaration for singletons //! @overload boost::unit_test::data::make() template<typename T> -inline typename BOOST_TEST_ENABLE_IF<!is_forward_iterable<T>::value && - !monomorphic::is_dataset<T>::value && - !boost::is_array< typename boost::remove_reference<T>::type >::value, - monomorphic::singleton<T> >::type +inline typename std::enable_if<!is_forward_iterable<T>::value && + !monomorphic::is_dataset<T>::value && + !is_array<typename remove_reference<T>::type>::value, + monomorphic::singleton<T>>::type make( T&& v ); +//____________________________________________________________________________// //! @overload boost::unit_test::data::make() template<typename C> -inline typename BOOST_TEST_ENABLE_IF<is_forward_iterable<C>::value, - monomorphic::collection<C> >::type +inline typename std::enable_if<is_forward_iterable<C>::value,monomorphic::collection<C>>::type make( C&& c ); - -#else // !BOOST_NO_CXX11_RVALUE_REFERENCES - -//! @overload boost::unit_test:data::make() -template<typename DataSet> -inline typename BOOST_TEST_ENABLE_IF<monomorphic::is_dataset<DataSet>::value,DataSet const&>::type -make(DataSet const& ds) -{ - return ds; -} - - -// fwrd declaration for singletons -#if !(defined(BOOST_MSVC) && (BOOST_MSVC < 1600)) -//! @overload boost::unit_test::data::make() -template<typename T> -inline typename BOOST_TEST_ENABLE_IF<!is_forward_iterable<T>::value && - !monomorphic::is_dataset<T>::value && - !boost::is_array< typename boost::remove_reference<T>::type >::value, - monomorphic::singleton<T> >::type -make( T const& v ); -#endif - - -// fwrd declaration for collections -//! @overload boost::unit_test::data::make() -template<typename C> -inline typename BOOST_TEST_ENABLE_IF<is_forward_iterable<C>::value, - monomorphic::collection<C> >::type -make( C const& c ); - //____________________________________________________________________________// - - -#endif // !BOOST_NO_CXX11_RVALUE_REFERENCES - - - - -// fwrd declarations //! @overload boost::unit_test::data::make() template<typename T, std::size_t size> inline monomorphic::array< typename boost::remove_const<T>::type > make( T (&a)[size] ); -// apparently some compilers (eg clang-3.4 on linux) have trouble understanding -// the previous line for T being const -//! @overload boost::unit_test::data::make() -template<typename T, std::size_t size> -inline monomorphic::array< typename boost::remove_const<T>::type > -make( T const (&)[size] ); - -template<typename T, std::size_t size> -inline monomorphic::array< typename boost::remove_const<T>::type > -make( T a[size] ); - - +//____________________________________________________________________________// //! @overload boost::unit_test::data::make() inline monomorphic::singleton<char*> make( char* str ); +//____________________________________________________________________________// + //! @overload boost::unit_test::data::make() inline monomorphic::singleton<char const*> make( char const* str ); - - //____________________________________________________________________________// +//! @overload boost::unit_test::data::make() +template<typename T> +inline monomorphic::init_list<T> +make( std::initializer_list<T>&& ); +//____________________________________________________________________________// namespace result_of { -#ifndef BOOST_NO_CXX11_DECLTYPE //! Result of the make call. template<typename DataSet> -struct make -{ - typedef decltype(data::make(boost::declval<DataSet>())) type; -}; -#else - -// explicit specialisation, cumbersome - -template <typename DataSet, typename Enable = void> -struct make; - -template <typename DataSet> -struct make< - DataSet const&, - typename BOOST_TEST_ENABLE_IF<monomorphic::is_dataset<DataSet>::value>::type - > -{ - typedef DataSet const& type; -}; - -template <typename T> -struct make< - T, - typename BOOST_TEST_ENABLE_IF< (!is_forward_iterable<T>::value && - !monomorphic::is_dataset<T>::value && - !boost::is_array< typename boost::remove_reference<T>::type >::value) - >::type - > -{ - typedef monomorphic::singleton<T> type; -}; - -template <typename C> -struct make< - C, - typename BOOST_TEST_ENABLE_IF< is_forward_iterable<C>::value>::type - > -{ - typedef monomorphic::collection<C> type; -}; - -#if 1 -template <typename T, std::size_t size> -struct make<T [size]> -{ - typedef monomorphic::array<typename boost::remove_const<T>::type> type; +struct make { + typedef decltype( data::make( declval<DataSet>() ) ) type; }; -#endif - -template <typename T, std::size_t size> -struct make<T (&)[size]> -{ - typedef monomorphic::array<typename boost::remove_const<T>::type> type; -}; - -template <typename T, std::size_t size> -struct make<T const (&)[size]> -{ - typedef monomorphic::array<typename boost::remove_const<T>::type> type; -}; - -template <> -struct make<char*> -{ - typedef monomorphic::singleton<char*> type; -}; - -template <> -struct make<char const*> -{ - typedef monomorphic::singleton<char const*> type; -}; - -#endif // BOOST_NO_CXX11_DECLTYPE - } // namespace result_of - - - -//____________________________________________________________________________// - } // namespace data } // namespace unit_test } // namespace boost - - - - #include <boost/test/detail/enable_warnings.hpp> #endif // BOOST_TEST_DATA_MONOMORPHIC_FWD_HPP_102212GER |