diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2014-03-02 21:12:27 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2014-03-02 21:12:44 +0100 |
| commit | fee6b19cd67e9e4d9cd9c1904514de8be1317d1d (patch) | |
| tree | b538bf827b0c97b1db9862bdeaf2202d9ce63338 /src | |
| parent | 8b7642932dffeb7e6d8a90d656791b4ff3ba15f7 (diff) | |
| download | manaserv-fee6b19cd67e9e4d9cd9c1904514de8be1317d1d.tar.gz manaserv-fee6b19cd67e9e4d9cd9c1904514de8be1317d1d.tar.bz2 manaserv-fee6b19cd67e9e4d9cd9c1904514de8be1317d1d.tar.xz manaserv-fee6b19cd67e9e4d9cd9c1904514de8be1317d1d.zip | |
IdManager tweaks
Diffstat (limited to 'src')
| -rw-r--r-- | src/game-server/idmanager.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 |