From fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 22 Jun 2009 12:52:18 +0000
Subject: QAR-1383: convert new uses of Boost.Signals (arriving from other
 branches) to Boost.Signals2 like the rest of the event-system-n code.

---
 indra/llxml/llcontrol.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'indra/llxml')

diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 1782c20a7e..37939a0908 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -56,7 +56,7 @@
 #endif
 
 #include <boost/bind.hpp>
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #if LL_WINDOWS
 # if (_MSC_VER >= 1300 && _MSC_VER < 1400)
@@ -92,8 +92,8 @@ class LLControlVariable : public LLRefCount, boost::noncopyable
 	friend class LLControlGroup;
 	
 public:
-	typedef boost::signal<bool(LLControlVariable* control, const LLSD&), boost_boolean_combiner> validate_signal_t;
-	typedef boost::signal<void(LLControlVariable* control, const LLSD&)> commit_signal_t;
+	typedef boost::signals2::signal<bool(LLControlVariable* control, const LLSD&), boost_boolean_combiner> validate_signal_t;
+	typedef boost::signals2::signal<void(LLControlVariable* control, const LLSD&)> commit_signal_t;
 
 private:
 	std::string		mName;
@@ -332,10 +332,6 @@ public:
 
 	~LLControlCache()
 	{
-		if(mConnection.connected())
-		{
-			mConnection.disconnect();
-		}
 	}
 
 	const T& getValue() const { return mCachedValue; }
@@ -378,7 +374,7 @@ private:
 private:
     T							mCachedValue;
 	eControlType				mType;
-    boost::signals::connection	mConnection;
+    boost::signals2::scoped_connection	mConnection;
 };
 
 template <typename T>
-- 
cgit v1.2.3