summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorAnsariel Hiller <Ansariel@users.noreply.github.com>2024-08-20 17:41:48 +0200
committerGitHub <noreply@github.com>2024-08-20 18:41:48 +0300
commit9f7dd0177201fe080c287144b99a70125be1fb2b (patch)
tree399330b2b71b34bb53bf314254eedb8b067ab8e5 /indra/llmessage
parent37dcb67d4204beb79c6eae9f38ffecd0d0d49f6f (diff)
Clean up boost includes and remove compiler warning pragma for unreachable code in PCH (#2361)
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/lliopipe.h1
-rw-r--r--indra/llmessage/llservice.h64
-rw-r--r--indra/llmessage/llstoredmessage.h1
3 files changed, 0 insertions, 66 deletions
diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h
index a58ee045c2..1887b5cd9a 100644
--- a/indra/llmessage/lliopipe.h
+++ b/indra/llmessage/lliopipe.h
@@ -30,7 +30,6 @@
#define LL_LLIOPIPE_H
#include <boost/intrusive_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include "llwin32headerslean.h"
#include "apr_poll.h"
diff --git a/indra/llmessage/llservice.h b/indra/llmessage/llservice.h
index 6c32fa8102..7853e357f9 100644
--- a/indra/llmessage/llservice.h
+++ b/indra/llmessage/llservice.h
@@ -31,72 +31,10 @@
#include <string>
#include <map>
-//#include <boost/intrusive_ptr.hpp>
-//#include <boost/shared_ptr.hpp>
-//#include "llframetimer.h"
#include "lliopipe.h"
#include "llchainio.h"
-#if 0
-class LLServiceCreator;
-/**
- * intrusive pointer support
- */
-namespace boost
-{
- void intrusive_ptr_add_ref(LLServiceCreator* p);
- void intrusive_ptr_release(LLServiceCreator* p);
-};
-#endif
-
-/**
- * @class LLServiceCreator
- * @brief This class is an abstract base class for classes which create
- * new <code>LLService</code> instances.
- *
- * Derive classes from this class which appropriately implement the
- * <code>operator()</code> and destructor.
- * @see LLService
- */
-#if 0
-class LLServiceCreator
-{
-public:
- typedef boost::intrusive_ptr<LLService> service_t;
- virtual ~LLServiceCreator() {}
- virtual service_t activate() = 0;
- virtual void discard() = 0;
-
-protected:
- LLServiceCreator() : mReferenceCount(0)
- {
- }
-
-private:
- friend void boost::intrusive_ptr_add_ref(LLServiceCreator* p);
- friend void boost::intrusive_ptr_release(LLServiceCreator* p);
- U32 mReferenceCount;
-};
-#endif
-
-#if 0
-namespace boost
-{
- inline void intrusive_ptr_add_ref(LLServiceCreator* p)
- {
- ++p->mReferenceCount;
- }
- inline void intrusive_ptr_release(LLServiceCreator* p)
- {
- if(p && 0 == --p->mReferenceCount)
- {
- delete p;
- }
- }
-};
-#endif
-
/**
* @class LLService
* @brief This class is the base class for the service classes.
@@ -114,8 +52,6 @@ namespace boost
class LLService : public LLIOPipe
{
public:
- //typedef boost::intrusive_ptr<LLServiceCreator> creator_t;
- //typedef boost::intrusive_ptr<LLService> service_t;
typedef std::shared_ptr<LLChainIOFactory> creator_t;
/**
diff --git a/indra/llmessage/llstoredmessage.h b/indra/llmessage/llstoredmessage.h
index 178b75ab04..2bd64fafd7 100644
--- a/indra/llmessage/llstoredmessage.h
+++ b/indra/llmessage/llstoredmessage.h
@@ -29,7 +29,6 @@
#include "linden_common.h"
#include "llsd.h"
-#include <boost/shared_ptr.hpp>
#include <string>