Subject: [Boost-commit] svn:boost r51418 - in sandbox/mirror/boost/mirror: algorithm/detail intrinsic/detail iterator/detail
From: chochlik_at_[hidden]
Date: 2009-02-23 13:58:03
Author: matus.chochlik
Date: 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
New Revision: 51418
URL: http://svn.boost.org/trac/boost/changeset/51418
Log:
[mirror 0.3.x]
- update of the iterators implementation
Text files modified:
sandbox/mirror/boost/mirror/algorithm/detail/find_if.hpp | 4 ----
sandbox/mirror/boost/mirror/algorithm/detail/reverse_find_if.hpp | 4 ----
sandbox/mirror/boost/mirror/intrinsic/detail/begin.hpp | 4 ----
sandbox/mirror/boost/mirror/intrinsic/detail/end.hpp | 4 ----
sandbox/mirror/boost/mirror/intrinsic/detail/point_to.hpp | 4 ----
sandbox/mirror/boost/mirror/intrinsic/detail/positional.hpp | 15 ++++++---------
sandbox/mirror/boost/mirror/intrinsic/detail/rbegin.hpp | 4 ----
sandbox/mirror/boost/mirror/intrinsic/detail/rend.hpp | 4 ----
sandbox/mirror/boost/mirror/iterator/detail/attribute_iterator.hpp | 9 +++------
sandbox/mirror/boost/mirror/iterator/detail/base_class_iterator.hpp | 8 +++-----
sandbox/mirror/boost/mirror/iterator/detail/common_iterator.hpp | 36 ------------------------------------
sandbox/mirror/boost/mirror/iterator/detail/iterator.hpp | 4 ----
sandbox/mirror/boost/mirror/iterator/detail/iterator_comparison.hpp | 32 +++-----------------------------
sandbox/mirror/boost/mirror/iterator/detail/reverse_iterator.hpp | 6 ------
14 files changed, 15 insertions(+), 123 deletions(-)
Modified: sandbox/mirror/boost/mirror/algorithm/detail/find_if.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/algorithm/detail/find_if.hpp (original)
+++ sandbox/mirror/boost/mirror/algorithm/detail/find_if.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -19,16 +19,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Predicate
>
struct meta_object_find_if
{
typedef typename get_meta_object_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
mpl::int_<0>,
Predicate
Modified: sandbox/mirror/boost/mirror/algorithm/detail/reverse_find_if.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/algorithm/detail/reverse_find_if.hpp (original)
+++ sandbox/mirror/boost/mirror/algorithm/detail/reverse_find_if.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -19,16 +19,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Predicate
>
struct meta_object_reverse_find_if
{
typedef typename get_meta_object_reverse_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
mpl::int_<size<MetaObjectSequence>::value - 1>,
Predicate
Modified: sandbox/mirror/boost/mirror/intrinsic/detail/begin.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/intrinsic/detail/begin.hpp (original)
+++ sandbox/mirror/boost/mirror/intrinsic/detail/begin.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -19,16 +19,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Dummy
>
struct meta_object_sequence_begin
{
typedef typename get_meta_object_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
mpl::int_<0>,
mpl::always<mpl::true_>
Modified: sandbox/mirror/boost/mirror/intrinsic/detail/end.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/intrinsic/detail/end.hpp (original)
+++ sandbox/mirror/boost/mirror/intrinsic/detail/end.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -19,16 +19,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Dummy
>
struct meta_object_sequence_end
{
typedef typename get_meta_object_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
mpl::int_<size<MetaObjectSequence>::value>,
mpl::always<mpl::true_>
Modified: sandbox/mirror/boost/mirror/intrinsic/detail/point_to.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/intrinsic/detail/point_to.hpp (original)
+++ sandbox/mirror/boost/mirror/intrinsic/detail/point_to.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -20,16 +20,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position
>
struct meta_object_sequence_point_to
{
typedef typename get_meta_object_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position,
mpl::always<mpl::true_>
Modified: sandbox/mirror/boost/mirror/intrinsic/detail/positional.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/intrinsic/detail/positional.hpp (original)
+++ sandbox/mirror/boost/mirror/intrinsic/detail/positional.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -25,7 +25,7 @@
template <
class MetaObjectSequence,
class Arg1,
- template <class, class, class, class> class Implementation
+ template <class, class> class Implementation
>
struct position_getter_impl_1 { };
@@ -36,7 +36,7 @@
class Class,
class VariantTag,
class Arg1,
- template <class, class, class, class> class Implementation
+ template <class, class> class Implementation
>
struct position_getter_impl_1<
meta_class_attributes<Class, VariantTag>,
@@ -44,7 +44,6 @@
Implementation
>
: Implementation<
- Class, VariantTag,
meta_class_attributes<Class, VariantTag>,
Arg1
>{ };
@@ -56,7 +55,7 @@
class Class,
class VariantTag,
class Arg1,
- template <class, class, class, class> class Implementation
+ template <class, class> class Implementation
>
struct position_getter_impl_1<
meta_class_all_attributes<Class, VariantTag>,
@@ -64,7 +63,6 @@
Implementation
>
: Implementation<
- Class, VariantTag,
meta_class_all_attributes<Class, VariantTag>,
Arg1
>{ };
@@ -76,7 +74,7 @@
class Class,
class VariantTag,
class Arg1,
- template <class, class, class, class> class Implementation
+ template <class, class> class Implementation
>
struct position_getter_impl_1<
meta_base_classes<Class, VariantTag>,
@@ -84,7 +82,6 @@
Implementation
>
: Implementation<
- Class, VariantTag,
meta_base_classes<Class, VariantTag>,
Arg1
>{ };
@@ -94,7 +91,7 @@
*/
template <
class MetaObjectSequence,
- template <class, class, class, class> class Implementation
+ template <class, class> class Implementation
>
struct position_getter_impl
: position_getter_impl_1<MetaObjectSequence, void, Implementation>
@@ -106,7 +103,7 @@
template <
class MetaObjectSequence,
class Position,
- template <class, class, class, class> class Implementation
+ template <class, class> class Implementation
>
struct explicit_position_getter_impl
: position_getter_impl_1<MetaObjectSequence, Position, Implementation>
Modified: sandbox/mirror/boost/mirror/intrinsic/detail/rbegin.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/intrinsic/detail/rbegin.hpp (original)
+++ sandbox/mirror/boost/mirror/intrinsic/detail/rbegin.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -19,16 +19,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Dummy
>
struct meta_object_sequence_rbegin
{
typedef typename get_meta_object_reverse_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
mpl::int_<size<MetaObjectSequence>::value - 1>,
mpl::always<mpl::true_>
Modified: sandbox/mirror/boost/mirror/intrinsic/detail/rend.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/intrinsic/detail/rend.hpp (original)
+++ sandbox/mirror/boost/mirror/intrinsic/detail/rend.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -19,16 +19,12 @@
namespace detail {
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Dummy
>
struct meta_object_sequence_rend
{
typedef typename get_meta_object_reverse_iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
mpl::int_<-1>,
mpl::always<mpl::true_>
Modified: sandbox/mirror/boost/mirror/iterator/detail/attribute_iterator.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/iterator/detail/attribute_iterator.hpp (original)
+++ sandbox/mirror/boost/mirror/iterator/detail/attribute_iterator.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -12,6 +12,7 @@
#include <boost/mirror/iterator/detail/common_iterator.hpp>
#include <boost/mirror/meta_attributes.hpp>
+#include <boost/mirror/intrinsic/at.hpp>
namespace boost {
namespace mirror {
@@ -20,20 +21,16 @@
struct attribute_iterator_pointee_selector
{
template <
- class ReflectedType,
- class VariantTag,
class MetaAttributes,
class AttribPos,
class UnaryPredicate
>
struct apply
{
- typedef meta_class_attribute<
- ReflectedType,
- VariantTag,
+ typedef typename at<
MetaAttributes,
AttribPos
- > type;
+ >::type type;
};
};
Modified: sandbox/mirror/boost/mirror/iterator/detail/base_class_iterator.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/iterator/detail/base_class_iterator.hpp (original)
+++ sandbox/mirror/boost/mirror/iterator/detail/base_class_iterator.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -21,16 +21,14 @@
/** Iterator for iterating through meta_base_classes
*/
template <
- class _ReflectedType,
- class _VariantTag
+ class ReflectedType,
+ class VariantTag
>
struct iterator_pointee_selector<
- meta_base_classes<_ReflectedType, _VariantTag>
+ meta_base_classes<ReflectedType, VariantTag>
>
{
template <
- class ReflectedType,
- class VariantTag,
class MetaBaseClasses,
class BaseClassPos,
class UnaryPredicate
Modified: sandbox/mirror/boost/mirror/iterator/detail/common_iterator.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/iterator/detail/common_iterator.hpp (original)
+++ sandbox/mirror/boost/mirror/iterator/detail/common_iterator.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -44,8 +44,6 @@
* and a meta-object selector
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position,
class BeginPos,
@@ -59,8 +57,6 @@
/** This allows to get the initial or the next iterator.
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class CurrentPosition,
class BeginPos,
@@ -74,8 +70,6 @@
struct meta_object_iterator_base_templ_get_ioni_apply
{
typedef meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
typename mpl::int_<mpl::plus<
CurrentPosition,
@@ -109,8 +103,6 @@
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class BeginPos,
class BeforeEndPos,
@@ -121,8 +113,6 @@
int I
>
struct meta_object_iterator_base_templ_get_ioni_apply<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
BeforeEndPos,
BeginPos,
@@ -139,8 +129,6 @@
* next iterator.
*/
typedef meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
typename mpl::int_<mpl::plus<
BeforeEndPos,
@@ -158,8 +146,6 @@
};
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class BeginPos,
class BeforeEndPos,
@@ -170,8 +156,6 @@
int I
>
struct meta_object_iterator_base_templ_get_ioni_apply<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
EndPos,
BeginPos,
@@ -184,8 +168,6 @@
>
{
typedef meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
EndPos,
BeginPos,
@@ -205,8 +187,6 @@
* iterators
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position,
class BeginPos,
@@ -230,8 +210,6 @@
// the type meta_class_attribute
// that this iterator points to
typedef typename Selector::template apply<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position,
UnaryPredicate
@@ -245,8 +223,6 @@
struct apply
{
typedef meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
CurrentPosition,
BeginPos,
@@ -265,8 +241,6 @@
struct apply
{
typedef meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
typename mpl::int_<mpl::minus<
CurrentPosition,
@@ -302,8 +276,6 @@
template <typename CurrentPosition>
struct apply : meta_object_iterator_base_templ_get_ioni_apply<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
CurrentPosition,
BeginPos,
@@ -325,8 +297,6 @@
/** Forward iterator base template
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position,
class UnaryPredicate,
@@ -334,8 +304,6 @@
>
struct meta_object_iterator_base
: meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position,
mpl::int_<0>,
@@ -348,8 +316,6 @@
/** Reverse iterator base class
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position,
class UnaryPredicate,
@@ -357,8 +323,6 @@
>
struct meta_object_reverse_iterator_base
: meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position,
mpl::int_<size<MetaObjectSequence>::value -1 >,
Modified: sandbox/mirror/boost/mirror/iterator/detail/iterator.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/iterator/detail/iterator.hpp (original)
+++ sandbox/mirror/boost/mirror/iterator/detail/iterator.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -21,8 +21,6 @@
* and unary predicate.
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position,
class UnaryPredicate
@@ -31,8 +29,6 @@
{
typedef typename mpl::apply<
typename meta_object_iterator_base<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position,
UnaryPredicate,
Modified: sandbox/mirror/boost/mirror/iterator/detail/iterator_comparison.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/iterator/detail/iterator_comparison.hpp (original)
+++ sandbox/mirror/boost/mirror/iterator/detail/iterator_comparison.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -47,8 +47,6 @@
* I2 = meta_object_iterator_base_templ<...>
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position1,
class Position2,
@@ -62,8 +60,6 @@
>
struct compare_iterators<
meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position1,
BeginPos,
@@ -73,8 +69,6 @@
Selector
>,
meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position2,
BeginPos,
@@ -97,9 +91,7 @@
* I2 = meta_object_iterator_base_templ<...>
*/
template <
- template <class, class, class, class, class, class> class Iterator,
- class ReflectedType,
- class VariantTag,
+ template <class, class, class, class> class Iterator,
class MetaObjectSequence,
class Position1,
class Position2,
@@ -113,16 +105,12 @@
>
struct compare_iterators<
Iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position1,
UnaryPredicate1,
Selector
>,
meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position2,
BeginPos,
@@ -144,9 +132,7 @@
* I2 = a concrete Iterator
*/
template <
- template <class, class, class, class, class, class> class Iterator,
- class ReflectedType,
- class VariantTag,
+ template <class, class, class, class> class Iterator,
class MetaObjectSequence,
class Position1,
class Position2,
@@ -160,8 +146,6 @@
>
struct compare_iterators<
meta_object_iterator_base_templ<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position1,
BeginPos,
@@ -171,8 +155,6 @@
Selector
>,
Iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position2,
UnaryPredicate2,
@@ -191,9 +173,7 @@
* I2 = a concrete Iterator
*/
template <
- template <class, class, class, class, class, class> class Iterator,
- class ReflectedType,
- class VariantTag,
+ template <class, class, class, class> class Iterator,
class MetaObjectSequence,
class Position1,
class Position2,
@@ -204,16 +184,12 @@
>
struct compare_iterators<
Iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position1,
UnaryPredicate1,
Selector
>,
Iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position2,
UnaryPredicate2,
@@ -224,8 +200,6 @@
Position1,
Position2,
typename Iterator<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position1,
UnaryPredicate1,
Modified: sandbox/mirror/boost/mirror/iterator/detail/reverse_iterator.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/iterator/detail/reverse_iterator.hpp (original)
+++ sandbox/mirror/boost/mirror/iterator/detail/reverse_iterator.hpp 2009-02-23 13:58:01 EST (Mon, 23 Feb 2009)
@@ -21,8 +21,6 @@
* and unary predicate.
*/
template <
- class ReflectedType,
- class VariantTag,
class MetaObjectSequence,
class Position,
class UnaryPredicate
@@ -31,8 +29,6 @@
{
typedef typename mpl::apply<
typename meta_object_reverse_iterator_base<
- ReflectedType,
- VariantTag,
MetaObjectSequence,
Position,
UnaryPredicate,
@@ -42,8 +38,6 @@
>::type type;
};
-
-
} // namespace detail
} // namespace mirror
} // namespace boost