COMMON: Add copy-constructor for std::exception to StackException

xoreos · Mar 20, 2014 · b191282 · b191282
1 parent 7e754a8
commit b191282
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/common/error.cpp b/src/common/error.cpp
@@ -52,6 +52,10 @@ StackException::StackException(const char *s, ...) {
 StackException::StackException(const StackException &e) : _stack(e._stack) {
 }
 
+StackException::StackException(const std::exception &e) {
+	add(e);
+}
+
 StackException::~StackException() throw() {
 }
 
@@ -66,6 +70,10 @@ void StackException::add(const char *s, ...) {
 	_stack.push(buf);
 }
 
+void StackException::add(const std::exception &e) {
+	add("%s", e.what());
+}
+
 const char *StackException::what() const throw() {
 	if (_stack.empty())
 		return "";

diff --git a/src/common/error.h b/src/common/error.h
@@ -45,9 +45,11 @@ class StackException : public std::exception {
 	StackException();
 	StackException(const char *s, ...);
 	StackException(const StackException &e);
+	StackException(const std::exception &e);
 	~StackException() throw();
 
 	void add(const char *s, ...);
+	void add(const std::exception &e);
 
 	const char *what() const throw();