projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
exceptions.h
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index 38452ffc02b7c0867596cb55787a77c29eeafc01..90a0abfc717d46cfa697b92fef0dccba62795620 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-245,10
+245,24
@@
public:
SubRipError (std::string, std::string, boost::filesystem::path);
};
SubRipError (std::string, std::string, boost::filesystem::path);
};
+class DCPError : public StringError
+{
+public:
+ DCPError (std::string s)
+ : StringError (s)
+ {}
+};
+
+class InvalidSignerError : public StringError
+{
+public:
+ InvalidSignerError ();
+};
+
/** @class ExceptionStore
* @brief A parent class for classes which have a need to catch and
* re-throw exceptions.
/** @class ExceptionStore
* @brief A parent class for classes which have a need to catch and
* re-throw exceptions.
-
+ *
* This is intended for classes which run their own thread; they should do
* something like
*
* This is intended for classes which run their own thread; they should do
* something like
*
@@
-270,8
+284,9
@@
public:
void rethrow () {
boost::mutex::scoped_lock lm (_mutex);
if (_exception) {
void rethrow () {
boost::mutex::scoped_lock lm (_mutex);
if (_exception) {
- boost::
rethrow_exception (_exception)
;
+ boost::
exception_ptr tmp = _exception
;
_exception = boost::exception_ptr ();
_exception = boost::exception_ptr ();
+ boost::rethrow_exception (tmp);
}
}
}
}
@@
-287,6
+302,4
@@
private:
mutable boost::mutex _mutex;
};
mutable boost::mutex _mutex;
};
-
-
#endif
#endif