From ccc55255c57f8449aa46cd8847dbda1ced1e851f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 29 May 2015 16:37:15 -0400
Subject: MAINT-5232: Make LLPounceable noncopyable. Changing the
 queue-of-callables implementation to boost::signals2::signal, which is
 noncopyable, means that LLPounceable itself should be noncopyable.

---
 indra/llcommon/llpounceable.h              | 3 ++-
 indra/llcommon/tests/llpounceable_test.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llpounceable.h b/indra/llcommon/llpounceable.h
index 9c8aba2154..77b711bdc6 100644
--- a/indra/llcommon/llpounceable.h
+++ b/indra/llcommon/llpounceable.h
@@ -36,6 +36,7 @@
 #define LL_LLPOUNCEABLE_H
 
 #include "llsingleton.h"
+#include <boost/noncopyable.hpp>
 #include <boost/call_traits.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/utility/value_init.hpp>
@@ -137,7 +138,7 @@ private:
 // LLPounceable<T> is for an LLPounceable instance on the heap or the stack.
 // LLPounceable<T, LLPounceableStatic> is for a static LLPounceable instance.
 template <typename T, class TAG=LLPounceableQueue>
-class LLPounceable
+class LLPounceable: public boost::noncopyable
 {
 private:
     typedef LLPounceableTraits<T, TAG> traits;
diff --git a/indra/llcommon/tests/llpounceable_test.cpp b/indra/llcommon/tests/llpounceable_test.cpp
index 25458865a6..2f4915ce11 100644
--- a/indra/llcommon/tests/llpounceable_test.cpp
+++ b/indra/llcommon/tests/llpounceable_test.cpp
@@ -147,7 +147,7 @@ namespace tut
         Data a("a");
         // should be able to initialize a pounceable (when its constructor
         // runs)
-        LLPounceable<Data*> pounceable = &a;
+        LLPounceable<Data*> pounceable(&a);
         // should be able to pass LLPounceable<T> to function accepting T
         setter(&aptr, pounceable);
         ensure_equals("aptr should be &a", aptr, &a);
-- 
cgit v1.2.3