boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-23 09:07:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove evil numbered_vector_tag.

Browse Source
This commit is contained in:
Kohei Takahashi
2015-06-30 01:28:01 +09:00
parent 62d9833bbf
commit 298eeef9c9
4 changed files with 16 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/fusion/container/generation/make_vector.hpp
View File

@ -36,7 +36,7 @@ namespace boost { namespace fusion
template <typename... U> template <typename... U>
struct trim_void<vector<U...> > struct trim_void<vector<U...> >
{ {
typedef vector<numbered_vector_tag<sizeof...(U)>, U...> type; typedef vector<U...> type;
}; };
template <typename... U, typename... Tail> template <typename... U, typename... Tail>

5
include/boost/fusion/container/vector/detail/as_vector.hpp
View File

@ -1,5 +1,5 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2014 Kohei Takahashi Copyright (c) 2014-2015 Kohei Takahashi
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -41,8 +41,7 @@ BOOST_FUSION_BARRIER_BEGIN
struct apply struct apply
{ {
typedef vector< typedef vector<
numbered_vector_tag<sizeof...(Indices)> typename result_of::value_of<
, typename result_of::value_of<
typename result_of::advance_c<Iterator, Indices>::type typename result_of::advance_c<Iterator, Indices>::type
>::type... >::type...
> type; > type;

56
include/boost/fusion/container/vector/vector.hpp
View File

@ -34,7 +34,6 @@
#include <boost/fusion/iterator/advance.hpp> #include <boost/fusion/iterator/advance.hpp>
#include <boost/fusion/iterator/deref.hpp> #include <boost/fusion/iterator/deref.hpp>
#include <boost/core/enable_if.hpp> #include <boost/core/enable_if.hpp>
#include <boost/static_assert.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
@ -254,33 +253,11 @@ namespace boost { namespace fusion
} }
}; };
// Internal use only specialization for implementing vectorN.
// Simple aliasing (like a using vectorN = vector<T...>) will cause specialization confliction
// like following.
//
// template <typename> struct SomeClass;
// template <typename T> struct SomeClass<vector<T>> { ... };
// template <typename T>
// struct SomeClass<vector1<T>> // Error, since vector<T> and vector1<T> are exact same type.
// { ... };
//
// Introducing `numbered_vector_tag` will resolve such specialization error.
//
// template <typename T>
// struct SomeClass<vector<T>> { ... };
// template <typename T>
// struct SomeClass<vector1<T>> // OK
// { ... };
//
// // Same meaning as above specialization.
// template <typename T>
// struct SomeClass<vector<numbered_vector_tag<1>, T>>
// { ... };
template <typename V, typename... T> template <typename V, typename... T>
struct construct_vector_; struct trim_void_;
template <typename... T> template <typename... T>
struct construct_vector_<vector<T...> > struct trim_void_<vector<T...> >
{ {
typedef vector_data< typedef vector_data<
typename detail::make_index_sequence<sizeof...(T)>::type typename detail::make_index_sequence<sizeof...(T)>::type
@ -288,35 +265,24 @@ namespace boost { namespace fusion
> type; > type;
}; };
template <std::size_t N, typename... T> template <typename... T, typename... Tail>
struct construct_vector_<vector<numbered_vector_tag<N>, T...> > struct trim_void_<vector<T...>, void_, Tail...>
{ : trim_void_<vector<T...> > {};
typedef vector_data<
typename detail::make_index_sequence<sizeof...(T)>::type
, T...
> type;
BOOST_STATIC_ASSERT((type::size::value == N)); template <typename... T, typename Head, typename... Tail>
}; struct trim_void_<vector<T...>, Head, Tail...>
: trim_void_<vector<T..., Head>, Tail...> {};
template <typename... U, typename... Tail>
struct construct_vector_<vector<U...>, void_, Tail...>
: construct_vector_<vector<U...> > {};
template <typename... U, typename Head, typename... Tail>
struct construct_vector_<vector<U...>, Head, Tail...>
: construct_vector_<vector<U..., Head>, Tail...> {};
template <typename... T> template <typename... T>
struct construct_vector : construct_vector_<vector<>, T...> {}; struct trim_void : trim_void_<vector<>, T...> {};
} // namespace boost::fusion::vector_detail } // namespace boost::fusion::vector_detail
// This class provides backward compatibility: vector<T, ..., void_, void_, ...>. // This class provides backward compatibility: vector<T, ..., void_, void_, ...>.
template <typename... T> template <typename... T>
struct vector struct vector
: vector_detail::construct_vector<T...>::type : vector_detail::trim_void<T...>::type
{ {
typedef typename vector_detail::construct_vector<T...>::type base; typedef typename vector_detail::trim_void<T...>::type base;
BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
vector() vector()

8
include/boost/fusion/container/vector/vector_fwd.hpp
View File

@ -1,5 +1,5 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2014 Kohei Takahashi Copyright (c) 2014-2015 Kohei Takahashi
Distributed under the Boost Software License, Version 1.0. (See accompanying 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) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -23,19 +23,15 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/repetition/repeat.hpp> #include <boost/preprocessor/repetition/repeat.hpp>
#include <cstddef>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
template <typename ...T> template <typename ...T>
struct vector; struct vector;
template <std::size_t N>
struct numbered_vector_tag;
#define FUSION_VECTOR_N_ALIASES(z, N, d) \ #define FUSION_VECTOR_N_ALIASES(z, N, d) \
template <typename ...T> \ template <typename ...T> \
using BOOST_PP_CAT(vector, N) = vector<numbered_vector_tag<N>, T...>; using BOOST_PP_CAT(vector, N) = vector<T...>;
BOOST_PP_REPEAT(51, FUSION_VECTOR_N_ALIASES, ~) BOOST_PP_REPEAT(51, FUSION_VECTOR_N_ALIASES, ~)