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

Avoid Visual C++ warning.

Browse Source 
Avoiding:

    warning C4127: conditional expression is constant

[SVN r85281]
This commit is contained in:
Daniel James
2013-08-10 13:09:28 +00:00
parent 3508ceaa58
commit de0366105c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/unordered/detail/buckets.hpp
View File

@ -727,15 +727,18 @@ namespace boost { namespace unordered { namespace detail {
new((void*) &funcs_[which]) function_pair(hf, eq); new((void*) &funcs_[which]) function_pair(hf, eq);
} }
void construct(bool which, function_pair const& f) void construct(bool which, function_pair const& f,
boost::unordered::detail::false_type =
boost::unordered::detail::false_type())
{ {
new((void*) &funcs_[which]) function_pair(f); new((void*) &funcs_[which]) function_pair(f);
} }
void construct(bool which, function_pair& f, void construct(bool which, function_pair& f,
boost::unordered::detail::move_tag m) boost::unordered::detail::true_type)
{ {
new((void*) &funcs_[which]) function_pair(f, m); new((void*) &funcs_[which]) function_pair(f,
boost::unordered::detail::move_tag());
} }
void destroy(bool which) void destroy(bool which)
@ -760,15 +763,12 @@ namespace boost { namespace unordered { namespace detail {
construct(current_, bf.current()); construct(current_, bf.current());
} }
functions(functions& bf, boost::unordered::detail::move_tag m) functions(functions& bf, boost::unordered::detail::move_tag)
: current_(false) : current_(false)
{ {
if (nothrow_move_constructible) { construct(current_, bf.current(),
construct(current_, bf.current(), m); boost::unordered::detail::integral_constant<bool,
} nothrow_move_constructible>());
else {
construct(current_, bf.current());
}
} }
~functions() { ~functions() {