feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Merge branch 'bolry-changes' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2019-12-09 13:07:52 +01:00
parent e3f6dc44ad 0fa5193cea
commit 8abd4a3997
2 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/container/throw_exception.hpp
View File

@@ -37,15 +37,15 @@ namespace container {
#if defined(BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS) #if defined(BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS)
//The user must provide definitions for the following functions //The user must provide definitions for the following functions
void throw_bad_alloc(); BOOST_NORETURN void throw_bad_alloc();
void throw_out_of_range(const char* str); BOOST_NORETURN void throw_out_of_range(const char* str);
void throw_length_error(const char* str); BOOST_NORETURN void throw_length_error(const char* str);
void throw_logic_error(const char* str); BOOST_NORETURN void throw_logic_error(const char* str);
void throw_runtime_error(const char* str); BOOST_NORETURN void throw_runtime_error(const char* str);
#elif defined(BOOST_NO_EXCEPTIONS) #elif defined(BOOST_NO_EXCEPTIONS)

58
test/throw_exception_test.cpp
View File

@@ -22,24 +22,50 @@ static bool length_error_called = false;
static bool logic_error_called = false; static bool logic_error_called = false;
static bool runtime_error_called = false; static bool runtime_error_called = false;
BOOST_NORETURN static void validate_and_never_return()
{
BOOST_TEST(bad_alloc_called == true);
BOOST_TEST(out_of_range_called == true);
BOOST_TEST(length_error_called == true);
BOOST_TEST(logic_error_called == true);
BOOST_TEST(runtime_error_called == true);
std::exit(::boost::report_errors());
}
//User defined throw implementations //User defined throw implementations
namespace boost { namespace boost {
namespace container { namespace container {
void throw_bad_alloc() BOOST_NORETURN void throw_bad_alloc()
{ bad_alloc_called = true; } {
bad_alloc_called = true;
throw_out_of_range("dummy");
}
void throw_out_of_range(const char* str) BOOST_NORETURN void throw_out_of_range(const char* str)
{ (void)str; out_of_range_called = true; } {
out_of_range_called = true;
throw_length_error(str);
}
void throw_length_error(const char* str) BOOST_NORETURN void throw_length_error(const char* str)
{ (void)str; length_error_called = true; } {
length_error_called = true;
throw_logic_error(str);
}
void throw_logic_error(const char* str) BOOST_NORETURN void throw_logic_error(const char* str)
{ (void)str; logic_error_called = true; } {
logic_error_called = true;
throw_runtime_error(str);
}
void throw_runtime_error(const char* str) BOOST_NORETURN void throw_runtime_error(const char* str)
{ (void)str; runtime_error_called = true; } {
(void)str;
runtime_error_called = true;
validate_and_never_return();
}
}} //boost::container }} //boost::container
@@ -47,16 +73,8 @@ int main()
{ {
//Check user-defined throw callbacks are called //Check user-defined throw callbacks are called
throw_bad_alloc(); throw_bad_alloc();
BOOST_TEST(bad_alloc_called == true); //Never reached
throw_out_of_range("dummy"); std::abort();
BOOST_TEST(out_of_range_called == true);
throw_length_error("dummy");
BOOST_TEST(length_error_called == true);
throw_logic_error("dummy");
BOOST_TEST(logic_error_called == true);
throw_runtime_error("dummy");
BOOST_TEST(runtime_error_called == true);
return ::boost::report_errors();
} }
#include <boost/container/detail/config_end.hpp> #include <boost/container/detail/config_end.hpp>