bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

intrusive_set_external_comparator: avoid using boost::intrusive::value_traits_pointers

Browse Source 
boost::intrusive::value_traits_pointers was introduced in boost 1.56, while
we also support boost 1.55.  Replace with an equivalent expression.

(with additions by Asias)

Message-Id: <20170110084700.19994-1-avi@scylladb.com>
This commit is contained in:
Avi Kivity
2017-01-10 10:47:00 +02:00
parent 3d0217ec43
commit 1ff0eef0a8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intrusive_set_external_comparator.hh
View File

@@ -29,6 +29,7 @@
#pragma once
#include <boost/intrusive/set.hpp>
#include <iterator>
namespace bi = boost::intrusive;
@@ -53,8 +54,8 @@ public:
typedef Elem value_type;
typedef typename bi::tree_iterator<value_traits, false> iterator;
typedef typename bi::tree_iterator<value_traits, true> const_iterator;
typedef typename bi::reverse_iterator<iterator> reverse_iterator;
typedef typename bi::reverse_iterator<const_iterator> const_reverse_iterator;
typedef typename std::reverse_iterator<iterator> reverse_iterator;
typedef typename std::reverse_iterator<const_iterator> const_reverse_iterator;
private:
intrusive_set_external_comparator_member_hook _header;
@@ -87,7 +88,7 @@ private:
}
};
typedef typename bi::value_traits_pointers<value_traits>::const_value_traits_ptr const_value_traits_ptr;
using const_value_traits_ptr = typename std::pointer_traits<typename value_traits::node_ptr>::template rebind<const value_traits>;
const_value_traits_ptr priv_value_traits_ptr() const {
return bi::pointer_traits<const_value_traits_ptr>::pointer_to(_value_traits);