X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=efbf1a81b690609b9277030cde7eb242e42c4a89;hb=3ccf0065d43db80f31c6404aeac4d65551481508;hp=850ce7e400219e63a112663d52b1bd04ae0519f5;hpb=ff51071f1d8ce38d3d89a214bd30626879bab03c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 850ce7e40..efbf1a81b 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -37,8 +37,8 @@ enum
 class callerid_data
 {
  public:
- 	typedef std::set<User*> UserSet;
-	typedef std::list<callerid_data*> CallerIdDataSet;
+ 	typedef insp::flat_set<User*> UserSet;
+	typedef std::vector<callerid_data*> CallerIdDataSet;
 
 	time_t lastnotify;
 
@@ -139,7 +139,7 @@ struct CallerIDExtInfo : public ExtensionItem
 				continue; // shouldn't happen, but oh well.
 			}
 
-			if (!stdalgo::erase(targ->wholistsme, dat))
+			if (!stdalgo::vector::swaperase(targ->wholistsme, dat))
 				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
@@ -320,7 +320,7 @@ public:
 			return false;
 		}
 
-		if (!stdalgo::erase(dat2->wholistsme, dat))
+		if (!stdalgo::vector::swaperase(dat2->wholistsme, dat))
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");