Ticket #9440: intrusive_gcc47_drops_qualifiers.patch

boost/intrusive/pointer_traits.hpp

@@ -257 +257 @@
    {  return dynamic_cast<pointer>(uptr);  }
 };
 
-}  //namespace container {
+namespace detail {
+
+// NOTE: These functions help to alleviate a GCC 4.7.2 bug on Debian Wheezy, when the compiler instantiates
+//       pointer_traits on an incorrect pointer type. The compiler looses const qualifier from the element type
+//       of the pointer (i.e. it instantiates pointer_traits<foo*> instead of pointer_traits<const foo*>).
+template< typename To, typename From >
+inline To static_cast_ptr(From const& p)
+{
+   return pointer_traits< To >::static_cast_from(p);
+}
+
+template< typename To, typename From >
+inline To const_cast_ptr(From const& p)
+{
+   return pointer_traits< To >::const_cast_from(p);
+}
+
+template< typename To, typename From >
+inline To dynamic_cast_ptr(From const& p)
+{
+   return pointer_traits< To >::dynamic_cast_from(p);
+}
+
+template< typename Ptr >
+inline typename pointer_traits< Ptr >::pointer pointer_to(typename pointer_traits< Ptr >::reference obj)
+{
+   return pointer_traits< Ptr >::pointer_to(obj);
+}
+
+}  //namespace detail {
+}  //namespace intrusive {
 }  //namespace boost {
 
 #include <boost/intrusive/detail/config_end.hpp>

boost/intrusive/detail/list_node.hpp

@@ -109 +109 @@
    {  members_.nodeptr_ = node;  return static_cast<list_iterator&>(*this);  }
 
    const_real_value_traits_ptr get_real_value_traits() const
-   {  return pointer_traits<const_real_value_traits_ptr>::static_cast_from(members_.get_ptr()); }
+   {  return boost::intrusive::detail::static_cast_ptr<const_real_value_traits_ptr>(members_.get_ptr());  }
 
    public:
    list_iterator& operator++()

boost/intrusive/detail/slist_node.hpp

@@ -98 +98 @@
    {  members_.nodeptr_ = node;  return static_cast<slist_iterator&>(*this);  }
 
    const_real_value_traits_ptr get_real_value_traits() const
-   {  return pointer_traits<const_real_value_traits_ptr>::static_cast_from(members_.get_ptr()); }
+   {  return boost::intrusive::detail::static_cast_ptr<const_real_value_traits_ptr>(members_.get_ptr()); }
 
    public:
    slist_iterator& operator++()

boost/intrusive/detail/tree_node.hpp

@@ -165 +165 @@
 
    const_real_value_traits_ptr get_real_value_traits() const
    {
-      return pointer_traits<const_real_value_traits_ptr>::static_cast_from(members_.get_ptr());
+      return boost::intrusive::detail::static_cast_ptr<const_real_value_traits_ptr>(members_.get_ptr());
    }
 
    tree_iterator end_iterator_from_it() const

boost/intrusive/list.hpp

@@ -180 +180 @@
    typedef typename pointer_traits<node_ptr>::template rebind_pointer<real_value_traits const>::type const_real_value_traits_ptr;
 
    const_real_value_traits_ptr real_value_traits_ptr() const
-   {  return pointer_traits<const_real_value_traits_ptr>::pointer_to(this->get_real_value_traits());  }
+   {  return boost::intrusive::detail::pointer_to<const_real_value_traits_ptr>(this->get_real_value_traits());  }
 
    //! <b>Effects</b>: constructs an empty list.
    //!

boost/intrusive/slist.hpp

@@ -271 +271 @@
    typedef typename pointer_traits<node_ptr>::template rebind_pointer<const real_value_traits>::type const_real_value_traits_ptr;
 
    const_real_value_traits_ptr real_value_traits_ptr() const
-   {  return pointer_traits<const_real_value_traits_ptr>::pointer_to(this->get_real_value_traits());  }
+   {  return boost::intrusive::detail::pointer_to<const_real_value_traits_ptr>(this->get_real_value_traits());  }
 
    public:
 

boost/intrusive/bstree.hpp

@@ -103 +103 @@
    typedef typename pointer_traits<node_ptr>::template rebind_pointer<const real_value_traits>::type const_real_value_traits_ptr;
 
    const_real_value_traits_ptr real_value_traits_ptr() const
-   {  return pointer_traits<const_real_value_traits_ptr>::pointer_to(this->get_real_value_traits());  }
+   {  return boost::intrusive::detail::pointer_to<const_real_value_traits_ptr>(this->get_real_value_traits());  }
 
 
    typedef tree_iterator<real_value_traits, false> iterator;

boost/intrusive/hashtable.hpp

@@ -557 +557 @@
       template rebind_pointer<const real_value_traits>::type const_real_value_traits_ptr;
 
    const_real_value_traits_ptr real_value_traits_ptr() const
-   {  return pointer_traits<const_real_value_traits_ptr>::pointer_to(this->priv_real_value_traits());  }
+   {  return boost::intrusive::detail::pointer_to<const_real_value_traits_ptr>(this->priv_real_value_traits());  }
 
    //real_bucket_traits
    //