From 7ca44dba1e528f6b5973723f76f0209c884e1b8d Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Fri, 7 Jul 2000 16:04:40 +0000 Subject: [PATCH 1/7] This commit was generated by cvs2svn to compensate for changes in r4, which included commits to RCS files with non-trunk default branches. [SVN r7621] --- include/boost/iterator.hpp | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 include/boost/iterator.hpp diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp new file mode 100644 index 0000000..82d555b --- /dev/null +++ b/include/boost/iterator.hpp @@ -0,0 +1,58 @@ +// integer.hpp workarounds for non-conforming standard libraries -----------// + +// (C) Copyright Boost.org 2000. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version including documentation. + +// Revision History +// 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 + +#include +#include + +namespace boost +{ +# ifdef BOOST_NO_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 + } + + template + struct iterator : detail::iterator_base {}; +# endif +} // namespace boost + +#endif // BOOST_ITERATOR_HPP From e6071f14943c01b5eb7af8d56df4b684b79ff865 Mon Sep 17 00:00:00 2001 From: Jens Maurer Date: Fri, 12 Jan 2001 18:50:21 +0000 Subject: [PATCH 2/7] added for std::ptrdiff_t [SVN r8562] --- include/boost/iterator.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index 82d555b..34e4e4b 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -1,4 +1,4 @@ -// integer.hpp workarounds for non-conforming standard libraries -----------// +// interator.hpp workarounds for non-conforming standard libraries ---------// // (C) Copyright Boost.org 2000. Permission to copy, use, modify, sell and // distribute this software is granted provided this copyright notice appears @@ -8,6 +8,7 @@ // See http://www.boost.org for most recent version including 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) @@ -15,6 +16,7 @@ #define BOOST_ITERATOR_HPP #include +#include // std::ptrdiff_t #include namespace boost From 7513dcde9fb3cd143fae857085c21e4d665f8cfc Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 18 Sep 2001 11:13:39 +0000 Subject: [PATCH 3/7] commit of split-config, including any changes required to existing libraries (mainly regex). [SVN r11138] --- include/boost/iterator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index 34e4e4b..0e2ef72 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -21,7 +21,7 @@ namespace boost { -# ifdef BOOST_NO_STD_ITERATOR +# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) template From 7e01ca5cf3d769371211f48b7ab13273fe8597c0 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Fri, 27 Dec 2002 16:51:53 +0000 Subject: [PATCH 4/7] add or update See www.boost.org comments [SVN r16708] --- include/boost/iterator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index 0e2ef72..8b82097 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -5,7 +5,7 @@ // in all copies. This software is provided "as is" without express or implied // warranty, and with no claim as to its suitability for any purpose. -// See http://www.boost.org for most recent version including documentation. +// See http://www.boost.org/libs/utility for documentation. // Revision History // 12 Jan 01 added for std::ptrdiff_t (Jens Maurer) From fe35fcb12b9062f8f14ca7ba54755e4d2ffe689f Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 10 Aug 2004 12:53:34 +0000 Subject: [PATCH 5/7] Removed Boost.org copyrights and replaced with originating authors copyright instead. [SVN r24372] --- include/boost/iterator.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index 8b82097..d3844e7 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -1,9 +1,8 @@ // interator.hpp workarounds for non-conforming standard libraries ---------// -// (C) Copyright Boost.org 2000. Permission to copy, use, modify, sell and -// distribute this software is granted provided this copyright notice appears -// in all copies. This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. +// (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. From c05480e0fae3e4457abb1ab2dd559f208e9b2168 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 30 Aug 2005 10:44:32 +0000 Subject: [PATCH 6/7] Qualify boost::detail [SVN r30736] --- include/boost/iterator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index d3844e7..a43cfe1 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -52,7 +52,7 @@ namespace boost template - struct iterator : detail::iterator_base {}; + struct iterator : boost::detail::iterator_base {}; # endif } // namespace boost From 0436a5bb54be434000fce031786eacab7b3ecd3f Mon Sep 17 00:00:00 2001 From: Jeremiah Willcock Date: Wed, 9 Jun 2010 01:13:28 +0000 Subject: [PATCH 7/7] Fixed #3434 [SVN r62626] --- include/boost/iterator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/iterator.hpp b/include/boost/iterator.hpp index a43cfe1..6adab0e 100644 --- a/include/boost/iterator.hpp +++ b/include/boost/iterator.hpp @@ -1,4 +1,4 @@ -// interator.hpp workarounds for non-conforming standard libraries ---------// +// 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