From 1c91c8a106a78f2087a3fb4312e428a0128283b4 Mon Sep 17 00:00:00 2001
From: Rider Linden <none@none>
Date: Wed, 8 Apr 2015 10:17:34 -0700
Subject: Adding weak pointer support. Event polling as a coroutine.
 (incomplete) Groundwork for canceling HttpCoroutineAdapter yields.

---
 indra/newview/lleventpoll.h | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'indra/newview/lleventpoll.h')

diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
index e8d98062aa..4b9944724d 100755
--- a/indra/newview/lleventpoll.h
+++ b/indra/newview/lleventpoll.h
@@ -28,9 +28,20 @@
 #define LL_LLEVENTPOLL_H
 
 #include "llhttpclient.h"
+#include "boost/move/unique_ptr.hpp"
+
+namespace boost
+{
+    using ::boost::movelib::unique_ptr; // move unique_ptr into the boost namespace.
+}
 
 class LLHost;
 
+namespace
+{
+    class LLEventPollImpl;
+}
+
 
 class LLEventPoll
 	///< implements the viewer side of server-to-viewer pushed events.
@@ -40,11 +51,15 @@ public:
 		///< Start polling the URL.
 
 	virtual ~LLEventPoll();
-		///< will stop polling, cancelling any poll in progress.
+		///< will stop polling, canceling any poll in progress.
 
 
 private:
+#if 1
+    boost::unique_ptr<LLEventPollImpl>    mImpl;
+#else
 	LLHTTPClient::ResponderPtr mImpl;
+#endif
 };
 
 
-- 
cgit v1.2.3


From 93382ee0c0c570e58b17af5f43f9738d773e8add Mon Sep 17 00:00:00 2001
From: Rider Linden <none@none>
Date: Wed, 8 Apr 2015 14:29:37 -0700
Subject: Moved some LLEventPolling internal classes to a named namespace
 Canceling outstanding polling transactions

---
 indra/newview/lleventpoll.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lleventpoll.h')

diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
index 4b9944724d..0be48be6b4 100755
--- a/indra/newview/lleventpoll.h
+++ b/indra/newview/lleventpoll.h
@@ -37,10 +37,13 @@ namespace boost
 
 class LLHost;
 
-namespace
+namespace LLEventPolling
+{
+namespace Details
 {
     class LLEventPollImpl;
 }
+}
 
 
 class LLEventPoll
@@ -56,7 +59,8 @@ public:
 
 private:
 #if 1
-    boost::unique_ptr<LLEventPollImpl>    mImpl;
+    boost::unique_ptr<LLEventPolling::Details::LLEventPollImpl>    mImpl;
+    
 #else
 	LLHTTPClient::ResponderPtr mImpl;
 #endif
-- 
cgit v1.2.3


From 6aa2812fad7746d5072c8b16311872666624a33d Mon Sep 17 00:00:00 2001
From: Rider Linden <none@none>
Date: Wed, 8 Apr 2015 15:56:25 -0700
Subject: Removed dead code

---
 indra/newview/lleventpoll.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'indra/newview/lleventpoll.h')

diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
index 0be48be6b4..e32b4ed322 100755
--- a/indra/newview/lleventpoll.h
+++ b/indra/newview/lleventpoll.h
@@ -58,12 +58,7 @@ public:
 
 
 private:
-#if 1
     boost::unique_ptr<LLEventPolling::Details::LLEventPollImpl>    mImpl;
-    
-#else
-	LLHTTPClient::ResponderPtr mImpl;
-#endif
 };
 
 
-- 
cgit v1.2.3