diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-29 17:06:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-29 17:06:12 -0400 |
| commit | 6b24122857583537495a01f408c6c303f93adb02 (patch) | |
| tree | 382a25e202c5fd171dcb01fb3e82bbb12781540e /indra/llcommon/llthreadsafequeue.h | |
| parent | 3d9c39c77cd4e4e8da8abf9234f1c751762985e6 (diff) | |
| parent | 20cf275d21c0dce569bb3a16393b529c5c9f1c6c (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
Diffstat (limited to 'indra/llcommon/llthreadsafequeue.h')
| -rw-r--r-- | indra/llcommon/llthreadsafequeue.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h index 58cac38769..45289ef0b4 100644 --- a/indra/llcommon/llthreadsafequeue.h +++ b/indra/llcommon/llthreadsafequeue.h @@ -27,9 +27,8 @@ #ifndef LL_LLTHREADSAFEQUEUE_H #define LL_LLTHREADSAFEQUEUE_H - +#include "llexception.h" #include <string> -#include <stdexcept> struct apr_pool_t; // From apr_pools.h @@ -40,11 +39,11 @@ class LLThreadSafeQueueImplementation; // See below. // A general queue exception. // class LL_COMMON_API LLThreadSafeQueueError: -public std::runtime_error + public LLException { public: LLThreadSafeQueueError(std::string const & message): - std::runtime_error(message) + LLException(message) { ; // No op. } |