diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-06-23 08:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 08:54:12 +0200 |
| commit | bab5fd87a34d92737e92d0850be05890a5ce8e24 (patch) | |
| tree | 6c83cf8a907dc04075b52f394e25a33985dc5b41 /src/server/game/Maps | |
| parent | 01c8d03e2ec67d4d4660e7e229274e86ba41420e (diff) | |
Core/Misc: Replace Trinity::make_unique with std (#24869)
Diffstat (limited to 'src/server/game/Maps')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 5e00ed3b83e..1406014504f 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -4381,7 +4381,7 @@ Weather* Map::GetOrGenerateZoneDefaultWeather(uint32 zoneId) ZoneDynamicInfo& info = _zoneDynamicInfo[zoneId]; if (!info.DefaultWeather) { - info.DefaultWeather = Trinity::make_unique<Weather>(zoneId, weatherData); + info.DefaultWeather = std::make_unique<Weather>(zoneId, weatherData); info.DefaultWeather->ReGenerate(); info.DefaultWeather->UpdateWeather(); } diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 396867684f9..d1cf310262d 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -747,7 +747,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> { auto itr = _guidGenerators.find(high); if (itr == _guidGenerators.end()) - itr = _guidGenerators.insert(std::make_pair(high, Trinity::make_unique<ObjectGuidGenerator<high>>())).first; + itr = _guidGenerators.insert(std::make_pair(high, std::make_unique<ObjectGuidGenerator<high>>())).first; return *itr->second; } |
