oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

command/Error: support class Error as C++ exception

Browse Source
This commit is contained in:
Max Kellermann 2016-09-08 10:26:32 +02:00
parent 75aa98ddaa
commit f29949e14d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/CommandError.cxx
View File

@ -128,6 +128,8 @@ ToAck(std::exception_ptr ep)
#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204 #if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
} catch (const std::exception &e) { } catch (const std::exception &e) {
#else #else
} catch (const Error &error) {
return ToAck(error);
} catch (...) { } catch (...) {
#endif #endif
try { try {
@ -153,6 +155,8 @@ PrintError(Response &r, std::exception_ptr ep)
} catch (const std::exception &e) { } catch (const std::exception &e) {
LogError(e); LogError(e);
r.Error(ToAck(ep), e.what()); r.Error(ToAck(ep), e.what());
} catch (const Error &error) {
print_error(r, error);
} catch (...) { } catch (...) {
r.Error(ACK_ERROR_UNKNOWN, "Unknown error"); r.Error(ACK_ERROR_UNKNOWN, "Unknown error");
} }