Minimize ifdef-ed code for BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN

This commit is contained in:
Ion Gaztañaga
2015-10-17 10:17:30 +02:00
parent 1d5c367d62
commit c4505003c7

View File

@@ -412,16 +412,13 @@ struct key_node_compare
key_forward(const T &node) const key_forward(const T &node) const
{ return node.get_data(); } { return node.get_data(); }
template<class T>
#if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN) #if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
template<class T>
const T &key_forward(const T &key, typename enable_if_c<!is_node<T>::value>::type* =0) const const T &key_forward(const T &key, typename enable_if_c<!is_node<T>::value>::type* =0) const
{ return key; }
#else #else
template<class T> typename enable_if_c<!is_node<T>::value, const T &>::type key_forward(const T &key) const
typename enable_if_c<!is_node<T>::value, const T &>::type
key_forward(const T &key) const
{ return key; }
#endif #endif
{ return key; }
template<class KeyType, class KeyType2> template<class KeyType, class KeyType2>
bool operator()(const KeyType &key1, const KeyType2 &key2) const bool operator()(const KeyType &key1, const KeyType2 &key2) const