From fee6b19cd67e9e4d9cd9c1904514de8be1317d1d Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 2 Mar 2014 21:12:27 +0100
Subject: IdManager tweaks

---
 src/game-server/idmanager.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/game-server/idmanager.h b/src/game-server/idmanager.h
index 57828af8..2b606975 100644
--- a/src/game-server/idmanager.h
+++ b/src/game-server/idmanager.h
@@ -53,7 +53,7 @@ inline unsigned IdManager<Value>::allocate(Value *t)
        ++mLastId;
     } while (mIdMap.find(mLastId) != mIdMap.end());
 
-    mIdMap.insert(std::make_pair(mLastId, t));
+    mIdMap.emplace(mLastId, t);
     return mLastId;
 }
 
@@ -67,9 +67,7 @@ template <typename Value>
 inline Value *IdManager<Value>::find(unsigned id) const
 {
     auto it = mIdMap.find(id);
-    if (it != mIdMap.end())
-        return it->second;
-    return nullptr;
+    return it != mIdMap.end() ? it->second : nullptr;
 }
 
 #endif // IDMANAGER_H
-- 
cgit v1.2.3-70-g09d2