mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 17:15:34 +00:00
Code Issues Releases Wiki Activity

Use std::any instead of boost::any

Browse source
This commit is contained in:
elsid 2022-05-22 02:16:01 +02:00
parent 8047a2138e
commit 9abfaef7a1
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/manualref.cpp
View file

@ -6,7 +6,7 @@ namespace
{
template<typename T>
void create(const MWWorld::Store<T>& list, const std::string& name, boost::any& refValue, MWWorld::Ptr& ptrValue)
void create(const MWWorld::Store<T>& list, const std::string& name, std::any& refValue, MWWorld::Ptr& ptrValue)
{
const T* base = list.find(name);
@ -26,7 +26,7 @@ namespace
MWWorld::LiveCellRef<T> ref(cellRef, base);
refValue = ref;
ptrValue = MWWorld::Ptr(&boost::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
ptrValue = MWWorld::Ptr(&std::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
}
}

4
apps/openmw/mwworld/manualref.hpp
View file

@ -1,7 +1,7 @@
#ifndef GAME_MWWORLD_MANUALREF_H
#define GAME_MWWORLD_MANUALREF_H
#include <boost/any.hpp>
#include <any>
#include "ptr.hpp"
@ -10,7 +10,7 @@ namespace MWWorld
/// \brief Manually constructed live cell ref
class ManualRef
{
boost::any mRef;
std::any mRef;
Ptr mPtr;
ManualRef (const ManualRef&);