Make LLLater store target time in mHandles; ditch 2nd unordered_map.

Instead of maintaining a whole separate unordered_map to look up target times,
make room in the HandleMap entry for the target time. There's still
circularity, but the split into doAtTime1() and doAtTime2() resolves it: since
doAtTime2() accepts the mHandles iterator created by doAtTime1(), doAtTime2()
can simply store the new mQueue handle_type into the appropriate slot.

Also sprinkle in a few more override keywords for consistency.

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llcommon/llcallbacklist.h b/indra/llcommon/llcallbacklist.h
index 17adb7f431..3ff1aad04e 100644
--- a/indra/llcommon/llcallbacklist.h
+++ b/indra/llcommon/llcallbacklist.h
@@ -241,10 +241,10 @@ private:
     // the heap aka priority queue
     queue_t mQueue;
     // handles we've returned that haven't yet canceled
-    using HandleMap = std::unordered_map<token_t, queue_t::handle_type>;
+    using HandleMap = std::unordered_map<
+        token_t,
+        std::pair<queue_t::handle_type, LLDate::timestamp>>;
     HandleMap mHandles;
-    using DoneMap = std::unordered_map<token_t, LLDate::timestamp>;
-    DoneMap mDoneTimes;
     token_t mToken{ 0 };
     // While mQueue is non-empty, register for regular callbacks.
     LLCallbackList::temp_handle_t mLive;
@@ -252,8 +252,8 @@ private:
     struct Periodic;
 
     // internal implementation for doAtTime()
-    DoneMap::iterator doAtTime1(LLDate::timestamp time);
-    handle_t doAtTime2(nullary_func_t callable, DoneMap::iterator iter);
+    HandleMap::iterator doAtTime1(LLDate::timestamp time);
+    handle_t doAtTime2(nullary_func_t callable, HandleMap::iterator iter);
 };
 
 /*-------------------- legacy names in global namespace --------------------*/