diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index 6adab0e..c9c6197 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -1,59 +1,20 @@ -// iterator.hpp workarounds for non-conforming standard libraries ---------// - // (C) Copyright Beman Dawes 2000. Distributed under the Boost // Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// See http://www.boost.org/libs/utility for documentation. - -// Revision History -// 12 Jan 01 added for std::ptrdiff_t (Jens Maurer) -// 28 Jun 00 Workarounds to deal with known MSVC bugs (David Abrahams) -// 26 Jun 00 Initial version (Jeremy Siek) - #ifndef BOOST_ITERATOR_HPP #define BOOST_ITERATOR_HPP +// This header is obsolete and will be deprecated. + #include #include // std::ptrdiff_t -#include namespace boost { -# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) - template - struct iterator - { - typedef T value_type; - typedef Distance difference_type; - typedef Pointer pointer; - typedef Reference reference; - typedef Category iterator_category; - }; -# else - // declare iterator_base in namespace detail to work around MSVC bugs which - // prevent derivation from an identically-named class in a different namespace. - namespace detail { - template -# if !defined(BOOST_MSVC_STD_ITERATOR) - struct iterator_base : std::iterator {}; -# else - struct iterator_base : std::iterator - { - typedef Reference reference; - typedef Pointer pointer; - typedef Distance difference_type; - }; -# endif - } +using std::iterator; - template - struct iterator : boost::detail::iterator_base {}; -# endif } // namespace boost #endif // BOOST_ITERATOR_HPP