diff --git a/include/boost/detail/iterator.hpp b/include/boost/detail/iterator.hpp index 158bcd1..c485a4d 100644 --- a/include/boost/detail/iterator.hpp +++ b/include/boost/detail/iterator.hpp @@ -252,42 +252,6 @@ no_type is_std_iterator_helper(...); template yes_type is_std_iterator_helper(const volatile std::iterator*); -#if 0 && defined(__ICL) // re-enable this to pick up with the Intel C++ fixes where they left off -// for some reason, it's unable to make the deduction of derivation :( -template -yes_type is_std_iterator_helper(const volatile typename std::_Tree::iterator*); -template -yes_type is_std_iterator_helper(const volatile typename std::list::iterator*); -template -yes_type is_std_iterator_helper(const volatile typename std::deque::iterator*); - -template -yes_type is_std_iterator_helper(const volatile typename std::_Tree::const_iterator*); -template -yes_type is_std_iterator_helper(const volatile typename std::list::const_iterator*); -template -yes_type is_std_iterator_helper(const volatile typename std::deque::const_iterator*); - -template -yes_type is_std_iterator_helper(const volatile std::reverse_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::reverse_bidirectional_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::back_insert_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::front_insert_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::insert_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::istream_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::istreambuf_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::ostreambuf_iterator*); -template -yes_type is_std_iterator_helper(const volatile std::raw_storage_iterator*); -#endif - // Is the iterator derived from boost::iterator? template yes_type is_boost_iterator_helper(const volatile boost::iterator*); @@ -307,15 +271,6 @@ template yes_type is_ostream_iterator_helper(const volatile std::ostream_iterator*); no_type is_ostream_iterator_helper(...); -#if 0 && defined(__ICL) -// this static assertion highlights the first of a few problems getting this to -// work with the Intel compiler. We can get past it with the many definitions -// for is_std_iterator_helper above, but there are other failures. -template struct check; -template <> struct check {}; -check<(sizeof(is_std_iterator_helper((std::istream_iterator*)0)) == sizeof(yes_type))> assertion; -#endif - template struct msvc_iterator_classification { BOOST_STATIC_CONSTANT(unsigned,