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

command/Error: workaround for gcc 4.x rethrow_exception(exception_ptr)

Browse Source
This commit is contained in:
Max Kellermann 2015-12-29 12:39:28 +01:00
parent 37862f0f20
commit 3843972b05
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/CommandError.cxx
View File

@ -170,9 +170,19 @@ ToAck(std::exception_ptr ep)
return ToAck(pe.GetCode()); return ToAck(pe.GetCode());
} catch (const std::system_error &e) { } catch (const std::system_error &e) {
return ACK_ERROR_SYSTEM; return ACK_ERROR_SYSTEM;
#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
} catch (const std::exception &e) {
#else
} catch (...) { } catch (...) {
#endif
try { try {
#if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
/* workaround for g++ 4.x: no overload for
rethrow_exception(exception_ptr) */
std::rethrow_if_nested(e);
#else
std::rethrow_if_nested(ep); std::rethrow_if_nested(ep);
#endif
return ACK_ERROR_UNKNOWN; return ACK_ERROR_UNKNOWN;
} catch (...) { } catch (...) {
return ToAck(std::current_exception()); return ToAck(std::current_exception());