boost->std & same level interp

6 files changed, 11 insertions, 12 deletions

diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 073e4616a5..420bcb9943 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -31,7 +31,6 @@
 #include <string>
 #include <map>
 #include <vector>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 
 #include "llsd.h"
@@ -44,7 +43,7 @@
 #include "v3color.h"
 
 class LLSettingsBase : 
-    public boost::enable_shared_from_this<LLSettingsBase>,
+    public std::enable_shared_from_this<LLSettingsBase>,
     private boost::noncopyable
 {
     friend class LLEnvironment;
@@ -58,7 +57,7 @@ public:
 
     typedef std::map<std::string, S32>  parammapping_t;
 
-    typedef boost::shared_ptr<LLSettingsBase> ptr_t;
+    typedef std::shared_ptr<LLSettingsBase> ptr_t;
 
     virtual ~LLSettingsBase() { };
 
@@ -237,10 +236,10 @@ private:
 };
 
 
-class LLSettingsBlender : public boost::enable_shared_from_this<LLSettingsBlender>
+class LLSettingsBlender : public std::enable_shared_from_this<LLSettingsBlender>
 {
 public:
-    typedef boost::shared_ptr<LLSettingsBlender>      ptr_t;
+    typedef std::shared_ptr<LLSettingsBlender>      ptr_t;
     typedef boost::signals2::signal<void(const ptr_t )> finish_signal_t;
     typedef boost::signals2::connection     connection_t;
 
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index 8a1634d674..4c7ce011a1 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -33,8 +33,8 @@
 class LLSettingsWater;
 class LLSettingsSky;
 
-typedef boost::shared_ptr<LLSettingsWater> LLSettingsWaterPtr_t;
-typedef boost::shared_ptr<LLSettingsSky> LLSettingsSkyPtr_t;
+typedef std::shared_ptr<LLSettingsWater> LLSettingsWaterPtr_t;
+typedef std::shared_ptr<LLSettingsSky> LLSettingsSkyPtr_t;
 
 class LLSettingsDay : public LLSettingsBase
 {
@@ -60,7 +60,7 @@ public:
 
     typedef std::map<F32, LLSettingsBase::ptr_t>    CycleTrack_t;
     typedef std::vector<CycleTrack_t>               CycleList_t;
-    typedef boost::shared_ptr<LLSettingsDay>        ptr_t;
+    typedef std::shared_ptr<LLSettingsDay>        ptr_t;
     typedef std::vector<F32>                        KeyframeList_t;
     typedef std::pair<CycleTrack_t::iterator, CycleTrack_t::iterator> TrackBound_t;
 
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 32b292e384..572b5703b3 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -98,7 +98,7 @@ LLSettingsSky::LLSettingsSky():
 
 void LLSettingsSky::blend(const LLSettingsBase::ptr_t &end, F64 blendf) 
 {
-    LLSettingsSky::ptr_t other = boost::static_pointer_cast<LLSettingsSky>(end);
+    LLSettingsSky::ptr_t other = std::static_pointer_cast<LLSettingsSky>(end);
     LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf);
 
     replaceSettings(blenddata);
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 9947ffc022..e9ffbdb32c 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -62,7 +62,7 @@ public:
     static const std::string SETTING_SUN_ROTATION;
     static const std::string SETTING_SUN_TEXUTUREID;
 
-    typedef boost::shared_ptr<LLSettingsSky> ptr_t;
+    typedef std::shared_ptr<LLSettingsSky> ptr_t;
     typedef std::pair<F32, F32> azimalt_t;
 
     //---------------------------------------------------------------------
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index 0fe3de44d3..a72cbc4136 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -163,7 +163,7 @@ LLSD LLSettingsWater::translateLegacySettings(LLSD legacy)
 
 void LLSettingsWater::blend(const LLSettingsBase::ptr_t &end, F64 blendf) 
 {
-    LLSettingsWater::ptr_t other = boost::static_pointer_cast<LLSettingsWater>(end);
+    LLSettingsWater::ptr_t other = std::static_pointer_cast<LLSettingsWater>(end);
     LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf);
     
     replaceSettings(blenddata);
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h
index 4c61e2a34c..4d206a1be0 100644
--- a/indra/llinventory/llsettingswater.h
+++ b/indra/llinventory/llsettingswater.h
@@ -48,7 +48,7 @@ public:
 
     static const LLUUID DEFAULT_WATER_NORMAL_ID;
 
-    typedef boost::shared_ptr<LLSettingsWater> ptr_t;
+    typedef std::shared_ptr<LLSettingsWater> ptr_t;
 
     //---------------------------------------------------------------------
     LLSettingsWater(const LLSD &data);