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

20 files changed, 2 insertions, 40 deletions

diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 9cd3e80f69..8f892025c9 100644
--- 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;
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index faa5d801dd..cd4222dddf 100644
--- 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;
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index 7a4899f1f3..4db7f32b10 100644
--- 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
 {
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 7c49db9c54..990a299c50 100644
--- 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>
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 8f3dc3ce16..c86492f005 100644
--- 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;
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index f37926a938..c54d2c080f 100644
--- 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>
 
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index 0ec7b3bb24..624408d46d 100644
--- 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"
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 00fd17badf..a1bf25fb05 100644
--- 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;
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 5e7bc4fb3b..84a62b3cbf 100644
--- 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"
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
index 18b6a31845..d838a1a51c 100644
--- 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>
 
diff --git a/indra/newview/llpathfindingnavmeshzone.cpp b/indra/newview/llpathfindingnavmeshzone.cpp
index 012cc11eee..e9ef170176 100644
--- 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"
 
diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
index a2c8691391..e770efa0d0 100644
--- 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>
 
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
index 17f12efd83..79a796dd60 100644
--- 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>
 
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h
index 654423183e..cfcd43dc1d 100644
--- 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;
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 22fb41e559..651483dbe3 100644
--- 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
 {
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 7c8067ede3..a857887247 100644
--- 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"
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 395d8c78da..1b995ea650 100644
--- 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;
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 2221bc6df4..3476571ca4 100644
--- 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
 
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp
index 6221d67b26..ebcdd537a5 100644
--- 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)
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
index 7c7bd98bcd..92e6c88752 100644
--- 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".