From 37394a80c2b4a3948e4f0e850710c9518d9ba259 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Mon, 12 Aug 2013 20:10:06 +0200 Subject: Clean up a few constructors Do not silently correct a zero TS in Channel::Channel(); require callers to supply a valid TS instead --- src/users.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/users.cpp') diff --git a/src/users.cpp b/src/users.cpp index 21079f0cc..0383aaaa4 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -80,10 +80,7 @@ User::User(const std::string &uid, const std::string& sid, int type) ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New UUID for user: %s", uuid.c_str()); - user_hash::iterator finduuid = ServerInstance->Users->uuidlist->find(uuid); - if (finduuid == ServerInstance->Users->uuidlist->end()) - (*ServerInstance->Users->uuidlist)[uuid] = this; - else + if (!ServerInstance->Users->uuidlist->insert(std::make_pair(uuid, this)).second) throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor"); } -- cgit v1.3.1-10-gc9f91