From 202fd41389973322f63186fd8e5a368fce3e1b04 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Wed, 15 Jul 2020 10:22:29 +0200 Subject: Core/Misc: Replace boost::optional with std::optional (#25047) C++17 is already mandatory, so it's a safe thing to do --- src/common/Collision/DynamicTree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/Collision/DynamicTree.cpp') diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index bfe33c9eae7..35047464231 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -318,9 +318,9 @@ void DynamicMapTree::getAreaAndLiquidData(float x, float y, float z, uint32 phas float liquidLevel; if (!reqLiquidType || (dynamic_cast(VMAP::VMapFactory::createOrGetVMapManager())->GetLiquidFlagsPtr(liquidType) & reqLiquidType)) if (intersectionCallBack.GetHitModel()->GetLiquidLevel(v, intersectionCallBack.GetLocationInfo(), liquidLevel)) - data.liquidInfo = boost::in_place(liquidType, liquidLevel); + data.liquidInfo.emplace(liquidType, liquidLevel); - data.areaInfo = boost::in_place(0, + data.areaInfo.emplace(0, intersectionCallBack.GetLocationInfo().rootId, intersectionCallBack.GetLocationInfo().hitModel->GetWmoID(), intersectionCallBack.GetLocationInfo().hitModel->GetMogpFlags()); -- cgit v1.2.3