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

Fix compilation in case if key is void*, again.

Browse Source 
This commit fixes a compilation error with gcc 8.2 about ambiguous function
calls in tree_value_compare when the user specifies a key that has type void*.
The fix take approach similar to https://github.com/boostorg/intrusive/pull/21.
This commit is contained in:
Andrey Semashev
2018-12-14 18:46:28 +03:00
parent c02f485281
commit 01d575bed4
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/boost/intrusive/detail/tree_value_compare.hpp
View File

@@ -27,7 +27,7 @@ namespace boost{
namespace intrusive{ namespace intrusive{
//Needed to support smart references to value types //Needed to support smart references to value types
template <class From, class ValuePtr> template <class From, class ValuePtr, class R = void>
struct disable_if_smartref_to struct disable_if_smartref_to
: detail::disable_if_c : detail::disable_if_c
< detail::is_same < detail::is_same
@@ -39,7 +39,8 @@ struct disable_if_smartref_to
< typename pointer_rebind < typename pointer_rebind
< ValuePtr < ValuePtr
, const typename boost::movelib::pointer_element<ValuePtr>::type>::type> , const typename boost::movelib::pointer_element<ValuePtr>::type>::type>
::reference>::value ::reference>::value,
R
> >
{}; {};
@@ -51,6 +52,10 @@ template< class ValuePtr, class KeyCompare, class KeyOfValue, class Ret = bool
struct tree_value_compare struct tree_value_compare
: public boost::intrusive::detail::ebo_functor_holder<KeyCompare> : public boost::intrusive::detail::ebo_functor_holder<KeyCompare>
{ {
private:
struct sfinae_type;
public:
typedef typename typedef typename
boost::movelib::pointer_element<ValuePtr>::type value_type; boost::movelib::pointer_element<ValuePtr>::type value_type;
typedef KeyCompare key_compare; typedef KeyCompare key_compare;
@@ -88,7 +93,7 @@ struct tree_value_compare
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(nonkey); } { return this->key_comp()(nonkey); }
BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const key_type &key2) const BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const key_type &key2) const
@@ -105,22 +110,22 @@ struct tree_value_compare
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const key_type &key1, const U &nonkey2 BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const key_type &key1, const U &nonkey2
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(key1, nonkey2); } { return this->key_comp()(key1, nonkey2); }
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey1, const key_type &key2 BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey1, const key_type &key2
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(nonkey1, key2); } { return this->key_comp()(nonkey1, key2); }
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const value_type &value1, const U &nonvalue2 BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const value_type &value1, const U &nonvalue2
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(KeyOfValue()(value1), nonvalue2); } { return this->key_comp()(KeyOfValue()(value1), nonvalue2); }
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonvalue1, const value_type &value2 BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonvalue1, const value_type &value2
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(nonvalue1, KeyOfValue()(value2)); } { return this->key_comp()(nonvalue1, KeyOfValue()(value2)); }
}; };
@@ -128,6 +133,10 @@ template<class ValuePtr, class KeyCompare, class KeyOfValue, class Ret>
struct tree_value_compare<ValuePtr, KeyCompare, KeyOfValue, Ret, true> struct tree_value_compare<ValuePtr, KeyCompare, KeyOfValue, Ret, true>
: public boost::intrusive::detail::ebo_functor_holder<KeyCompare> : public boost::intrusive::detail::ebo_functor_holder<KeyCompare>
{ {
private:
struct sfinae_type;
public:
typedef typename typedef typename
boost::movelib::pointer_element<ValuePtr>::type value_type; boost::movelib::pointer_element<ValuePtr>::type value_type;
typedef KeyCompare key_compare; typedef KeyCompare key_compare;
@@ -163,7 +172,7 @@ struct tree_value_compare<ValuePtr, KeyCompare, KeyOfValue, Ret, true>
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const U &nonkey
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(nonkey); } { return this->key_comp()(nonkey); }
BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const key_type &key2) const BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const key_type &key1, const key_type &key2) const
@@ -171,12 +180,12 @@ struct tree_value_compare<ValuePtr, KeyCompare, KeyOfValue, Ret, true>
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const key_type &key1, const U &nonkey2 BOOST_INTRUSIVE_FORCEINLINE Ret operator()( const key_type &key1, const U &nonkey2
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(key1, nonkey2); } { return this->key_comp()(key1, nonkey2); }
template<class U> template<class U>
BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const U &nonkey1, const key_type &key2 BOOST_INTRUSIVE_FORCEINLINE Ret operator()(const U &nonkey1, const key_type &key2
, typename disable_if_smartref_to<U, ValuePtr>::type* = 0) const , typename disable_if_smartref_to<U, ValuePtr, sfinae_type*>::type = 0) const
{ return this->key_comp()(nonkey1, key2); } { return this->key_comp()(nonkey1, key2); }
}; };