|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r65724 - sandbox/opaque/boost/opaque
From: vicente.botet_at_[hidden]
Date: 2010-10-02 09:08:28
Author: viboes
Date: 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
New Revision: 65724
URL: http://svn.boost.org/trac/boost/changeset/65724
Log:
Opaque:
* mixins have now only two parameters Final and Base
Text files modified:
sandbox/opaque/boost/opaque/combined_operators.hpp | 80 ++++++++++++++++++++--------------------
sandbox/opaque/boost/opaque/linear_hierarchy.hpp | 12 +++---
sandbox/opaque/boost/opaque/new_class.hpp | 2
sandbox/opaque/boost/opaque/operators.hpp | 65 ++++++++++++++++----------------
sandbox/opaque/boost/opaque/private_opaque_class.hpp | 10 ++--
sandbox/opaque/boost/opaque/private_opaque_type.hpp | 6 +-
sandbox/opaque/boost/opaque/public_opaque_class.hpp | 12 +++---
sandbox/opaque/boost/opaque/public_opaque_type.hpp | 6 +-
8 files changed, 97 insertions(+), 96 deletions(-)
Modified: sandbox/opaque/boost/opaque/combined_operators.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/combined_operators.hpp (original)
+++ sandbox/opaque/boost/opaque/combined_operators.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -26,7 +26,7 @@
template <typename Bool=bool>
struct using_equality_comparable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_EQUALITY_COMPARABLE1(Final,Bool)
};
@@ -45,7 +45,7 @@
template <typename Bool=bool>
struct using_less_than_comparable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_LESS_THAN_COMPARABLE1(Final,Bool)
};
@@ -62,7 +62,7 @@
BOOST_OPAQUE_USING_PLUS(Final)
struct using_addable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_ADDABLE1(Final)
};
@@ -79,7 +79,7 @@
BOOST_OPAQUE_USING_MINUS(Final)
struct using_subtractable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_SUBTRACTABLE1(Final)
};
@@ -98,7 +98,7 @@
BOOST_OPAQUE_USING_MULTIPLY(Final)
struct using_multipliable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_MULTIPLIABLE1(Final)
};
@@ -114,7 +114,7 @@
BOOST_OPAQUE_USING_DIVIDE(Final)
struct using_dividable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_DIVIDABLE1(Final)
};
@@ -131,7 +131,7 @@
BOOST_OPAQUE_USING_MODULUS(Final)
struct using_modable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_MODABLE1(Final)
};
@@ -142,7 +142,7 @@
BOOST_OPAQUE_USING_BITWISE_XOR(Final)
struct using_bitwise_xorable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_BITWISE_XORABLE1(Final)
};
@@ -158,7 +158,7 @@
BOOST_OPAQUE_USING_BITWISE_AND(Final)
struct using_bitwise_andable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_BITWISE_ANDABLE1(Final)
};
@@ -174,7 +174,7 @@
BOOST_OPAQUE_USING_BITWISE_OR(Final)
struct using_bitwise_orable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_BITWISE_ORABLE1(Final)
};
@@ -193,7 +193,7 @@
//~ struct incrementable : boost::incrementable<Final, ope::pre_increment<Final, Base> > {};
struct using_incrementable {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base
{
BOOST_OPAQUE_INCREMENTABLE(Final)
@@ -208,7 +208,7 @@
//~ struct decrementable : boost::decrementable<Final, ope::pre_decrement<Final, Base> > {};
struct using_decrementable {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base
{
BOOST_OPAQUE_DECREMENTABLE(Final)
@@ -220,7 +220,7 @@
BOOST_OPAQUE_USING_LEFT_SHIFT1(Final)
struct using_left_shiftable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base
{
BOOST_OPAQUE_LEFT_SHIFTABLE1(Final)
@@ -232,7 +232,7 @@
BOOST_OPAQUE_USING_RIGHT_SHIFT1(Final)
struct using_right_shiftable1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base
{
BOOST_OPAQUE_RIGHT_SHIFTABLE1(Final)
@@ -247,7 +247,7 @@
template <typename Bool=bool>
struct using_partially_ordered1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : boost::partially_ordered1<Final, Base > {
BOOST_OPAQUE_USING_LESS_THAN(Final,Bool)
};
@@ -260,13 +260,13 @@
template <typename Bool=bool>
struct using_totally_ordered1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_TOTALY_ORDERED1(Final,Bool)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct additive2
//~ : opaque::addable2<T, U
//~ , opaque::subtractable2<T, U, Base
@@ -278,13 +278,13 @@
struct using_additive1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_ADDITIVE1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct multiplicative2
//~ : opaque::multipliable2<T, U
//~ , opaque::dividable2<T, U, Base
@@ -296,13 +296,13 @@
struct using_multiplicative1 {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_MULTIPLICATIVE1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct integer_multiplicative2
//~ : opaque::multiplicative2<T, U
//~ , opaque::modable2<T, U, Base
@@ -314,14 +314,14 @@
struct integer_multiplicative1
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type : Base
{
BOOST_OPAQUE_INTEGER_MULTIPLICATIVE1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct arithmetic2
//~ : opaque::additive2<T, U
//~ , opaque::multiplicative2<T, U, Base
@@ -334,14 +334,14 @@
struct using_arithmetic1
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type : Base
{
BOOST_OPAQUE_ARITHMETIC1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct integer_arithmetic2
//~ : additive2<T, U
//~ , integer_multiplicative2<T, U, Base
@@ -353,14 +353,14 @@
struct using_integer_arithmetic1
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type : Base
{
BOOST_OPAQUE_INTEGER_ARITHMETIC1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct bitwise2
//~ : opaque::xorable2<T, U
//~ , opaque::andable2<T, U
@@ -374,7 +374,7 @@
struct using_bitwise1
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type : Base
{
BOOST_OPAQUE_BITWISE1(Final)
@@ -387,14 +387,14 @@
struct using_unit_steppable
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type : Base
{
BOOST_OPAQUE_UNIT_STEPABLE(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct shiftable2
//~ : opaque::left_shiftable2<T, U
//~ , opaque::right_shiftable2<T, U, Base
@@ -406,14 +406,14 @@
struct using_shiftable1
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type : Base
{
BOOST_OPAQUE_SHIFTABLE1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct ring_operators2
//~ : opaque::additive2<T, U
//~ , opaque::subtractable2_left<T, U
@@ -426,14 +426,14 @@
struct using_ring_operators1
{
- template <class Final, class UT, class Base = base_new_type >
+ template <typename Final, typename Base = base_new_type >
struct type: Base
{
BOOST_OPAQUE_RING1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct ordered_ring_operators2
//~ : opaque::ring_operators2<T, U
//~ , opaque::totally_ordered2<T, U, Base
@@ -446,14 +446,14 @@
template <typename Bool=bool>
struct using_ordered_ring_operators1
{
- template <class Final, class UT, class Base = base_new_type>
+ template <typename Final, typename Base = base_new_type>
struct type : Base
{
BOOST_OPAQUE_ORDERED_RING1(Final,Bool)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct field_operators2
//~ : opaque::ring_operators2<T, U
//~ , opaque::dividable2<T, U
@@ -466,13 +466,13 @@
struct using_field_operators1
{
- template <class Final, class Base = base_new_type>
+ template <typename Final, typename Base = base_new_type>
struct type: Base
{
BOOST_OPAQUE_FIELD1(Final)
};
};
- //~ template <class T, class U, class Base = base_new_type >
+ //~ template <class T, class U, typename Base = base_new_type >
//~ struct ordered_field_operators2
//~ : opaque::field_operators2<T, U
//~ , opaque::totally_ordered2<T, U, Base
@@ -485,7 +485,7 @@
template <typename Bool=bool>
struct using_ordered_field_operators1
{
- template <class Final, class UT, class Base = base_new_type>
+ template <typename Final, typename Base = base_new_type>
struct type : Base
{
BOOST_OPAQUE_ORDERED_FIELD1(Final,Bool)
@@ -495,7 +495,7 @@
}
template <typename T, typename Bool=bool>
struct inherited_from_undelying {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base
{
BOOST_OPAQUE_TOTALY_ORDERED1(Final,Bool)
Modified: sandbox/opaque/boost/opaque/linear_hierarchy.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/linear_hierarchy.hpp (original)
+++ sandbox/opaque/boost/opaque/linear_hierarchy.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -21,23 +21,23 @@
////// implementation //////
namespace detail{
- template<typename Final, typename UT, typename State, typename MetaMixin>
- struct do_inhetit : MetaMixin::template type< Final, UT, State> {
+ template<typename Final, typename State, typename MetaMixin>
+ struct do_inhetit : MetaMixin::template type< Final, State> {
};
- template<typename Final, typename UT>
+ template<typename Final>
struct inherit {
template<typename State, typename MetaMixin>
struct apply{
- typedef do_inhetit< Final, UT, State, MetaMixin> type;
+ typedef do_inhetit< Final, State, MetaMixin> type;
};
};
}
- template<typename MetaMixinSeq, typename Final, typename UT, typename Base>
+ template<typename MetaMixinSeq, typename Final, typename Base>
struct linear_hierarchy {
- typedef typename boost::mpl::fold<MetaMixinSeq, Base, detail::inherit<Final, UT> >::type type;
+ typedef typename boost::mpl::fold<MetaMixinSeq, Base, detail::inherit<Final> >::type type;
};
}
Modified: sandbox/opaque/boost/opaque/new_class.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/new_class.hpp (original)
+++ sandbox/opaque/boost/opaque/new_class.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -20,7 +20,7 @@
class base_new_type {};
template <typename Final, typename T, typename MetaMixinSeq=boost::mpl::vector0<>, typename Base=base_new_type >
- class new_class : public linear_hierarchy<MetaMixinSeq, Final, T, Base>::type
+ class new_class : public linear_hierarchy<MetaMixinSeq, Final, Base>::type
{
public:
typedef T underlying_type;
Modified: sandbox/opaque/boost/opaque/operators.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/operators.hpp (original)
+++ sandbox/opaque/boost/opaque/operators.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -25,7 +25,7 @@
T( const T& );
struct hiding_copy {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_HIDING_COPY(type)
};
@@ -36,7 +36,7 @@
T& operator=(T const&);
struct hiding_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type : Base {
BOOST_OPAQUE_HIDING_ASSIGN(type)
};
@@ -48,8 +48,9 @@
return Final::underlying(this); \
}
+ template <typename UT>
struct using_conversion {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_CONVERSION(Final,UT)
};
@@ -57,7 +58,7 @@
template <typename T>
struct using_conversion_to {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
operator T() const{
return T(Final::underlying(this));
@@ -66,13 +67,14 @@
};
struct using_conversion_safe_bool {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
typedef typename Final::underlying_type const& (Final::*unspecified_bool_type)() const;
operator unspecified_bool_type() const
- { return Final::underlying(this) ? &Final::underlying : 0; }
- //~ BOOST_OPAQUE_USING_CONVERSION(Final,UT)
+ {
+ return Final::underlying(this) ? &Final::underlying : 0;
+ }
};
};
@@ -86,7 +88,7 @@
template <typename Bool=bool>
struct using_less_than {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_LESS_THAN(Final,Bool)
};
@@ -100,7 +102,7 @@
template <typename Bool=bool>
struct using_less_than_equal {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_LESS_THAN_EQUAL(Final,Bool)
};
@@ -114,7 +116,7 @@
template <typename Bool=bool>
struct using_greater_than {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_GREATER_THAN(Final,Bool)
};
@@ -128,7 +130,7 @@
template <typename Bool=bool>
struct using_greater_than_equal {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_GREATER_THAN_EQUAL(Final,Bool)
};
@@ -142,7 +144,7 @@
template <typename Bool=bool>
struct using_equal {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_EQUAL(Final,Bool)
};
@@ -156,7 +158,7 @@
template <typename Bool=bool>
struct using_not_equal {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_NOT_EQUAL(Final,Bool)
};
@@ -170,7 +172,7 @@
}
struct using_plus_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_PLUS_ASSIGN(Final)
};
@@ -184,7 +186,7 @@
}
struct using_minus_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_MINUS_ASSIGN(Final)
};
@@ -198,7 +200,7 @@
}
struct using_multiply_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_MULTIPLY_ASSIGN(Final)
};
@@ -212,7 +214,7 @@
}
struct using_divide_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_DIVIDE_ASSIGN(Final)
};
@@ -226,7 +228,7 @@
}
struct using_modulus_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_MODULUS_ASSIGN(Final)
};
@@ -240,7 +242,7 @@
}
struct using_bitwise_xor_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_BITWISE_XOR_ASSIGN(Final)
};
@@ -254,7 +256,7 @@
}
struct using_bitwise_and_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_BITWISE_AND_ASSIGN(Final)
};
@@ -268,7 +270,7 @@
}
struct using_bitwise_or_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_BITWISE_OR_ASSIGN(Final)
};
@@ -282,7 +284,7 @@
}
struct using_left_shift_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_LEFT_SHIFT_ASSIGN(Final)
};
@@ -300,7 +302,7 @@
}
struct using_left_right_assign {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_RIGHT_SHIFT_ASSIGN(Final)
};
@@ -318,7 +320,7 @@
}
struct using_logical_not {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_LOGICAL_NOT(Final)
};
@@ -336,7 +338,7 @@
}
struct using_unary_plus {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_UNARY_PLUS(Final)
};
@@ -354,7 +356,7 @@
}
struct using_unary_minus {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_UNARY_MINUS(Final)
};
@@ -372,7 +374,7 @@
}
struct using_bitwise_not {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_BITWISE_NOT(Final)
};
@@ -419,7 +421,7 @@
}
struct using_pre_increment {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_PRE_INCREMENT(Final)
};
@@ -437,7 +439,7 @@
}
struct using_pre_decrement {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_PRE_DECREMENT(Final)
};
@@ -456,7 +458,7 @@
}
struct using_post_increment {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_POST_INCREMENT(Final)
};
@@ -475,7 +477,7 @@
}
struct using_post_decrement {
- template <typename Final, typename UT, typename Base>
+ template <typename Final, typename Base>
struct type: Base {
BOOST_OPAQUE_USING_POST_DECREMENT(Final)
};
@@ -561,7 +563,6 @@
}
}
-
}
}
Modified: sandbox/opaque/boost/opaque/private_opaque_class.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/private_opaque_class.hpp (original)
+++ sandbox/opaque/boost/opaque/private_opaque_class.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -23,18 +23,18 @@
namespace boost {
class base_private_opaque_type {};
- template <typename Final, typename T, typename Concepts=boost::mpl::vector0<>, typename Base=base_private_opaque_type>
+ template <typename Final, typename T, typename MetaMixinSeq=boost::mpl::vector0<>, typename Base=base_private_opaque_type>
class private_opaque_class : public
- new_class< Final, T, Concepts,
+ new_class< Final, T, MetaMixinSeq,
transitive_explicit_substituable<base_private_opaque_type>::template type<Final, T,
- typename inherited_from_undelying<T>::template type<Final, T, Base>
+ typename inherited_from_undelying<T>::template type<Final, Base>
>
>
{
typedef
- new_class< Final, T, Concepts,
+ new_class< Final, T, MetaMixinSeq,
transitive_explicit_substituable<base_private_opaque_type>::template type<Final, T,
- typename inherited_from_undelying<T>::template type<Final, T, Base>
+ typename inherited_from_undelying<T>::template type<Final, Base>
>
>
base_type;
Modified: sandbox/opaque/boost/opaque/private_opaque_type.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/private_opaque_type.hpp (original)
+++ sandbox/opaque/boost/opaque/private_opaque_type.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -24,12 +24,12 @@
namespace boost {
- template <typename T, typename Tag=void, typename Concepts=boost::mpl::vector0<>, typename Base=base_private_opaque_type>
+ template <typename T, typename Tag=void, typename MetaMixinSeq=boost::mpl::vector0<>, typename Base=base_private_opaque_type>
class private_opaque_type : public
- private_opaque_class< private_opaque_type<T,Tag,Concepts,Base>, T, Concepts, Base>
+ private_opaque_class< private_opaque_type<T,Tag,MetaMixinSeq,Base>, T, MetaMixinSeq, Base>
{
typedef
- private_opaque_class< private_opaque_type<T,Tag,Concepts,Base>, T, Concepts, Base>
+ private_opaque_class< private_opaque_type<T,Tag,MetaMixinSeq,Base>, T, MetaMixinSeq, Base>
base_type;
protected:
typedef private_opaque_type opaque_type_t;
Modified: sandbox/opaque/boost/opaque/public_opaque_class.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/public_opaque_class.hpp (original)
+++ sandbox/opaque/boost/opaque/public_opaque_class.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -43,7 +43,7 @@
struct transitive_substituable_help {
template <typename Final, typename Base>
struct type : transitive_substituable<BaseClass, UT>::template type<Final,
- typename inherited_from_undelying<UT>::template type<Final, UT, Base>
+ typename inherited_from_undelying<UT>::template type<Final, Base>
>
{
@@ -55,28 +55,28 @@
- template <typename Final, typename T, typename Concepts=boost::mpl::vector0<>, typename Base=base_public_opaque_type>
+ template <typename Final, typename T, typename MetaMixinSeq=boost::mpl::vector0<>, typename Base=base_public_opaque_type>
class public_opaque_class
: public
- new_class< Final, T, Concepts,
+ new_class< Final, T, MetaMixinSeq,
#define COMPILER_WORKS
#if !defined(COMPILER_WORKS)
typename transitive_substituable_help<base_public_opaque_type, T>::template type<Final, Base>
#else
typename transitive_substituable<base_public_opaque_type, T>::template type<Final,
- typename inherited_from_undelying<T>::template type<Final, T, Base>
+ typename inherited_from_undelying<T>::template type<Final, Base>
>
#endif
>
{
typedef
- new_class< Final, T, Concepts,
+ new_class< Final, T, MetaMixinSeq,
#if !defined(COMPILER_WORKS)
typename transitive_substituable_help<base_public_opaque_type, T>::template type<Final, Base>
#else
typename transitive_substituable<base_public_opaque_type, T>::template type<Final,
- typename inherited_from_undelying<T>::template type<Final, T, Base>
+ typename inherited_from_undelying<T>::template type<Final, Base>
>
#endif
>
Modified: sandbox/opaque/boost/opaque/public_opaque_type.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/public_opaque_type.hpp (original)
+++ sandbox/opaque/boost/opaque/public_opaque_type.hpp 2010-10-02 09:08:26 EDT (Sat, 02 Oct 2010)
@@ -26,11 +26,11 @@
namespace boost {
- template <typename T, typename Tag=void, typename Concepts=boost::mpl::vector0<>, typename Base=base_public_opaque_type>
+ template <typename T, typename Tag=void, typename MetaMixinSeq=boost::mpl::vector0<>, typename Base=base_public_opaque_type>
class public_opaque_type
- : public public_opaque_class< public_opaque_type<T,Tag,Concepts,Base>, T, Concepts, Base>
+ : public public_opaque_class< public_opaque_type<T,Tag,MetaMixinSeq,Base>, T, MetaMixinSeq, Base>
{
- typedef public_opaque_class< public_opaque_type<T,Tag,Concepts,Base>, T, Concepts, Base> base_type;
+ typedef public_opaque_class< public_opaque_type<T,Tag,MetaMixinSeq,Base>, T, MetaMixinSeq, Base> base_type;
protected:
typedef public_opaque_type opaque_type_t;
public:
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk