From efdbaa50be7ec7ccb3359203acef30f4d15c5c19 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 28 May 2021 19:52:07 +0300
Subject: SL-15093 Crash nanov2_free_to_block

Superficially crash happens in disconnect() inside signal's deconstructor. Manual cleanup should help figuring out if crash happens due to named or anonymous listeners
---
 indra/llcommon/llevents.h | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'indra/llcommon/llevents.h')

diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h
index e380c108f4..6ac90cb3a3 100644
--- a/indra/llcommon/llevents.h
+++ b/indra/llcommon/llevents.h
@@ -49,7 +49,6 @@
 #endif
 
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/utility.hpp>        // noncopyable
 #include <boost/optional/optional.hpp>
@@ -571,7 +570,7 @@ protected:
                                         const NameList& before);
     
     /// implement the dispatching
-    boost::shared_ptr<LLStandardSignal> mSignal;
+    std::shared_ptr<LLStandardSignal> mSignal;
 
     /// valve open?
     bool mEnabled;
@@ -745,14 +744,4 @@ private:
 LL_COMMON_API bool sendReply(const LLSD& reply, const LLSD& request,
                              const std::string& replyKey="reply");
 
-// Somewhat to my surprise, passing boost::bind(...boost::weak_ptr<T>...) to
-// listen() fails in Boost code trying to instantiate LLEventListener (i.e.
-// LLStandardSignal::slot_type) because the boost::get_pointer() utility function isn't
-// specialized for boost::weak_ptr. This remedies that omission.
-namespace boost
-{
-    template <typename T>
-    T* get_pointer(const weak_ptr<T>& ptr) { return shared_ptr<T>(ptr).get(); }
-}
-
 #endif /* ! defined(LL_LLEVENTS_H) */
-- 
cgit v1.2.3


From e75519ef0e0a3b3aebf7761830b1e93163e3c673 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 31 May 2021 17:19:37 +0300
Subject: SL-15093 Crash nanov2_free_to_block #2

Mostly converted some boost pointers to std ones
Made ~LLNotificationChannelBase() more explicit to get a bit more data on location of another crash that likely happens when cleaning mItems
---
 indra/llcommon/llevents.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llcommon/llevents.h')

diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h
index 6ac90cb3a3..ae6e5aabc9 100644
--- a/indra/llcommon/llevents.h
+++ b/indra/llcommon/llevents.h
@@ -49,7 +49,6 @@
 #endif
 
 #include <boost/bind.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/utility.hpp>        // noncopyable
 #include <boost/optional/optional.hpp>
 #include <boost/visit_each.hpp>
-- 
cgit v1.2.3