feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Use argument SFINAE instead of return SFINAE

Browse Source
This commit is contained in:
Daniel James
2016-06-02 23:52:23 +01:00
parent b4a3c6f460
commit 7b8e3d01de
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changes.qbk
View File

@ -276,5 +276,7 @@ C++11 support has resulted in some breaking changes:
* Remove `BOOST_UNORDERED_DEPRECATED_EQUALITY` warning. * Remove `BOOST_UNORDERED_DEPRECATED_EQUALITY` warning.
* Simpler implementation of assignment, fixes an exception safety issue * Simpler implementation of assignment, fixes an exception safety issue
for `unordered_multiset` and `unordered_multimap`. Might be a little slower. for `unordered_multiset` and `unordered_multimap`. Might be a little slower.
* Stop using return value SFINAE which some older compilers have issues
with.
[endsect] [endsect]

8
include/boost/unordered/detail/equivalent.hpp
View File

@ -484,8 +484,8 @@ namespace boost { namespace unordered { namespace detail {
// if hash function throws, or inserting > 1 element, basic exception // if hash function throws, or inserting > 1 element, basic exception
// safety. Strong otherwise // safety. Strong otherwise
template <class I> template <class I>
typename boost::unordered::detail::enable_if_forward<I, void>::type void insert_range(I i, I j, typename
insert_range(I i, I j) boost::unordered::detail::enable_if_forward<I, void*>::type = 0)
{ {
if(i == j) return; if(i == j) return;
@ -508,8 +508,8 @@ namespace boost { namespace unordered { namespace detail {
} }
template <class I> template <class I>
typename boost::unordered::detail::disable_if_forward<I, void>::type void insert_range(I i, I j, typename
insert_range(I i, I j) boost::unordered::detail::disable_if_forward<I, void*>::type = 0)
{ {
node_constructor a(this->node_alloc()); node_constructor a(this->node_alloc());
for (; i != j; ++i) { for (; i != j; ++i) {

10
include/boost/unordered/detail/util.hpp
View File

@ -125,17 +125,15 @@ namespace boost { namespace unordered { namespace detail {
// insert_size/initial_size // insert_size/initial_size
template <class I> template <class I>
inline typename inline std::size_t insert_size(I i, I j, typename
boost::unordered::detail::enable_if_forward<I, std::size_t>::type boost::unordered::detail::enable_if_forward<I, void*>::type = 0)
insert_size(I i, I j)
{ {
return std::distance(i, j); return std::distance(i, j);
} }
template <class I> template <class I>
inline typename inline std::size_t insert_size(I, I, typename
boost::unordered::detail::disable_if_forward<I, std::size_t>::type boost::unordered::detail::disable_if_forward<I, void*>::type = 0)
insert_size(I, I)
{ {
return 1; return 1;
} }