diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-14 17:46:24 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-14 17:46:24 -0700 |
| commit | bbb9d4f21b018bfffc41f790aab7b54975504027 (patch) | |
| tree | 4c81cfc2348dd98a4a157979afc854568da4caea /indra/llcorehttp/_httpreplyqueue.h | |
| parent | 53b947e0397d6b88fdc6c0a10144e5a6d02a67d3 (diff) | |
MAINT-5732: Change to the way event polling handles error conditions and cancel calls.
Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr
Started minor refactor in the materials manager into coroutines (unfinished)
Diffstat (limited to 'indra/llcorehttp/_httpreplyqueue.h')
| -rwxr-xr-x | indra/llcorehttp/_httpreplyqueue.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/llcorehttp/_httpreplyqueue.h b/indra/llcorehttp/_httpreplyqueue.h index 4220a09a3b..7ad65c581f 100755 --- a/indra/llcorehttp/_httpreplyqueue.h +++ b/indra/llcorehttp/_httpreplyqueue.h @@ -58,21 +58,17 @@ class HttpOperation; /// will be coded anyway so it shouldn't be too much of a /// burden. -class HttpReplyQueue : public LLCoreInt::RefCounted +class HttpReplyQueue : private boost::noncopyable { -public: - /// Caller acquires a Refcount on construction - HttpReplyQueue(); -protected: - virtual ~HttpReplyQueue(); // Use release() +public: + typedef boost::shared_ptr<HttpReplyQueue> ptr_t; -private: - HttpReplyQueue(const HttpReplyQueue &); // Not defined - void operator=(const HttpReplyQueue &); // Not defined + HttpReplyQueue(); + virtual ~HttpReplyQueue(); public: - typedef std::vector<HttpOperation *> OpContainer; + typedef std::vector<HttpOperation *> OpContainer; /// Insert an object at the back of the reply queue. /// @@ -96,6 +92,7 @@ public: void fetchAll(OpContainer & ops); protected: + OpContainer mQueue; LLCoreInt::HttpMutex mQueueMutex; LLCoreInt::HttpConditionVariable mQueueCV; |
