From 01dda978b354592e4b7eefcb2290ea766301072c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 27 Jun 2023 17:52:08 +0200 Subject: [PATCH] Let's replace this boost::unordered_map with the std counterpart, too --- indra/newview/fsradar.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/indra/newview/fsradar.h b/indra/newview/fsradar.h index ca32582bd0..8fbb20e5ed 100644 --- a/indra/newview/fsradar.h +++ b/indra/newview/fsradar.h @@ -34,10 +34,10 @@ class LLAvatarName; -const U32 FSRADAR_MAX_AVATARS_PER_ALERT = 6; // maximum number of UUIDs we can cram into a single channel radar alert message -const U32 FSRADAR_COARSE_OFFSET_INTERVAL = 7; // seconds after which we query the bridge for a coarse location adjustment -const U32 FSRADAR_MAX_OFFSET_REQUESTS = 60; // 2048 / UUID size, leaving overhead space -const U32 FSRADAR_CHAT_MIN_SPACING = 6; // minimum delay between radar chat messages +constexpr U32 FSRADAR_MAX_AVATARS_PER_ALERT{ 6 }; // maximum number of UUIDs we can cram into a single channel radar alert message +constexpr U32 FSRADAR_COARSE_OFFSET_INTERVAL{ 7 }; // seconds after which we query the bridge for a coarse location adjustment +constexpr U32 FSRADAR_MAX_OFFSET_REQUESTS{ 60 }; // 2048 / UUID size, leaving overhead space +constexpr U32 FSRADAR_CHAT_MIN_SPACING{ 6 }; // minimum delay between radar chat messages typedef enum e_radar_name_format { @@ -100,7 +100,7 @@ public: mCallback(); } - callback_t mCallback; + callback_t mCallback; }; typedef boost::signals2::signal& entries, const LLSD& stats)> radar_update_callback_t; @@ -110,11 +110,11 @@ public: } private: - void updateRadarList(); - void updateTracking(); - void checkTracking(); - void radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name, std::string_view postMsg); - void updateAgeAlertCheck(); + void updateRadarList(); + void updateTracking(); + void checkTracking(); + void radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name, std::string_view postMsg); + void updateAgeAlertCheck(); std::unique_ptr mRadarListUpdater; @@ -125,7 +125,7 @@ private: bool lastIgnore; }; - typedef boost::unordered_map radarfields_map_t; + typedef std::unordered_map radarfields_map_t; radarfields_map_t mLastRadarSweep; entry_map_t mEntryList;