feedc0de/boost_mpl
1
0 Fork 0
forked from boostorg/mpl
Code Pull Requests Activity

Revert Stephen Kelly's changes.

Browse Source 
They should really wait until MPL's dependencies have dealt with his
changes.
This commit is contained in:
Daniel James committed 2014-03-25 08:33:44 +00:00
1 parent 27815b8d37
commit db7e720ce1
265 files changed
+36607 -121
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/mpl/vector/aux_/O1_size.hpp
+2
View File
@@ -36,6 +36,7 @@ struct O1_size_impl< aux::vector_tag >
#else
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template< long N >
struct O1_size_impl< aux::vector_tag<N> >
@@ -46,6 +47,7 @@ struct O1_size_impl< aux::vector_tag<N> >
};
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/at.hpp
+8 -6
View File
@@ -18,6 +18,7 @@
#include <boost/mpl/vector/aux_/tag.hpp>
#include <boost/mpl/long.hpp>
#include <boost/mpl/void.hpp>
#include <boost/mpl/aux_/nttp_decl.hpp>
#include <boost/mpl/aux_/type_wrapper.hpp>
#include <boost/mpl/aux_/value_wknd.hpp>
#include <boost/mpl/aux_/config/typeof.hpp>
@@ -55,11 +56,12 @@ struct at_impl< aux::vector_tag >
#else
# if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
&& !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
template< typename Vector, long n_ > struct v_at;
template< typename Vector, BOOST_MPL_AUX_NTTP_DECL(long, n_) > struct v_at;
template< long n_ >
template< BOOST_MPL_AUX_NTTP_DECL(long, n_) >
struct at_impl< aux::vector_tag<n_> >
{
template< typename Vector, typename N > struct apply
@@ -83,7 +85,7 @@ struct at_impl< aux::vector_tag<n_> >
namespace aux {
template< long n_ > struct v_at_impl
template< BOOST_MPL_AUX_NTTP_DECL(long, n_) > struct v_at_impl
{
template< typename V > struct result_;
};
@@ -99,13 +101,13 @@ template<> struct v_at_impl<-1>
} // namespace aux
template< typename T, long n_ >
template< typename T, BOOST_MPL_AUX_NTTP_DECL(long, n_) >
struct v_at
: aux::v_at_impl<n_>::template result_<T>
{
};
# endif // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC
# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/back.hpp
+2
View File
@@ -39,6 +39,7 @@ struct back_impl< aux::vector_tag >
#else
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template< long n_ >
struct back_impl< aux::vector_tag<n_> >
@@ -49,6 +50,7 @@ struct back_impl< aux::vector_tag<n_> >
};
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/clear.hpp
+2
View File
@@ -35,6 +35,7 @@ struct clear_impl< aux::vector_tag >
#else
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template< long N >
struct clear_impl< aux::vector_tag<N> >
@@ -45,6 +46,7 @@ struct clear_impl< aux::vector_tag<N> >
};
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/empty.hpp
+2
View File
@@ -48,6 +48,7 @@ struct empty_impl< aux::vector_tag<0> >
};
};
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template< long N >
struct empty_impl< aux::vector_tag<N> >
@@ -58,6 +59,7 @@ struct empty_impl< aux::vector_tag<N> >
};
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/front.hpp
+4 -1
View File
@@ -17,6 +17,7 @@
#include <boost/mpl/front_fwd.hpp>
#include <boost/mpl/vector/aux_/at.hpp>
#include <boost/mpl/vector/aux_/tag.hpp>
#include <boost/mpl/aux_/nttp_decl.hpp>
#include <boost/mpl/aux_/config/typeof.hpp>
#include <boost/mpl/aux_/config/ctps.hpp>
@@ -35,8 +36,9 @@ struct front_impl< aux::vector_tag >
#else
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template< long n_ >
template< BOOST_MPL_AUX_NTTP_DECL(long, n_) >
struct front_impl< aux::vector_tag<n_> >
{
template< typename Vector > struct apply
@@ -45,6 +47,7 @@ struct front_impl< aux::vector_tag<n_> >
};
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/include_preprocessed.hpp
+2 -1
View File
@@ -23,7 +23,8 @@
#if defined(BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES)
# define AUX778076_INCLUDE_DIR typeof_based
#elif defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
#elif defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
|| defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
# define AUX778076_INCLUDE_DIR no_ctps
#else
# define AUX778076_INCLUDE_DIR plain
include/boost/mpl/vector/aux_/iterator.hpp
+43 -6
View File
@@ -22,6 +22,7 @@
#include <boost/mpl/distance_fwd.hpp>
#include <boost/mpl/next.hpp>
#include <boost/mpl/prior.hpp>
#include <boost/mpl/aux_/nttp_decl.hpp>
#include <boost/mpl/aux_/value_wknd.hpp>
#include <boost/mpl/aux_/config/ctps.hpp>
#include <boost/mpl/aux_/config/workaround.hpp>
@@ -30,7 +31,7 @@ namespace boost { namespace mpl {
template<
typename Vector
, long n_
, BOOST_MPL_AUX_NTTP_DECL(long, n_)
>
struct v_iter
{
@@ -41,14 +42,25 @@ struct v_iter
typedef Vector vector_;
typedef mpl::long_<n_> pos;
#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
enum {
next_ = n_ + 1
, prior_ = n_ - 1
, pos_ = n_
};
typedef v_iter<Vector,next_> next;
typedef v_iter<Vector,prior_> prior;
#endif
};
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template<
typename Vector
, long n_
, BOOST_MPL_AUX_NTTP_DECL(long, n_)
>
struct next< v_iter<Vector,n_> >
{
@@ -57,7 +69,7 @@ struct next< v_iter<Vector,n_> >
template<
typename Vector
, long n_
, BOOST_MPL_AUX_NTTP_DECL(long, n_)
>
struct prior< v_iter<Vector,n_> >
{
@@ -66,7 +78,7 @@ struct prior< v_iter<Vector,n_> >
template<
typename Vector
, long n_
, BOOST_MPL_AUX_NTTP_DECL(long, n_)
, typename Distance
>
struct advance< v_iter<Vector,n_>,Distance>
@@ -79,14 +91,39 @@ struct advance< v_iter<Vector,n_>,Distance>
template<
typename Vector
, long n_
, long m_
, BOOST_MPL_AUX_NTTP_DECL(long, n_)
, BOOST_MPL_AUX_NTTP_DECL(long, m_)
>
struct distance< v_iter<Vector,n_>, v_iter<Vector,m_> >
: mpl::long_<(m_ - n_)>
{
};
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
template<> struct advance_impl<aux::v_iter_tag>
{
template< typename Iterator, typename N > struct apply
{
enum { pos_ = Iterator::pos_, n_ = N::value };
typedef v_iter<
typename Iterator::vector_
, (pos_ + n_)
> type;
};
};
template<> struct distance_impl<aux::v_iter_tag>
{
template< typename Iter1, typename Iter2 > struct apply
{
enum { pos1_ = Iter1::pos_, pos2_ = Iter2::pos_ };
typedef long_<( pos2_ - pos1_ )> type;
BOOST_STATIC_CONSTANT(long, value = ( pos2_ - pos1_ ));
};
};
#endif
}}
include/boost/mpl/vector/aux_/numbered.hpp
+3 -2
View File
@@ -125,7 +125,8 @@ struct pop_back_impl< aux::vector_tag<i_> >
# endif // i_ > 0
# if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
&& !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
template< typename V >
struct v_at<V,i_>
@@ -208,7 +209,7 @@ struct clear_impl< aux::vector_tag<i_> >
};
};
# endif // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC
# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/size.hpp
+2
View File
@@ -32,6 +32,7 @@ struct size_impl< aux::vector_tag >
#else
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template< long N >
struct size_impl< aux::vector_tag<N> >
@@ -39,6 +40,7 @@ struct size_impl< aux::vector_tag<N> >
{
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
#endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES
include/boost/mpl/vector/aux_/tag.hpp
+2 -1
View File
@@ -15,6 +15,7 @@
// $Revision$
#include <boost/mpl/aux_/config/typeof.hpp>
#include <boost/mpl/aux_/nttp_decl.hpp>
namespace boost { namespace mpl { namespace aux {
@@ -23,7 +24,7 @@ struct v_iter_tag;
#if defined(BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES)
struct vector_tag;
#else
template< long N > struct vector_tag;
template< BOOST_MPL_AUX_NTTP_DECL(long, N) > struct vector_tag;
#endif
}}}