diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-19 23:30:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-19 23:30:04 +0100 |
| commit | 6ea37804a7f9dd72a29a25e7594a39fa47f53192 (patch) | |
| tree | b78bfdc3ef2ba3d61dfb3ce0930f741ec92548a3 /src/exceptions.h | |
| parent | f6b789850b0cd50971707084632c4ec08e145d0f (diff) | |
Use std::runtime_error instead of our own StringError as
a) it does the same job and
b) its type and what() survive the boundary between the libdcp .so
and the main DCP-o-matic executable.
Before this StringError-derived exceptions caught by DCP-o-matic
were only recognised as std::exceptions (without the what()) message.
I don't know why this happens, but this works around it.
Diffstat (limited to 'src/exceptions.h')
| -rw-r--r-- | src/exceptions.h | 51 |
1 files changed, 11 insertions, 40 deletions
diff --git a/src/exceptions.h b/src/exceptions.h index 01ac9ccc..801bfb01 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -29,32 +29,10 @@ namespace dcp { -/** @class StringError - * @brief An exception that uses a std::string to store its error message. - */ -class StringError : public std::exception -{ -public: - StringError () {} - StringError (std::string message) - : _message (message) - {} - - ~StringError () throw () {} - - /** @return error message */ - char const * what () const throw () { - return _message.c_str (); - } - -protected: - std::string _message; -}; - /** @class FileError * @brief An exception related to a file */ -class FileError : public StringError +class FileError : public std::runtime_error { public: FileError (std::string message, boost::filesystem::path filename, int number); @@ -90,26 +68,23 @@ public: /** @class MiscError * @brief A miscellaneous exception */ -class MiscError : public StringError +class MiscError : public std::runtime_error { public: MiscError (std::string message) - : StringError (message) + : std::runtime_error (message) {} }; /** @class DCPReadError * @brief A DCP read exception */ -class DCPReadError : public StringError +class DCPReadError : public std::runtime_error { public: DCPReadError (std::string message) - : StringError (message) + : std::runtime_error (message) {} - -protected: - DCPReadError () {} }; /** @class MissingAssetError @@ -127,27 +102,23 @@ public: MissingAssetError (boost::filesystem::path, AssetType = UNKNOWN); ~MissingAssetError () throw () {} - -private: - boost::filesystem::path _path; - AssetType _type; }; /** @class XMLError * @brief An XML error */ -class XMLError : public StringError +class XMLError : public std::runtime_error { public: XMLError (std::string message) - : StringError (message) + : std::runtime_error (message) {} }; /** @class UnresolvedRefError * @brief An exception caused by a reference (by UUID) to something which is not known */ -class UnresolvedRefError : public StringError +class UnresolvedRefError : public std::runtime_error { public: UnresolvedRefError (std::string id); @@ -156,7 +127,7 @@ public: /** @class TimeFormatError * @brief A an error with a string passed to LocalTime. */ -class TimeFormatError : public StringError +class TimeFormatError : public std::runtime_error { public: TimeFormatError (std::string bad_time); @@ -166,7 +137,7 @@ public: * @brief An error raised when creating a DecryptedKDM object for assets that are not * encrypted. */ -class NotEncryptedError : public StringError +class NotEncryptedError : public std::runtime_error { public: NotEncryptedError (std::string const & what); @@ -176,7 +147,7 @@ public: /** @class ProgrammingError * @brief An exception thrown when a DCP_ASSERT fails; something that should not happen. */ -class ProgrammingError : public StringError +class ProgrammingError : public std::runtime_error { public: ProgrammingError (std::string file, int line); |
