QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to

Boost.Signals2 like the rest of the event-system-n code.

2 files changed, 13 insertions, 13 deletions

diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index b42c5237f7..a4304596de 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -97,7 +97,7 @@ public:
 	{
 	}
 	
-	boost::signals::connection setCallback(const LLCacheNameCallback& cb)
+	boost::signals2::connection setCallback(const LLCacheNameCallback& cb)
 	{
 		return mSignal.connect(cb);
 	}
@@ -216,7 +216,7 @@ public:
 	Impl(LLMessageSystem* msg);
 	~Impl();
 	
-	boost::signals::connection addPending(const LLUUID& id, const LLCacheNameCallback& callback);
+	boost::signals2::connection addPending(const LLUUID& id, const LLCacheNameCallback& callback);
 	void addPending(const LLUUID& id, const LLHost& host);
 	
 	void processPendingAsks();
@@ -277,10 +277,10 @@ LLCacheName::Impl::~Impl()
 	for_each(mReplyQueue.begin(), mReplyQueue.end(), DeletePointer());
 }
 
-boost::signals::connection LLCacheName::Impl::addPending(const LLUUID& id, const LLCacheNameCallback& callback)
+boost::signals2::connection LLCacheName::Impl::addPending(const LLUUID& id, const LLCacheNameCallback& callback)
 {
 	PendingReply* reply = new PendingReply(id, LLHost());
-	boost::signals::connection res = reply->setCallback(callback);
+	boost::signals2::connection res = reply->setCallback(callback);
 	mReplyQueue.push_back(reply);
 	return res;
 }
@@ -296,7 +296,7 @@ void LLCacheName::setUpstream(const LLHost& upstream_host)
 	impl.mUpstreamHost = upstream_host;
 }
 
-boost::signals::connection LLCacheName::addObserver(const LLCacheNameCallback& callback)
+boost::signals2::connection LLCacheName::addObserver(const LLCacheNameCallback& callback)
 {
 	return impl.mSignal.connect(callback);
 }
@@ -555,9 +555,9 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 //  we call it immediately. -Steve
 // NOTE: Even though passing first and last name is a bit of extra overhead, it eliminates the
 //  potential need for any parsing should any code need to handle first and last name independently.
-boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback)
+boost::signals2::connection LLCacheName::get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback)
 {
-	boost::signals::connection res;
+	boost::signals2::connection res;
 	
 	if(id.isNull())
 	{
@@ -601,7 +601,7 @@ boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, con
 	return res;
 }
 
-boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data)
+boost::signals2::connection LLCacheName::get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data)
 {
 	return get(id, is_group, boost::bind(callback, _1, _2, _3, _4, user_data));
 }
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index 414b6590f6..47d49076f4 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -34,14 +34,14 @@
 #define LL_LLCACHENAME_H
 
 #include <boost/bind.hpp>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
 
 class LLMessageSystem;
 class LLHost;
 class LLUUID;
 
 
-typedef boost::signal<void (const LLUUID& id,
+typedef boost::signals2::signal<void (const LLUUID& id,
 							const std::string& first_name,
 							const std::string& last_name,
 							BOOL is_group)> LLCacheNameSignal;
@@ -69,7 +69,7 @@ public:
 	// for simulators, this is the data server
 	void setUpstream(const LLHost& upstream_host);
 
-	boost::signals::connection addObserver(const LLCacheNameCallback& callback);
+	boost::signals2::connection addObserver(const LLCacheNameCallback& callback);
 
 	// janky old format. Remove after a while. Phoenix. 2008-01-30
 	void importFile(LLFILE* fp);
@@ -96,10 +96,10 @@ public:
 	// If the data is currently available, may call the callback immediatly
 	// otherwise, will request the data, and will call the callback when
 	// available.  There is no garuntee the callback will ever be called.
-	boost::signals::connection get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback);
+	boost::signals2::connection get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback);
 	
 	// LEGACY
-	boost::signals::connection get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data);
+	boost::signals2::connection get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data);
 
 	// This method needs to be called from time to time to send out
 	// requests.