Merge branch 'develop'

This commit is contained in:
Peter Dimov
2016-05-17 18:10:45 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -104,7 +104,7 @@ private:
} }
// Note: invoked automatically by shared_ptr; do not call // Note: invoked automatically by shared_ptr; do not call
template<class X, class Y> void _internal_accept_owner( shared_ptr<X> * ppx, Y * py ) const template<class X, class Y> void _internal_accept_owner( shared_ptr<X> * ppx, Y * ) const
{ {
BOOST_ASSERT( ppx != 0 ); BOOST_ASSERT( ppx != 0 );

View File

@@ -83,7 +83,7 @@ struct thread_safe_counter
static unsigned int decrement(boost::detail::atomic_count& counter) BOOST_NOEXCEPT static unsigned int decrement(boost::detail::atomic_count& counter) BOOST_NOEXCEPT
{ {
return --counter; return static_cast< unsigned int >(--counter);
} }
}; };