From da5d8bc4c22d67eac2efcd1d49fb9988d98c3dfe Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 20 Mar 2020 20:56:15 +0100 Subject: [PATCH] Bypass MSVC parser regression --- include/Nazara/Graphics/CullingList.hpp | 8 ++++++++ include/Nazara/Graphics/CullingList.inl | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/Nazara/Graphics/CullingList.hpp b/include/Nazara/Graphics/CullingList.hpp index 7feb32362..7eff97852 100644 --- a/include/Nazara/Graphics/CullingList.hpp +++ b/include/Nazara/Graphics/CullingList.hpp @@ -136,6 +136,8 @@ namespace Nz { friend CullingList; + using ParentType = Entry; + public: BoxEntry(); BoxEntry(BoxEntry&&) = default; @@ -154,6 +156,8 @@ namespace Nz { friend CullingList; + using ParentType = Entry; + public: NoTestEntry(); NoTestEntry(NoTestEntry&&) = default; @@ -170,6 +174,8 @@ namespace Nz { friend CullingList; + using ParentType = Entry; + public: SphereEntry(); SphereEntry(SphereEntry&&) = default; @@ -188,6 +194,8 @@ namespace Nz { friend CullingList; + using ParentType = Entry; + public: VolumeEntry(); VolumeEntry(VolumeEntry&&) = default; diff --git a/include/Nazara/Graphics/CullingList.inl b/include/Nazara/Graphics/CullingList.inl index 341508351..aa94bc995 100644 --- a/include/Nazara/Graphics/CullingList.inl +++ b/include/Nazara/Graphics/CullingList.inl @@ -424,13 +424,13 @@ namespace Nz template CullingList::BoxEntry::BoxEntry() : - Entry() + ParentType() { } template CullingList::BoxEntry::BoxEntry(CullingList* parent, std::size_t index) : - Entry(parent, index) + ParentType(parent, index) { } @@ -444,13 +444,13 @@ namespace Nz template CullingList::NoTestEntry::NoTestEntry() : - Entry() + ParentType() { } template CullingList::NoTestEntry::NoTestEntry(CullingList* parent, std::size_t index) : - Entry(parent, index) + ParentType(parent, index) { } @@ -458,13 +458,13 @@ namespace Nz template CullingList::SphereEntry::SphereEntry() : - Entry() + ParentType() { } template CullingList::SphereEntry::SphereEntry(CullingList* parent, std::size_t index) : - Entry(parent, index) + ParentType(parent, index) { } @@ -478,13 +478,13 @@ namespace Nz template CullingList::VolumeEntry::VolumeEntry() : - Entry() + ParentType() { } template CullingList::VolumeEntry::VolumeEntry(CullingList* parent, std::size_t index) : - Entry(parent, index) + ParentType(parent, index) { }