Subject: [Boost-commit] svn:boost r49041 - in branches/bcbboost/boost/iterator: . detail
From: nicola.musatti_at_[hidden]
Date: 2008-09-29 17:16:40
Author: nmusatti
Date: 2008-09-29 17:16:39 EDT (Mon, 29 Sep 2008)
New Revision: 49041
URL: http://svn.boost.org/trac/boost/changeset/49041
Log:
CodeGear patch
Text files modified:
branches/bcbboost/boost/iterator/detail/config_def.hpp | 2 +-
branches/bcbboost/boost/iterator/indirect_iterator.hpp | 2 +-
branches/bcbboost/boost/iterator/iterator_adaptor.hpp | 9 +++++++--
branches/bcbboost/boost/iterator/iterator_facade.hpp | 3 +--
4 files changed, 10 insertions(+), 6 deletions(-)
Modified: branches/bcbboost/boost/iterator/detail/config_def.hpp
==============================================================================
--- branches/bcbboost/boost/iterator/detail/config_def.hpp (original)
+++ branches/bcbboost/boost/iterator/detail/config_def.hpp 2008-09-29 17:16:39 EDT (Mon, 29 Sep 2008)
@@ -47,7 +47,7 @@
#endif
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
- || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x531)) \
+ || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x5A0)) \
|| (BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700) && defined(_MSC_VER)) \
|| BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(60590042)) \
|| BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
Modified: branches/bcbboost/boost/iterator/indirect_iterator.hpp
==============================================================================
--- branches/bcbboost/boost/iterator/indirect_iterator.hpp (original)
+++ branches/bcbboost/boost/iterator/indirect_iterator.hpp 2008-09-29 17:16:39 EDT (Mon, 29 Sep 2008)
@@ -110,7 +110,7 @@
private:
typename super_t::reference dereference() const
{
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+# if BOOST_WORKAROUND(__BORLANDC__, < 0x5A0 )
return const_cast<super_t::reference>(**this->base());
# else
return **this->base();
Modified: branches/bcbboost/boost/iterator/iterator_adaptor.hpp
==============================================================================
--- branches/bcbboost/boost/iterator/iterator_adaptor.hpp (original)
+++ branches/bcbboost/boost/iterator/iterator_adaptor.hpp 2008-09-29 17:16:39 EDT (Mon, 29 Sep 2008)
@@ -24,9 +24,14 @@
#ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
# include <boost/type_traits/remove_reference.hpp>
-#else
+
+# if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+# include <boost/type_traits/add_reference.hpp>
+# endif
+
+#else
# include <boost/type_traits/add_reference.hpp>
-#endif
+#endif
#include <boost/iterator/detail/config_def.hpp>
Modified: branches/bcbboost/boost/iterator/iterator_facade.hpp
==============================================================================
--- branches/bcbboost/boost/iterator/iterator_facade.hpp (original)
+++ branches/bcbboost/boost/iterator/iterator_facade.hpp 2008-09-29 17:16:39 EDT (Mon, 29 Sep 2008)
@@ -470,8 +470,7 @@
//
class iterator_core_access
{
-# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) \
- || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
// Tasteless as this may seem, making all members public allows member templates
// to work in the absence of member template friends.
public: