summaryrefslogtreecommitdiff
path: root/indra/llcommon/llthreadsafequeue.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-10-17 14:58:29 -0700
committerRider Linden <rider@lindenlab.com>2016-10-17 14:58:29 -0700
commit38d06dcce66ce3a7f5a7a1521f0305dbc0ea0bc5 (patch)
tree38745f1a60a13b496014a64690e7afda14611830 /indra/llcommon/llthreadsafequeue.h
parentb2eded73b9bf55e2253a9c39113ff0598c2c18cb (diff)
parent086c1342152895da28d2e0130d09432152604ca8 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llcommon/llthreadsafequeue.h')
-rw-r--r--indra/llcommon/llthreadsafequeue.h7
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.
}