Fix conversion to bool warning

This commit is contained in:
Daniel James
2018-01-08 10:57:28 +00:00
parent c8facc99a7
commit ea28a3f98e

View File

@ -2845,27 +2845,31 @@ namespace boost {
} }
private: private:
void construct_functions(bool which, H const& hf, P const& eq) void construct_functions(unsigned char which, H const& hf, P const& eq)
{ {
BOOST_ASSERT(!(which & 2));
new ((void*)&funcs_[which]) function_pair(hf, eq); new ((void*)&funcs_[which]) function_pair(hf, eq);
} }
void construct_functions(bool which, function_pair const& f, void construct_functions(unsigned char which, function_pair const& f,
boost::unordered::detail::false_type = boost::unordered::detail::false_type =
boost::unordered::detail::false_type()) boost::unordered::detail::false_type())
{ {
BOOST_ASSERT(!(which & 2));
new ((void*)&funcs_[which]) function_pair(f); new ((void*)&funcs_[which]) function_pair(f);
} }
void construct_functions( void construct_functions(unsigned char which, function_pair& f,
bool which, function_pair& f, boost::unordered::detail::true_type) boost::unordered::detail::true_type)
{ {
BOOST_ASSERT(!(which & 2));
new ((void*)&funcs_[which]) new ((void*)&funcs_[which])
function_pair(f, boost::unordered::detail::move_tag()); function_pair(f, boost::unordered::detail::move_tag());
} }
void destroy_functions(bool which) void destroy_functions(unsigned char which)
{ {
BOOST_ASSERT(!(which & 2));
boost::unordered::detail::func::destroy( boost::unordered::detail::func::destroy(
(function_pair*)(&funcs_[which])); (function_pair*)(&funcs_[which]));
} }