From 33dfe63f67949623c510e3f84023d33a7f4bcd6f Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:42:54 +0200 Subject: [PATCH] Fix incorrect ICVarIteratorInternal function order The destructor is the last function. --- r5dev/public/icvar.h | 4 ++-- r5dev/public/tier1/cvar.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/r5dev/public/icvar.h b/r5dev/public/icvar.h index 6855c897..40483c78 100644 --- a/r5dev/public/icvar.h +++ b/r5dev/public/icvar.h @@ -112,12 +112,12 @@ protected: class ICVarIteratorInternal { public: - virtual ~ICVarIteratorInternal(void) { } - virtual void SetFirst(void) = 0; virtual void Next(void) = 0; virtual bool IsValid(void) = 0; virtual ConCommandBase* Get(void) = 0; + + virtual ~ICVarIteratorInternal(void) { } }; virtual ICVarIteratorInternal* FactoryInternalIterator(void) = 0; diff --git a/r5dev/public/tier1/cvar.h b/r5dev/public/tier1/cvar.h index 10adc300..d74ce3e5 100644 --- a/r5dev/public/tier1/cvar.h +++ b/r5dev/public/tier1/cvar.h @@ -88,13 +88,14 @@ protected: class CCVarIteratorInternal : public ICVarIteratorInternal { public: - virtual ~CCVarIteratorInternal() { } virtual void SetFirst(void) = 0; virtual void Next(void) = 0; virtual bool IsValid(void) = 0; virtual ConCommandBase* Get(void) = 0; + virtual ~CCVarIteratorInternal() { } + CCvar* const m_pOuter = nullptr; CConCommandHash* const m_pHash = nullptr; CConCommandHash::CCommandHashIterator_t m_hashIter;