feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

Use intrusive utilities instead of boost utilities to limit dependencies.

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-08-02 10:13:54 +02:00
parent c8f0271ab3
commit ddafb2d4ef
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/intrusive/bstree.hpp
View File

@@ -77,7 +77,7 @@ struct bstbase3
static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value; static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value;
static const bool stateful_value_traits = detail::is_stateful_value_traits<value_traits>::value; static const bool stateful_value_traits = detail::is_stateful_value_traits<value_traits>::value;
static const bool has_container_from_iterator = static const bool has_container_from_iterator =
boost::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value; detail::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value;
struct holder_t : public ValueTraits struct holder_t : public ValueTraits
{ {

2
include/boost/intrusive/list.hpp
View File

@@ -88,7 +88,7 @@ class list_impl
static const bool constant_time_size = ConstantTimeSize; static const bool constant_time_size = ConstantTimeSize;
static const bool stateful_value_traits = detail::is_stateful_value_traits<value_traits>::value; static const bool stateful_value_traits = detail::is_stateful_value_traits<value_traits>::value;
static const bool has_container_from_iterator = static const bool has_container_from_iterator =
boost::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value; detail::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value;
/// @cond /// @cond

3
include/boost/intrusive/slist.hpp
View File

@@ -25,6 +25,7 @@
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
#include <boost/intrusive/options.hpp> #include <boost/intrusive/options.hpp>
#include <boost/intrusive/detail/utilities.hpp> #include <boost/intrusive/detail/utilities.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <iterator> #include <iterator>
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
@@ -123,7 +124,7 @@ class slist_impl
static const bool linear = 0 != (BoolFlags & slist_bool_flags::linear_pos); static const bool linear = 0 != (BoolFlags & slist_bool_flags::linear_pos);
static const bool cache_last = 0 != (BoolFlags & slist_bool_flags::cache_last_pos); static const bool cache_last = 0 != (BoolFlags & slist_bool_flags::cache_last_pos);
static const bool has_container_from_iterator = static const bool has_container_from_iterator =
boost::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value; detail::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value;
typedef typename detail::if_c typedef typename detail::if_c
< linear < linear

4
test/bounded_pointer.hpp
View File

@@ -38,7 +38,7 @@ class bounded_pointer
typedef void (bounded_pointer::*unspecified_bool_type)() const; typedef void (bounded_pointer::*unspecified_bool_type)() const;
public: public:
typedef typename boost::remove_const< T >::type mut_val_t; typedef typename boost::intrusive::detail::remove_const< T >::type mut_val_t;
typedef const mut_val_t const_val_t; typedef const mut_val_t const_val_t;
typedef bounded_reference<T> reference; typedef bounded_reference<T> reference;
@@ -140,7 +140,7 @@ template < typename T >
class bounded_reference class bounded_reference
{ {
public: public:
typedef typename boost::remove_const< T >::type mut_val_t; typedef typename boost::intrusive::detail::remove_const< T >::type mut_val_t;
typedef const mut_val_t const_val_t; typedef const mut_val_t const_val_t;
typedef bounded_pointer< T > pointer; typedef bounded_pointer< T > pointer;
static const unsigned char max_offset = pointer::max_offset; static const unsigned char max_offset = pointer::max_offset;