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

Simplify tree_value_compare overloads to avoid compilation errors in some old GCC versions.

Browse Source
This commit is contained in:
Ion Gaztañaga
2016-08-29 00:03:46 +02:00
parent ef8e57ae1b
commit 2de5382dbb
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@
namespace boost{ namespace boost{
namespace intrusive{ namespace intrusive{
//This function object takes a KeyCompare function object //This function object takes a KeyCompare function object
//and compares values that contains keys using KeyOfValue //and compares values that contains keys using KeyOfValue
template<class Key, class T, class KeyCompare, class KeyOfValue> template<class Key, class T, class KeyCompare, class KeyOfValue>
@@ -62,18 +61,20 @@ struct tree_value_compare
BOOST_INTRUSIVE_FORCEINLINE key_compare &key_comp() BOOST_INTRUSIVE_FORCEINLINE key_compare &key_comp()
{ return static_cast<key_compare &>(*this); } { return static_cast<key_compare &>(*this); }
BOOST_INTRUSIVE_FORCEINLINE bool operator()(const key_type &key1, const key_type &key2) const
{ return key_compare::operator()(key1, key2); }
template<class U> template<class U>
struct is_key BOOST_INTRUSIVE_FORCEINLINE bool operator()(const key_type &key1, const U &nonkey2) const
: boost::intrusive::detail::is_same<const U, const key_type> { return key_compare::operator()(key1, KeyOfValue()(nonkey2)); }
{};
template<class U>
BOOST_INTRUSIVE_FORCEINLINE bool operator()(const U &nonkey1, const key_type &key2) const
{ return key_compare::operator()(KeyOfValue()(nonkey1), key2); }
template<class U, class V> template<class U, class V>
BOOST_INTRUSIVE_FORCEINLINE bool operator()(const U &key1, const V &key2) const BOOST_INTRUSIVE_FORCEINLINE bool operator()(const U &nonkey1, const V &nonkey2) const
{ return key_compare::operator()(KeyOfValue()(key1), KeyOfValue()(key2)); } { return key_compare::operator()(KeyOfValue()(nonkey1), KeyOfValue()(nonkey2)); }
template<class U, class V>
BOOST_INTRUSIVE_FORCEINLINE bool operator()(const U &key1, const V &key2)
{ return key_compare::operator()(KeyOfValue()(key1), KeyOfValue()(key2)); }
}; };
} //namespace intrusive{ } //namespace intrusive{