mirror of
https://github.com/boostorg/detail.git
synced 2025-07-30 12:27:15 +02:00
removed use of yes_type/no_type, not needed for borland workaround
[SVN r9507]
This commit is contained in:
@ -8,7 +8,6 @@
|
|||||||
#define BOOST_DETAIL_NAMED_TEMPLATE_PARAMS_HPP
|
#define BOOST_DETAIL_NAMED_TEMPLATE_PARAMS_HPP
|
||||||
|
|
||||||
#include <boost/type_traits/conversion_traits.hpp>
|
#include <boost/type_traits/conversion_traits.hpp>
|
||||||
#include <boost/type_traits/ice.hpp>
|
|
||||||
|
|
||||||
namespace boost {
|
namespace boost {
|
||||||
namespace detail {
|
namespace detail {
|
||||||
@ -27,14 +26,8 @@ namespace boost {
|
|||||||
typedef detail::dummy_default_gen type;
|
typedef detail::dummy_default_gen type;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class T> struct is_default {
|
template <class T> struct is_default { enum { value = false }; };
|
||||||
enum { value = false };
|
template <> struct is_default<default_argument> { enum { value = true }; };
|
||||||
typedef boost::type_traits::no_type type;
|
|
||||||
};
|
|
||||||
template <> struct is_default<default_argument> {
|
|
||||||
enum { value = true };
|
|
||||||
typedef boost::type_traits::yes_type type;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct choose_default {
|
struct choose_default {
|
||||||
template <class Arg, class DefaultGen, class Base, class Traits>
|
template <class Arg, class DefaultGen, class Base, class Traits>
|
||||||
@ -49,18 +42,17 @@ namespace boost {
|
|||||||
typedef Arg type;
|
typedef Arg type;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
template <class UseDefault>
|
template <bool UseDefault>
|
||||||
struct choose_arg_or_default { typedef choose_arg type; };
|
struct choose_arg_or_default { typedef choose_arg type; };
|
||||||
template <>
|
template <>
|
||||||
struct choose_arg_or_default<boost::type_traits::yes_type> {
|
struct choose_arg_or_default<true> {
|
||||||
typedef choose_default type;
|
typedef choose_default type;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class Arg, class DefaultGen, class Base, class Traits>
|
template <class Arg, class DefaultGen, class Base, class Traits>
|
||||||
class resolve_default {
|
class resolve_default {
|
||||||
typedef typename choose_arg_or_default<
|
enum { is_def = is_default<Arg>::value };
|
||||||
is_default<Arg>::type
|
typedef typename choose_arg_or_default<is_def>::type Selector;
|
||||||
>::type Selector;
|
|
||||||
public:
|
public:
|
||||||
typedef typename Selector
|
typedef typename Selector
|
||||||
::template bind<Arg, DefaultGen, Base, Traits>::type type;
|
::template bind<Arg, DefaultGen, Base, Traits>::type type;
|
||||||
|
Reference in New Issue
Block a user