undo erroneous changes in advance_* headers

[SVN r19470]
This commit is contained in:
Aleksey Gurtovoy
2003-08-06 08:33:20 +00:00
parent b842e17901
commit f449ec368c
20 changed files with 79 additions and 167 deletions

View File

@@ -1,9 +1,15 @@
//-----------------------------------------------------------------------------
// boost mpl/aux_/advance_backward.hpp header file
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
// Copyright (c) 2000-02
#if !defined(BOOST_PP_IS_ITERATING)
///// header body
#ifndef BOOST_MPL_AUX_ADVANCE_BACKWARD_HPP_INCLUDED
#define BOOST_MPL_AUX_ADVANCE_BACKWARD_HPP_INCLUDED
// + file: boost/mpl/aux_/advance_backward.hpp
// + last modified: 06/aug/03
// Copyright (c) 2000-03
// Aleksey Gurtovoy
//
// Permission to use, copy, modify, distribute and sell this software
@@ -13,13 +19,8 @@
// supporting documentation. No representations are made about the
// suitability of this software for any purpose. It is provided "as is"
// without express or implied warranty.
#if !defined(BOOST_PP_IS_ITERATING)
///// header body
#ifndef BOOST_MPL_AUX_ADVANCE_BACKWARD_HPP_INCLUDED
#define BOOST_MPL_AUX_ADVANCE_BACKWARD_HPP_INCLUDED
//
// See http://www.boost.org/libs/mpl for documentation.
#include "boost/mpl/aux_/apply.hpp"
#include "boost/mpl/aux_/prior.hpp"
@@ -27,8 +28,8 @@
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
#if !defined(BOOST_MPL_NO_PREPROCESSED_HEADERS) && \
!defined(BOOST_MPL_PREPROCESSING_MODE)
#if !defined(BOOST_MPL_NO_PREPROCESSED_HEADERS) \
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
# define BOOST_MPL_PREPROCESSED_HEADER advance_backward.hpp
# include "boost/mpl/aux_/include_preprocessed.hpp"

View File

