Subject: [Boost-commit] svn:boost r86055 - in trunk/boost/iterator: . detail
From: steveire_at_[hidden]
Date: 2013-09-30 11:54:04
Author: skelly
Date: 2013-09-30 11:54:03 EDT (Mon, 30 Sep 2013)
New Revision: 86055
URL: http://svn.boost.org/trac/boost/changeset/86055
Log:
Iterator: Remove obsolete GCC version check.
Text files modified:
trunk/boost/iterator/detail/config_def.hpp | 8 +++-----
trunk/boost/iterator/iterator_traits.hpp | 13 +------------
2 files changed, 4 insertions(+), 17 deletions(-)
Modified: trunk/boost/iterator/detail/config_def.hpp
==============================================================================
--- trunk/boost/iterator/detail/config_def.hpp Mon Sep 30 10:55:28 2013 (r86054)
+++ trunk/boost/iterator/detail/config_def.hpp 2013-09-30 11:54:03 EDT (Mon, 30 Sep 2013) (r86055)
@@ -88,8 +88,7 @@
# define BOOST_NO_IS_CONVERTIBLE // "is_convertible doesn't work for simple types"
#endif
-#if BOOST_WORKAROUND(__GNUC__, == 2) \
- || BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4) && !defined(__EDG_VERSION__) \
+#if BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4) && !defined(__EDG_VERSION__) \
|| BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
# define BOOST_NO_IS_CONVERTIBLE_TEMPLATE // The following program fails to compile:
@@ -122,10 +121,9 @@
# define BOOST_ARG_DEPENDENT_TYPENAME
# endif
-# if BOOST_WORKAROUND(__GNUC__, == 2) && BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(95)) \
- || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-// GCC-2.95 eagerly instantiates templated constructors and conversion
+// GCC-2.95 (obsolete) eagerly instantiates templated constructors and conversion
// operators in convertibility checks, causing premature errors.
//
// Borland's problems are harder to diagnose due to lack of an
Modified: trunk/boost/iterator/iterator_traits.hpp
==============================================================================
--- trunk/boost/iterator/iterator_traits.hpp Mon Sep 30 10:55:28 2013 (r86054)
+++ trunk/boost/iterator/iterator_traits.hpp 2013-09-30 11:54:03 EDT (Mon, 30 Sep 2013) (r86055)
@@ -10,18 +10,7 @@
namespace boost {
-// Unfortunately, g++ 2.95.x chokes when we define a class template
-// iterator_category which has the same name as its
-// std::iterator_category() function, probably due in part to the
-// "std:: is visible globally" hack it uses. Use
-// BOOST_ITERATOR_CATEGORY to write code that's portable to older
-// GCCs.
-
-# if BOOST_WORKAROUND(__GNUC__, <= 2)
-# define BOOST_ITERATOR_CATEGORY iterator_category_
-# else
-# define BOOST_ITERATOR_CATEGORY iterator_category
-# endif
+#define BOOST_ITERATOR_CATEGORY iterator_category
template <class Iterator>