Skip to content

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

util/Exception: support "const char *"

parent 71c45d8e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
src/util/Exception.cxx
View file @ e7c5a59e
...@@ -42,6 +42,9 @@ AppendNestedMessage(std::string &result, T &&e, ...@@ -42,6 +42,9 @@ AppendNestedMessage(std::string &result, T &&e,
AppendNestedMessage(result, nested, fallback, separator); AppendNestedMessage(result, nested, fallback, separator);
} catch (const std::nested_exception &ne) { } catch (const std::nested_exception &ne) {
AppendNestedMessage(result, ne, fallback, separator); AppendNestedMessage(result, ne, fallback, separator);
} catch (const char *s) {
result += separator;
result += s;
} catch (...) { } catch (...) {
result += separator; result += separator;
result += fallback; result += fallback;
...@@ -67,6 +70,8 @@ GetFullMessage(std::exception_ptr ep, ...@@ -67,6 +70,8 @@ GetFullMessage(std::exception_ptr ep,
return GetFullMessage(e, fallback, separator); return GetFullMessage(e, fallback, separator);
} catch (const std::nested_exception &ne) { } catch (const std::nested_exception &ne) {
return GetFullMessage(ne.nested_ptr(), fallback, separator); return GetFullMessage(ne.nested_ptr(), fallback, separator);
} catch (const char *s) {
return s;
} catch (...) { } catch (...) {
return fallback; return fallback;
} }
......
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