feedc0de/boost_iterator
1
0
Fork 0
forked from boostorg/iterator
Code Pull Requests Activity

*** empty log message ***

Browse Source 
[SVN r11609]
This commit is contained in:
Jeremy Siek
2001-11-06 15:28:04 +00:00
parent e60df6ad92
commit e162a75e53
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/iterator_adaptors.hpp
View File

@ -116,7 +116,6 @@
# include <boost/type_traits.hpp> # include <boost/type_traits.hpp>
# include <boost/detail/iterator.hpp> # include <boost/detail/iterator.hpp>
# include <boost/detail/select_type.hpp> # include <boost/detail/select_type.hpp>
# include <boost/pending/ct_if.hpp>
// I was having some problems with VC6. I couldn't tell whether our hack for // I was having some problems with VC6. I couldn't tell whether our hack for
// stock GCC was causing problems so I needed an easy way to turn it on and // stock GCC was causing problems so I needed an easy way to turn it on and
@ -554,7 +553,7 @@ namespace detail {
// An associative list is a list of key-value pairs. The list is // An associative list is a list of key-value pairs. The list is
// built out of cons_type's and is terminated by end_of_list. // built out of cons_type's and is terminated by end_of_list.
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(__BORLANDC__)
template <class AssocList, class Key> template <class AssocList, class Key>
struct find_param; struct find_param;
@ -563,8 +562,8 @@ namespace detail {
typedef typename AssocList::first_type Head; typedef typename AssocList::first_type Head;
typedef typename Head::first_type Key1; typedef typename Head::first_type Key1;
typedef typename Head::second_type Value; typedef typename Head::second_type Value;
typedef typename ct_if<is_same<Key1, Key2>::value, typedef typename if_true<(is_same<Key1, Key2>::value)>::template
Value, then<Value,
typename find_param<typename AssocList::second_type, Key2>::type typename find_param<typename AssocList::second_type, Key2>::type
>::type type; >::type type;
}; };
@ -628,7 +627,8 @@ namespace detail {
template <class Key, class Value> template <class Key, class Value>
struct make_arg { struct make_arg {
enum { is_named = is_named_parameter<Value>::value }; enum { is_named = is_named_parameter<Value>::value };
typedef typename ct_if<is_named, make_named_arg, make_key_value>::type Make; typedef typename if_true<(is_named)>::template
then<make_named_arg, make_key_value>::type Make;
typedef typename Make::template select<Key, Value>::type type; typedef typename Make::template select<Key, Value>::type type;
}; };