From 6d6391ca46eae4412d911cc9589cfa2eaeb86502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 30 Mar 2021 17:48:32 +0200 Subject: [PATCH] Fix compilation I forgot master was still in C++14 --- include/Nazara/Core/HandledObject.inl | 2 +- include/Nazara/Core/ObjectHandle.inl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Core/HandledObject.inl b/include/Nazara/Core/HandledObject.inl index 8f1e497a0..6addf9c77 100644 --- a/include/Nazara/Core/HandledObject.inl +++ b/include/Nazara/Core/HandledObject.inl @@ -61,7 +61,7 @@ namespace Nz template ObjectHandle HandledObject::CreateHandle() { - static_assert(std::is_base_of_v, "Cannot retrieve a handle for a non-related class"); + static_assert(std::is_base_of::value, "Cannot retrieve a handle for a non-related class"); return ObjectHandle(static_cast(this)); } diff --git a/include/Nazara/Core/ObjectHandle.inl b/include/Nazara/Core/ObjectHandle.inl index 1a3d09b9b..be3ec5c0c 100644 --- a/include/Nazara/Core/ObjectHandle.inl +++ b/include/Nazara/Core/ObjectHandle.inl @@ -31,7 +31,7 @@ namespace Nz ObjectHandle::ObjectHandle(const ObjectHandle& ref) : m_handleData(ref.m_handleData) { - static_assert(std::is_base_of_v, "Can only implicitly convert from a derived to a base"); + static_assert(std::is_base_of::value, "Can only implicitly convert from a derived to a base"); } template @@ -41,7 +41,7 @@ namespace Nz { ref.m_handleData = Detail::HandleData::GetEmptyObject(); - static_assert(std::is_base_of_v, "Can only implicitly convert from a derived to a base"); + static_assert(std::is_base_of::value, "Can only implicitly convert from a derived to a base"); } /*!