core_whowas Change the FIFO to be an intrusive list

1 files changed, 6 insertions, 6 deletions

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 5c2bb62ee..021e9e3b7 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -34,7 +34,7 @@ namespace WhoWas
 {
 	/** Everything known about one nick
 	 */
-	struct Nick
+	struct Nick : public intrusive_list_node<Nick>
 	{
 		/** Container where each element has information about one occurrence of this nick
 		 */
@@ -56,16 +56,16 @@ namespace WhoWas
 		 */
 		~Nick();
 	};
+
+	/** Order in which the users were added into the map, used to remove oldest nick
+	 */
+	typedef intrusive_list_tail<Nick> FIFO;
 }
 
 /** Sets of users in the whowas system
  */
 typedef std::map<irc::string, WhoWas::Nick*> whowas_users;
 
-/** Sets of time and users in whowas list
- */
-typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
-
 /** Handle /WHOWAS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -80,7 +80,7 @@ class CommandWhowas : public Command
 
 	/** List of nicknames in the order they were inserted into the map
 	 */
-	whowas_users_fifo whowas_fifo;
+	WhoWas::FIFO whowas_fifo;
 
   public:
 	/** Max number of WhoWas entries per user.