From 79c84d0fd70d6c6812323744c4a8ba1fc46938e4 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 8 Aug 2020 17:25:34 -0400
Subject: [PATCH] Replace deprecated auto_ptr with unique_ptr
---
indra/llui/lldockablefloater.h | 2 +-
indra/newview/llappearancemgr.h | 2 +-
indra/newview/llpaneloutfitedit.h | 2 +-
indra/newview/llpaneloutfitsinventory.h | 2 +-
indra/newview/lltoast.h | 2 +-
indra/test/lldoubledispatch_tut.cpp | 8 ++++----
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h
index 89c9852f4af..1e8acac71b3 100644
--- a/indra/llui/lldockablefloater.h
+++ b/indra/llui/lldockablefloater.h
@@ -131,7 +131,7 @@ class LLDockableFloater : public LLFloater
boost::function<BOOL ()> mIsDockedStateForcedCallback;
private:
- std::auto_ptr<LLDockControl> mDockControl;
+ std::unique_ptr<LLDockControl> mDockControl;
LLUIImagePtr mDockTongue;
static LLHandle<LLFloater> sInstanceHandle;
/**
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index c68887ba562..3512fc83c81 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -298,7 +298,7 @@ class LLAppearanceMgr final : public LLSingleton<LLAppearanceMgr>
LLUUID mCOFImageID;
- std::auto_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer;
+ std::unique_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer;
// Set of temp attachment UUIDs that should be removed
typedef std::set<LLUUID> doomed_temp_attachments_t;
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 3c6efac0e7b..8de3642b557 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -237,7 +237,7 @@ class LLPanelOutfitEdit : public LLPanel
LLToggleableMenu* mGearMenu;
LLToggleableMenu* mAddWearablesGearMenu;
bool mInitialized;
- std::auto_ptr<LLSaveOutfitComboBtn> mSaveComboBtn;
+ std::unique_ptr<LLSaveOutfitComboBtn> mSaveComboBtn;
LLMenuButton* mWearablesGearMenuBtn;
LLMenuButton* mGearMenuBtn;
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index 827c7c1c227..8fc7cfb70c7 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -71,7 +71,7 @@ class LLPanelOutfitsInventory : public LLPanel
private:
LLTabContainer* mAppearanceTabs;
std::string mFilterSubString;
- std::auto_ptr<LLSaveOutfitComboBtn> mSaveComboBtn;
+ std::unique_ptr<LLSaveOutfitComboBtn> mSaveComboBtn;
//////////////////////////////////////////////////////////////////////////////////
// tab panels //
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index 69074b16705..2b1fedf74d1 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -222,7 +222,7 @@ class LLToast : public LLModalDialog, public LLInstanceTracker<LLToast>
LLPanel* mWrapperPanel;
// timer counts a lifetime of a toast
- std::auto_ptr<LLToastLifeTimer> mTimer;
+ std::unique_ptr<LLToastLifeTimer> mTimer;
F32 mToastLifetime; // in seconds
F32 mToastFadingTime; // in seconds
diff --git a/indra/test/lldoubledispatch_tut.cpp b/indra/test/lldoubledispatch_tut.cpp
index ad8f6454d4c..e38d0e92a37 100644
--- a/indra/test/lldoubledispatch_tut.cpp
+++ b/indra/test/lldoubledispatch_tut.cpp
@@ -135,10 +135,10 @@ namespace tut
// Instantiate a few GameObjects. Make sure we refer to them
// polymorphically, and don't let them leak.
- std::auto_ptr<GameObject> home;
- std::auto_ptr<GameObject> obstacle;
- std::auto_ptr<GameObject> tug;
- std::auto_ptr<GameObject> patrol;
+ std::unique_ptr<GameObject> home;
+ std::unique_ptr<GameObject> obstacle;
+ std::unique_ptr<GameObject> tug;
+ std::unique_ptr<GameObject> patrol;
// prototype objects
Asteroid dummyAsteroid;
--
GitLab