Skip to content

M
mpd
Commit 62087239 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

util/Exception: move the forwarded std::exception_ptr

parent f7c326db
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/util/Exception.cxx
View file @ 62087239
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "Exception.hxx" #include "Exception.hxx"
#include <utility>
template<typename T> template<typename T>
static void static void
AppendNestedMessage(std::string &result, T &&e, AppendNestedMessage(std::string &result, T &&e,
...@@ -65,7 +67,7 @@ GetFullMessage(std::exception_ptr ep, ...@@ -65,7 +67,7 @@ GetFullMessage(std::exception_ptr ep,
const char *fallback, const char *separator) noexcept const char *fallback, const char *separator) noexcept
{ {
try { try {
std::rethrow_exception(ep); std::rethrow_exception(std::move(ep));
} catch (const std::exception &e) { } catch (const std::exception &e) {
return GetFullMessage(e, fallback, separator); return GetFullMessage(e, fallback, separator);
} catch (const std::nested_exception &ne) { } catch (const std::nested_exception &ne) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment