Skip to content

Add std::error_code and error category constructors to system_error #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Seele-Official wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add std::error_code and error category constructors to system_error #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion include/cpptrace/exceptions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,61 @@ CPPTRACE_BEGIN_NAMESPACE
class CPPTRACE_EXPORT system_error : public runtime_error {
std::error_code ec;
public:
explicit system_error(
std::error_code error_code = std::error_code{},
raw_trace&& trace = detail::get_raw_trace_and_absorb()
) noexcept
: runtime_error(
error_code.message(),
std::move(trace)
),
ec(std::move(error_code)) {}

explicit system_error(
std::error_code error_code,
std::string&& message_arg,
raw_trace&& trace = detail::get_raw_trace_and_absorb()
) noexcept
: runtime_error(
message_arg + ": " + error_code.message(),
std::move(trace)
),
ec(std::move(error_code)) {}

explicit system_error(
int error_code,
const std::error_category& error_category,
raw_trace&& trace = detail::get_raw_trace_and_absorb()
) noexcept
: runtime_error(
std::error_code(error_code, error_category).message(),
std::move(trace)
),
ec(error_code, error_category) {}

explicit system_error(
int error_code,
const std::error_category& error_category,
std::string&& message_arg,
raw_trace&& trace = detail::get_raw_trace_and_absorb()
) noexcept;
) noexcept
: runtime_error(
message_arg + ": " + std::error_code(error_code, error_category).message(),
std::move(trace)
),
ec(error_code, error_category) {}

explicit system_error(
int error_code,
std::string&& message_arg,
raw_trace&& trace = detail::get_raw_trace_and_absorb()
) noexcept
: system_error(
std::error_code{error_code, std::generic_category()},
std::move(message_arg),
std::move(trace)
){}

const std::error_code& code() const noexcept;
};

Expand Down
7 changes: 0 additions & 7 deletions src/exceptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,6 @@ CPPTRACE_BEGIN_NAMESPACE
return user_message.c_str();
}

system_error::system_error(int error_code, std::string&& message_arg, raw_trace&& trace) noexcept
: runtime_error(
message_arg + ": " + std::error_code(error_code, std::generic_category()).message(),
std::move(trace)
),
ec(std::error_code(error_code, std::generic_category())) {}

const std::error_code& system_error::code() const noexcept {
return ec;
}
Expand Down
Loading