Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76222 - trunk/libs/interprocess/test
From: igaztanaga_at_[hidden]
Date: 2011-12-30 04:00:52


Author: igaztanaga
Date: 2011-12-30 04:00:51 EST (Fri, 30 Dec 2011)
New Revision: 76222
URL: http://svn.boost.org/trac/boost/changeset/76222

Log:
Replaced pointer_to_other with pointer_traits
Text files modified:
   trunk/libs/interprocess/test/allocator_v1.hpp | 28 +++++++++++++++++-----------
   trunk/libs/interprocess/test/heap_allocator_v1.hpp | 25 ++++++++++++++-----------
   2 files changed, 31 insertions(+), 22 deletions(-)

Modified: trunk/libs/interprocess/test/allocator_v1.hpp
==============================================================================
--- trunk/libs/interprocess/test/allocator_v1.hpp (original)
+++ trunk/libs/interprocess/test/allocator_v1.hpp 2011-12-30 04:00:51 EST (Fri, 30 Dec 2011)
@@ -18,7 +18,7 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
 
-#include <boost/pointer_to_other.hpp>
+#include <boost/intrusive/pointer_traits.hpp>
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/interprocess/containers/allocation_type.hpp>
@@ -50,12 +50,13 @@
    typedef SegmentManager segment_manager;
    typedef typename segment_manager::void_pointer aux_pointer_t;
 
- typedef typename
- boost::pointer_to_other
- <aux_pointer_t, const void>::type cvoid_ptr;
-
- typedef typename boost::pointer_to_other
- <cvoid_ptr, segment_manager>::type alloc_ptr_t;
+ typedef typename boost::intrusive::
+ pointer_traits<aux_pointer_t>::template
+ rebind_pointer<const void>::type cvoid_ptr;
+
+ typedef typename boost::intrusive::
+ pointer_traits<cvoid_ptr>::template
+ rebind_pointer<segment_manager>::type alloc_ptr_t;
 
    template<class T2, class SegmentManager2>
    allocator_v1& operator=(const allocator_v1<T2, SegmentManager2>&);
@@ -66,10 +67,15 @@
 
  public:
    typedef T value_type;
- typedef typename boost::pointer_to_other
- <cvoid_ptr, T>::type pointer;
- typedef typename boost::
- pointer_to_other<pointer, const T>::type const_pointer;
+
+ typedef typename boost::intrusive::
+ pointer_traits<cvoid_ptr>::template
+ rebind_pointer<T>::type pointer;
+
+ typedef typename boost::intrusive::
+ pointer_traits<cvoid_ptr>::template
+ rebind_pointer<const T>::type const_pointer;
+
    typedef typename ipcdetail::add_reference
                      <value_type>::type reference;
    typedef typename ipcdetail::add_reference

Modified: trunk/libs/interprocess/test/heap_allocator_v1.hpp
==============================================================================
--- trunk/libs/interprocess/test/heap_allocator_v1.hpp (original)
+++ trunk/libs/interprocess/test/heap_allocator_v1.hpp 2011-12-30 04:00:51 EST (Fri, 30 Dec 2011)
@@ -18,7 +18,7 @@
 #include <boost/interprocess/detail/config_begin.hpp>
 #include <boost/interprocess/detail/workaround.hpp>
 
-#include <boost/pointer_to_other.hpp>
+#include <boost/intrusive/pointer_traits.hpp>
 
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/interprocess/containers/allocation_type.hpp>
@@ -50,12 +50,13 @@
    typedef SegmentManager segment_manager;
    typedef typename segment_manager::void_pointer aux_pointer_t;
 
- typedef typename
- boost::pointer_to_other
- <aux_pointer_t, const void>::type cvoid_ptr;
-
- typedef typename boost::pointer_to_other
- <cvoid_ptr, segment_manager>::type alloc_ptr_t;
+ typedef typename boost::intrusive::
+ pointer_traits<aux_pointer_t>::template
+ rebind_pointer<const void>::type cvoid_ptr;
+
+ typedef typename boost::intrusive::
+ pointer_traits<cvoid_ptr>::template
+ rebind_pointer<segment_manager>::type alloc_ptr_t;
 
    template<class T2, class SegmentManager2>
    heap_allocator_v1& operator=(const heap_allocator_v1<T2, SegmentManager2>&);
@@ -66,10 +67,12 @@
 
  public:
    typedef T value_type;
- typedef typename boost::pointer_to_other
- <cvoid_ptr, T>::type pointer;
- typedef typename boost::
- pointer_to_other<pointer, const T>::type const_pointer;
+ typedef typename boost::intrusive::
+ pointer_traits<cvoid_ptr>::template
+ rebind_pointer<T>::type pointer;
+ typedef typename boost::intrusive::
+ pointer_traits<cvoid_ptr>::template
+ rebind_pointer<const T>::type const_pointer;
    typedef typename ipcdetail::add_reference
                      <value_type>::type reference;
    typedef typename ipcdetail::add_reference


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk