boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-19 02:12:24 +00:00
Code Issues Projects Releases Wiki Activity

nvalid_argument and fiber_resource_error rremoved

Browse Source
This commit is contained in:
Oliver Kowalke
2015-12-29 14:17:03 +01:00
parent 24fa47a1f0
commit 6f5d2b5376
5 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/fiber/bounded_channel.hpp
View File

@@ -206,12 +206,12 @@ public:
hwm_{ hwm },
lwm_{ lwm } {
if ( hwm_ <= lwm_) {
throw invalid_argument( std::make_error_code( std::errc::invalid_argument),
"boost fiber: high-watermark is less than or equal to low-watermark for bounded_channel");
throw fiber_error( std::make_error_code( std::errc::invalid_argument),
"boost fiber: high-watermark is less than or equal to low-watermark for bounded_channel");
}
if ( 0 == hwm) {
throw invalid_argument( std::make_error_code( std::errc::invalid_argument),
"boost fiber: high-watermark is zero");
throw fiber_error( std::make_error_code( std::errc::invalid_argument),
"boost fiber: high-watermark is zero");
}
}
@@ -222,8 +222,8 @@ public:
hwm_{ wm },
lwm_{ wm - 1 } {
if ( 0 == wm) {
throw invalid_argument( std::make_error_code( std::errc::invalid_argument),
"boost fiber: watermark is zero");
throw fiber_error( std::make_error_code( std::errc::invalid_argument),
"boost fiber: watermark is zero");
}
}
@@ -362,7 +362,7 @@ public:
return is_closed_() || ! is_empty_();
});
if ( is_closed_() && is_empty_() ) {
throw fiber_resource_error(
throw fiber_error(
std::make_error_code( std::errc::operation_not_permitted),
"boost fiber: queue is closed");
}

30
include/boost/fiber/exceptions.hpp
View File

@@ -57,36 +57,6 @@ public:
}
};
class fiber_resource_error : public fiber_error {
public:
fiber_resource_error( std::error_code ec) :
fiber_error( ec, "boost::fiber_resource_error") {
}
fiber_resource_error( std::error_code ec, const char * what_arg) :
fiber_error( ec, what_arg) {
}
fiber_resource_error( std::error_code ec, std::string const& what_arg) :
fiber_error( ec, what_arg) {
}
};
class invalid_argument : public fiber_error {
public:
invalid_argument( std::error_code ec) :
fiber_error( ec, "boost::invalid_argument") {
}
invalid_argument( std::error_code ec, const char * what_arg) :
fiber_error( ec, what_arg) {
}
invalid_argument( std::error_code ec, std::string const& what_arg) :
fiber_error( ec, what_arg) {
}
};
class fiber_interrupted : public fiber_error {
public:
fiber_interrupted() :

2
include/boost/fiber/unbounded_channel.hpp
View File

@@ -203,7 +203,7 @@ public:
return is_closed_() || ! is_empty_();
});
if ( is_closed_() && is_empty_() ) {
throw fiber_resource_error(
throw fiber_error(
std::make_error_code( std::errc::operation_not_permitted),
"boost fiber: queue is closed");
}

4
src/barrier.cpp
View File

@@ -21,8 +21,8 @@ barrier::barrier( std::size_t initial) :
initial_{ initial },
current_{ initial_ } {
if ( 0 == initial) {
throw invalid_argument( std::make_error_code( std::errc::invalid_argument),
"boost fiber: zero initial barrier count");
throw fiber_error( std::make_error_code( std::errc::invalid_argument),
"boost fiber: zero initial barrier count");
}
}

6
src/fiber.cpp
View File

@@ -31,11 +31,11 @@ void
fiber::join() {
// FIXME: must fiber::join() be synchronized?
if ( context::active()->get_id() == get_id() ) {
throw fiber_resource_error( std::make_error_code( std::errc::resource_deadlock_would_occur),
throw fiber_error( std::make_error_code( std::errc::resource_deadlock_would_occur),
"boost fiber: trying to join itself");
}
if ( ! joinable() ) {
throw fiber_resource_error( std::make_error_code( std::errc::invalid_argument),
throw fiber_error( std::make_error_code( std::errc::invalid_argument),
"boost fiber: fiber not joinable");
}
@@ -53,7 +53,7 @@ fiber::interrupt() noexcept {
void
fiber::detach() {
if ( ! joinable() ) {
throw fiber_resource_error( std::make_error_code( std::errc::invalid_argument),
throw fiber_error( std::make_error_code( std::errc::invalid_argument),
"boost fiber: fiber not joinable");
}
impl_.reset();