sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation 

I forgot master was still in C++14
This commit is contained in:
Jérôme Leclercq 2021-03-30 17:48:32 +02:00
parent 560061b4a5
commit 6d6391ca46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/HandledObject.inl
View File

@ -61,7 +61,7 @@ namespace Nz
template<typename U> template<typename U>
ObjectHandle<U> HandledObject<T>::CreateHandle() ObjectHandle<U> HandledObject<T>::CreateHandle()
{ {
static_assert(std::is_base_of_v<T, U>, "Cannot retrieve a handle for a non-related class"); static_assert(std::is_base_of<T, U>::value, "Cannot retrieve a handle for a non-related class");
return ObjectHandle<U>(static_cast<U*>(this)); return ObjectHandle<U>(static_cast<U*>(this));
} }

4
include/Nazara/Core/ObjectHandle.inl
View File

@ -31,7 +31,7 @@ namespace Nz
ObjectHandle<T>::ObjectHandle(const ObjectHandle<U>& ref) : ObjectHandle<T>::ObjectHandle(const ObjectHandle<U>& ref) :
m_handleData(ref.m_handleData) m_handleData(ref.m_handleData)
{ {
static_assert(std::is_base_of_v<T, U>, "Can only implicitly convert from a derived to a base"); static_assert(std::is_base_of<T, U>::value, "Can only implicitly convert from a derived to a base");
} }
template<typename T> template<typename T>
@ -41,7 +41,7 @@ namespace Nz
{ {
ref.m_handleData = Detail::HandleData::GetEmptyObject(); ref.m_handleData = Detail::HandleData::GetEmptyObject();
static_assert(std::is_base_of_v<T, U>, "Can only implicitly convert from a derived to a base"); static_assert(std::is_base_of<T, U>::value, "Can only implicitly convert from a derived to a base");
} }
/*! /*!