Clean up boost includes and remove compiler warning pragma for unreachable code in PCH (#2361)

2024-08-20 17:41:48 +02:00 · 2024-08-20 17:41:48 +02:00 · 9f7dd01772
parent 37dcb67d42
commit 9f7dd01772
38 changed files with 4 additions and 130 deletions
--- a/indra/llappearance/lllocaltextureobject.h
+++ b/indra/llappearance/lllocaltextureobject.h
@ -27,8 +27,6 @@
 #ifndef LL_LOCALTEXTUREOBJECT_H
 #define LL_LOCALTEXTUREOBJECT_H

-#include <boost/shared_ptr.hpp>
-
 #include "llpointer.h"
 #include "llgltexture.h"

--- a/indra/llcommon/lldoubledispatch.h
+++ b/indra/llcommon/lldoubledispatch.h
@ -30,7 +30,6 @@
 #define LL_LLDOUBLEDISPATCH_H

 #include <list>
-#include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <boost/ref.hpp>
--- a/indra/llcommon/llerrorcontrol.h
+++ b/indra/llcommon/llerrorcontrol.h
@ -32,7 +32,6 @@
 #include "llpointer.h"
 #include "llrefcount.h"
 #include "boost/function.hpp"
-#include "boost/shared_ptr.hpp"
 #include <string>

 class LLSD;
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@ -31,7 +31,6 @@
 #include <vector>
 #include <list>
 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_enum.hpp>
 #include <boost/unordered_map.hpp>
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@ -32,7 +32,6 @@
 #include "llwin32headerslean.h"
 #include "llexception.h"
 #include "apr_thread_proc.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/optional.hpp>
 #include <boost/noncopyable.hpp>
--- a/indra/llcommon/llrun.h
+++ b/indra/llcommon/llrun.h
@ -30,7 +30,6 @@
 #define LL_LLRUN_H

 #include <vector>
-#include <boost/shared_ptr.hpp>

 class LLRunnable;

--- a/indra/llcommon/tests/lleventcoro_test.cpp
+++ b/indra/llcommon/tests/lleventcoro_test.cpp
@ -30,8 +30,6 @@
 #include <boost/bind.hpp>
 #include <boost/range.hpp>
 #include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>

 #include "linden_common.h"

--- a/indra/llcommon/tests/llinstancetracker_test.cpp
+++ b/indra/llcommon/tests/llinstancetracker_test.cpp
@ -37,8 +37,6 @@
 #include <algorithm>                // std::sort()
 #include <stdexcept>
 // std headers
-// external library headers
-#include <boost/scoped_ptr.hpp>
 // other Linden headers
 #include "../test/lltut.h"

--- a/indra/llcorehttp/bufferarray.h
+++ b/indra/llcorehttp/bufferarray.h
@ -30,7 +30,6 @@

 #include <cstdlib>
 #include <vector>
-#include "boost/intrusive_ptr.hpp"

 #include "_refcounted.h"

--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@ -189,13 +189,9 @@

 #include "linden_common.h"      // Modifies curl/curl.h interfaces
 #include "llsd.h"
-#include "boost/intrusive_ptr.hpp"
-#include "boost/shared_ptr.hpp"
-#include "boost/weak_ptr.hpp"
-#include "boost/function.hpp"
-#include "boost/noncopyable.hpp"
 #include <string>
 #include <curl/curl.h>
+#include "boost/noncopyable.hpp"

 namespace LLCore
 {
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@ -31,7 +31,6 @@
 #include "llmath.h"
 #include "llmemory.h"
 #include "llsd.h"
-#include <boost/scoped_ptr.hpp>

 // Declare the prototype for this factory function here. It is implemented in
 // other files which define a LLImageJ2CImpl subclass, but only ONE static
--- a/indra/llimage/llimagej2c.h
+++ b/indra/llimage/llimagej2c.h
@ -30,7 +30,6 @@
 #include "llimage.h"
 #include "llassettype.h"
 #include "llmetricperformancetester.h"
-#include <boost/scoped_ptr.hpp>

 // JPEG2000 : compression rate used in j2c conversion.
 const F32 DEFAULT_COMPRESSION_RATE = 1.f/8.f;
--- 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"

--- 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;

    /**
--- 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>


--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@ -87,6 +87,7 @@
 #include <boost/type_traits.hpp>
 #include <boost/signals2.hpp>
 #include <boost/range.hpp>
+#include <boost/intrusive_ptr.hpp>

 #include "llevents.h"
 #include "llfunctorregistry.h"
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@ -40,7 +40,6 @@
 #include "llcorehttputil.h"

 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>

 extern const bool   ANIMATE;
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@ -52,8 +52,6 @@
 #include "llwearablelist.h"
 #include "llfloaterperms.h"

-#include <boost/scoped_ptr.hpp>
-
 LLAgentWearables gAgentWearables;

 bool LLAgentWearables::mInitialWearablesUpdateReceived = false;
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@ -33,7 +33,6 @@
 #include "lluuid.h"

 #include <map>
-#include <boost/shared_ptr.hpp>

 namespace LLNotificationsUI
 {
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@ -64,7 +64,6 @@

 // Boost (for linux/unix command-line execv)
 #include <boost/tokenizer.hpp>
-#include <boost/shared_ptr.hpp>

 // External utility
 #include <string>
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@ -85,8 +85,6 @@

 #include "llenvironment.h"

-#include <boost/shared_ptr.hpp>
-
 void copy_slurl_to_clipboard_callback_inv(const std::string& slurl);

 const F32 SOUND_GAIN = 1.0f;
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@ -57,7 +57,6 @@
 #include "llsdserialize.h"
 #include "lltrans.h"

-#include <boost/scoped_ptr.hpp>
 #include <boost/regex.hpp>
 #include <sstream>

--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@ -29,7 +29,6 @@

 #include "lleventdispatcher.h"
 #include "lleventapi.h"
-#include <boost/scoped_ptr.hpp>
 #include <boost/function.hpp>
 #include <memory>                   // std::shared_ptr
 #include "llsecapi.h"
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@ -30,7 +30,6 @@
 #include "llpanel.h"
 #include "llpointer.h"          // LLPointer<>
 #include "llmediactrl.h"    // LLMediaCtrlObserver
-#include <boost/scoped_ptr.hpp>

 class LLLineEditor;
 class LLUIImage;
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@ -35,7 +35,6 @@

 #include <boost/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>

 #include "llagent.h"
--- a/indra/newview/llpathfindingnavmesh.h
+++ b/indra/newview/llpathfindingnavmesh.h
@ -29,7 +29,6 @@

 #include <string>

-#include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>

--- a/indra/newview/llpathfindingnavmeshzone.cpp
+++ b/indra/newview/llpathfindingnavmeshzone.cpp
@ -30,20 +30,9 @@

 #include "llpathfindingnavmeshzone.h"

-#include <vector>
-
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-
 #include "llagent.h"
 #include "llpathfindingmanager.h"
-#include "llpathfindingnavmesh.h"
-#include "llpathfindingnavmeshstatus.h"
 #include "llpathinglib.h"
-#include "llsd.h"
-#include "lluuid.h"
 #include "llviewercontrol.h"
 #include "llviewerregion.h"

--- a/indra/newview/llpathfindingnavmeshzone.h
+++ b/indra/newview/llpathfindingnavmeshzone.h
@ -29,7 +29,6 @@

 #include <vector>

-#include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>

--- a/indra/newview/llpathfindingobject.h
+++ b/indra/newview/llpathfindingobject.h
@ -29,7 +29,6 @@

 #include <string>

-#include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>

--- a/indra/newview/llpathfindingobjectlist.h
+++ b/indra/newview/llpathfindingobjectlist.h
@ -30,8 +30,6 @@
 #include <string>
 #include <map>

-#include <boost/shared_ptr.hpp>
-
 #include "llpathfindingobject.h"

 class LLPathfindingObjectList;
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@ -30,7 +30,6 @@
 #include "lltoast.h"

 #include <map>
-#include <boost/shared_ptr.hpp>

 namespace LLNotificationsUI
 {
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@ -42,10 +42,7 @@
 #include <functional>
 #include <map>
 #include <set>
-
-#ifdef LL_WINDOWS
-#pragma warning (3 : 4702) // we like level 3, not 4
-#endif
+#include <vector>

 // Library headers from llcommon project:
 #include "indra_constants.h"
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@ -50,7 +50,6 @@

 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
-#include <boost/scoped_ptr.hpp>

 class LLView;
 class LLViewerObject;
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@ -38,7 +38,6 @@ class LLVOAvatar;
 #include "llcallingcard.h"   // for LLFriendObserver
 #include "llsecapi.h"
 #include "llcontrol.h"
-#include <boost/shared_ptr.hpp>

 // devices

--- a/indra/newview/llwindowlistener.cpp
+++ b/indra/newview/llwindowlistener.cpp
@ -43,7 +43,6 @@
 #include "stringize.h"
 #include <typeinfo>
 #include <map>
-#include <boost/scoped_ptr.hpp>
 #include <boost/bind.hpp>

 LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter& kbgetter)
--- a/indra/newview/llxmlrpclistener.cpp
+++ b/indra/newview/llxmlrpclistener.cpp
@ -34,10 +34,6 @@
 // STL headers
 #include <map>
 #include <set>
-// std headers
-// external library headers
-#include <boost/scoped_ptr.hpp>
-#include <boost/range.hpp>          // boost::begin(), boost::end()

 #include "curl/curl.h"

@ -334,7 +330,7 @@ public:
        // need to wake up the loginCoro now
        llcoro::suspend();

-        // Because mTransaction is a boost::scoped_ptr, deleting this object
+        // Because mTransaction is a std::unique_ptr, deleting this object
        // frees our LLXMLRPCTransaction object.
        // Because mBoundListener is an LLTempBoundListener, deleting this
        // object disconnects it from "mainloop".
--- a/indra/test/llevents_tut.cpp
+++ b/indra/test/llevents_tut.cpp
@ -44,7 +44,6 @@
 #include <typeinfo>
 // external library headers
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/assign/list_of.hpp>
 // other Linden headers
 #include "tests/listener.h"             // must PRECEDE lltut.h
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@ -55,10 +55,6 @@

 #include <boost/iostreams/tee.hpp>
 #include <boost/iostreams/stream.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>

 #include <fstream>