@@ -1,9 +1,15 @@
//-----------------------------------------------------------------------------
// boost mpl/aux_/advance_forward.hpp header file
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
// Copyright (c) 2000-02
#if !defined(BOOST_PP_IS_ITERATING)
///// header body
#ifndef BOOST_MPL_AUX_ADVANCE_FORWARD_HPP_INCLUDED
#define BOOST_MPL_AUX_ADVANCE_FORWARD_HPP_INCLUDED
// + file: boost/mpl/aux_/advance_forward.hpp
// + last modified: 06/aug/03
// Copyright (c) 2000-03
// Aleksey Gurtovoy
//
// Permission to use, copy, modify, distribute and sell this software
@@ -13,13 +19,8 @@
// supporting documentation. No representations are made about the
// suitability of this software for any purpose. It is provided "as is"
// without express or implied warranty.
#if !defined(BOOST_PP_IS_ITERATING)
///// header body
#ifndef BOOST_MPL_AUX_ADVANCE_FORWARD_HPP_INCLUDED
#define BOOST_MPL_AUX_ADVANCE_FORWARD_HPP_INCLUDED
//
// See http://www.boost.org/libs/mpl for documentation.
#include "boost/mpl/aux_/apply.hpp"
#include "boost/mpl/aux_/next.hpp"
@@ -27,8 +28,8 @@
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
#if !defined(BOOST_MPL_NO_PREPROCESSED_HEADERS) && \
!defined(BOOST_MPL_PREPROCESSING_MODE)
#if !defined(BOOST_MPL_NO_PREPROCESSED_HEADERS) \
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
# define BOOST_MPL_PREPROCESSED_HEADER advance_forward.hpp
# include "boost/mpl/aux_/include_preprocessed.hpp"

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
{
@@ -15,7 +14,6 @@ struct advance_backward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_backward<1>
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_backward<2>
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_backward<3>
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_backward<4>
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
{
@@ -15,7 +14,6 @@ struct advance_forward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_forward<1>
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_forward<2>
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_forward<3>
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_forward<4>
typedef typename iter3::next iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
{
@@ -15,7 +14,6 @@ struct advance_backward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_backward<1>
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_backward<2>
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_backward<3>
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_backward<4>
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
{
@@ -15,7 +14,6 @@ struct advance_forward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_forward<1>
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_forward<2>
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_forward<3>
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_forward<4>
typedef typename iter3::next iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -5,10 +5,6 @@ namespace boost {
namespace mpl {
namespace aux {
#if !defined(PRIOR)
# define PRIOR(x) x::prior
#endif
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
@@ -26,7 +22,7 @@ struct advance_backward<1>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
@@ -37,8 +33,8 @@ struct advance_backward<2>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename PRIOR(iter1) iter2;
typedef typename iter0::prior iter1;
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
@@ -49,9 +45,9 @@ struct advance_backward<3>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename PRIOR(iter1) iter2;
typedef typename PRIOR(iter2) iter3;
typedef typename iter0::prior iter1;
typedef typename iter1::prior iter2;
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
@@ -62,10 +58,10 @@ struct advance_backward<4>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename PRIOR(iter1) iter2;
typedef typename PRIOR(iter2) iter3;
typedef typename PRIOR(iter3) iter4;
typedef typename iter0::prior iter1;
typedef typename iter1::prior iter2;
typedef typename iter2::prior iter3;
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};

View File

@@ -5,10 +5,6 @@ namespace boost {
namespace mpl {
namespace aux {
#if !defined(NEXT)
# define NEXT(x) x::next
#endif
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
@@ -26,7 +22,7 @@ struct advance_forward<1>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
@@ -37,8 +33,8 @@ struct advance_forward<2>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename NEXT(iter1) iter2;
typedef typename iter0::next iter1;
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
@@ -49,9 +45,9 @@ struct advance_forward<3>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename NEXT(iter1) iter2;
typedef typename NEXT(iter2) iter3;
typedef typename iter0::next iter1;
typedef typename iter1::next iter2;
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
@@ -62,10 +58,10 @@ struct advance_forward<4>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename NEXT(iter1) iter2;
typedef typename NEXT(iter2) iter3;
typedef typename NEXT(iter3) iter4;
typedef typename iter0::next iter1;
typedef typename iter1::next iter2;
typedef typename iter2::next iter3;
typedef typename iter3::next iter4;
typedef iter4 type;
};
};

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< nttp_long N > struct advance_backward;
template<>
struct advance_backward<0>
{

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< nttp_long N > struct advance_forward;
template<>
struct advance_forward<0>
{

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
{
@@ -15,7 +14,6 @@ struct advance_backward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_backward<1>
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_backward<2>
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_backward<3>
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_backward<4>
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
{
@@ -15,7 +14,6 @@ struct advance_forward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_forward<1>
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_forward<2>
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_forward<3>
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_forward<4>
typedef typename iter3::next iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
{
@@ -15,7 +14,6 @@ struct advance_backward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_backward<1>
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_backward<2>
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_backward<3>
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_backward<4>
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
{
@@ -15,7 +14,6 @@ struct advance_forward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_forward<1>
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_forward<2>
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_forward<3>
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_forward<4>
typedef typename iter3::next iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
{
@@ -15,7 +14,6 @@ struct advance_backward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_backward<1>
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_backward<2>
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_backward<3>
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_backward<4>
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
{
@@ -15,7 +14,6 @@ struct advance_forward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_forward<1>
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_forward<2>
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_forward<3>
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_forward<4>
typedef typename iter3::next iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
{
@@ -15,7 +14,6 @@ struct advance_backward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_backward<1>
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_backward<2>
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_backward<3>
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_backward<4>
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -6,7 +6,6 @@ namespace mpl {
namespace aux {
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
{
@@ -15,7 +14,6 @@ struct advance_forward<0>
typedef Iterator iter0;
typedef iter0 type;
};
};
template<>
@@ -27,7 +25,6 @@ struct advance_forward<1>
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
template<>
@@ -40,7 +37,6 @@ struct advance_forward<2>
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
template<>
@@ -54,7 +50,6 @@ struct advance_forward<3>
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
template<>
@@ -69,7 +64,6 @@ struct advance_forward<4>
typedef typename iter3::next iter4;
typedef iter4 type;
};
};
template< long N >

View File

@@ -5,10 +5,6 @@ namespace boost {
namespace mpl {
namespace aux {
#if !defined(PRIOR)
# define PRIOR(x) x::prior
#endif
template< long N > struct advance_backward;
template<>
struct advance_backward<0>
@@ -26,7 +22,7 @@ struct advance_backward<1>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename iter0::prior iter1;
typedef iter1 type;
};
};
@@ -37,8 +33,8 @@ struct advance_backward<2>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename PRIOR(iter1) iter2;
typedef typename iter0::prior iter1;
typedef typename iter1::prior iter2;
typedef iter2 type;
};
};
@@ -49,9 +45,9 @@ struct advance_backward<3>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename PRIOR(iter1) iter2;
typedef typename PRIOR(iter2) iter3;
typedef typename iter0::prior iter1;
typedef typename iter1::prior iter2;
typedef typename iter2::prior iter3;
typedef iter3 type;
};
};
@@ -62,10 +58,10 @@ struct advance_backward<4>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename PRIOR(iter0) iter1;
typedef typename PRIOR(iter1) iter2;
typedef typename PRIOR(iter2) iter3;
typedef typename PRIOR(iter3) iter4;
typedef typename iter0::prior iter1;
typedef typename iter1::prior iter2;
typedef typename iter2::prior iter3;
typedef typename iter3::prior iter4;
typedef iter4 type;
};
};

View File

@@ -5,10 +5,6 @@ namespace boost {
namespace mpl {
namespace aux {
#if !defined(NEXT)
# define NEXT(x) x::next
#endif
template< long N > struct advance_forward;
template<>
struct advance_forward<0>
@@ -26,7 +22,7 @@ struct advance_forward<1>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename iter0::next iter1;
typedef iter1 type;
};
};
@@ -37,8 +33,8 @@ struct advance_forward<2>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename NEXT(iter1) iter2;
typedef typename iter0::next iter1;
typedef typename iter1::next iter2;
typedef iter2 type;
};
};
@@ -49,9 +45,9 @@ struct advance_forward<3>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename NEXT(iter1) iter2;
typedef typename NEXT(iter2) iter3;
typedef typename iter0::next iter1;
typedef typename iter1::next iter2;
typedef typename iter2::next iter3;
typedef iter3 type;
};
};
@@ -62,10 +58,10 @@ struct advance_forward<4>
template< typename Iterator > struct apply
{
typedef Iterator iter0;
typedef typename NEXT(iter0) iter1;
typedef typename NEXT(iter1) iter2;
typedef typename NEXT(iter2) iter3;
typedef typename NEXT(iter3) iter4;
typedef typename iter0::next iter1;
typedef typename iter1::next iter2;
typedef typename iter2::next iter3;
typedef typename iter3::next iter4;
typedef iter4 type;
};
};