mirror of
https://github.com/boostorg/beast.git
synced 2025-07-30 04:47:29 +02:00
buffers_cat uses BOOST_NORETURN.
This commit is contained in:
committed by
Klemens Morgenstern
parent
e88185f765
commit
c9900625ea
@ -62,30 +62,18 @@ public:
|
|||||||
#ifdef BOOST_BEAST_TESTS
|
#ifdef BOOST_BEAST_TESTS
|
||||||
|
|
||||||
#define BOOST_BEAST_LOGIC_ERROR(s) \
|
#define BOOST_BEAST_LOGIC_ERROR(s) \
|
||||||
do { \
|
{ \
|
||||||
BOOST_THROW_EXCEPTION(std::logic_error((s))); \
|
BOOST_THROW_EXCEPTION(std::logic_error((s))); \
|
||||||
BOOST_BEAST_UNREACHABLE(); \
|
BOOST_BEAST_UNREACHABLE(); \
|
||||||
} while(false)
|
}
|
||||||
|
|
||||||
#define BOOST_BEAST_LOGIC_ERROR_RETURN(v, s) \
|
|
||||||
do { \
|
|
||||||
BOOST_THROW_EXCEPTION(std::logic_error(s)); \
|
|
||||||
BOOST_BEAST_UNREACHABLE_RETURN(v); \
|
|
||||||
} while(false)
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define BOOST_BEAST_LOGIC_ERROR(s) \
|
#define BOOST_BEAST_LOGIC_ERROR(s) \
|
||||||
do { \
|
{ \
|
||||||
BOOST_ASSERT_MSG(false, s); \
|
BOOST_ASSERT_MSG(false, s); \
|
||||||
BOOST_BEAST_UNREACHABLE(); \
|
BOOST_BEAST_UNREACHABLE(); \
|
||||||
} while(false)
|
}
|
||||||
|
|
||||||
#define BOOST_BEAST_LOGIC_ERROR_RETURN(v, s) \
|
|
||||||
do { \
|
|
||||||
BOOST_ASSERT_MSG(false, (s)); \
|
|
||||||
BOOST_BEAST_UNREACHABLE_RETURN(v); \
|
|
||||||
} while(false)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -97,15 +85,11 @@ struct buffers_cat_view_iterator_base
|
|||||||
{
|
{
|
||||||
char unused = 0; // make g++8 happy
|
char unused = 0; // make g++8 happy
|
||||||
|
|
||||||
net::mutable_buffer
|
BOOST_NORETURN net::mutable_buffer
|
||||||
operator*() const
|
operator*() const
|
||||||
{
|
{
|
||||||
#if 1
|
BOOST_BEAST_LOGIC_ERROR(
|
||||||
throw std::logic_error("");
|
"Dereferencing a one-past-the-end iterator");
|
||||||
#else
|
|
||||||
BOOST_BEAST_LOGIC_ERROR_RETURN({},
|
|
||||||
"Dereferencing a one-past-the-end iterator");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
operator bool() const noexcept
|
operator bool() const noexcept
|
||||||
@ -189,15 +173,11 @@ private:
|
|||||||
{
|
{
|
||||||
const_iterator const& self;
|
const_iterator const& self;
|
||||||
|
|
||||||
reference
|
BOOST_NORETURN reference
|
||||||
operator()(mp11::mp_size_t<0>)
|
operator()(mp11::mp_size_t<0>)
|
||||||
{
|
{
|
||||||
#if 1
|
BOOST_BEAST_LOGIC_ERROR(
|
||||||
throw std::logic_error("");
|
|
||||||
#else
|
|
||||||
BOOST_BEAST_LOGIC_ERROR_RETURN({},
|
|
||||||
"Dereferencing a default-constructed iterator");
|
"Dereferencing a default-constructed iterator");
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class I>
|
template<class I>
|
||||||
|
Reference in New Issue
Block a user