From e2d8bb128373a5ab00efab293367ef869bca626a Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 6 Apr 2015 01:35:11 +0100 Subject: [PATCH] Make some destructors virtual, though we don't delete through parents * It keeps compiling happy and warning-free --- renderdoc/core/remote_access.cpp | 2 ++ renderdoc/core/remote_replay.cpp | 2 +- renderdoc/replay/replay_renderer.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/renderdoc/core/remote_access.cpp b/renderdoc/core/remote_access.cpp index e7c71df75..057269cb1 100644 --- a/renderdoc/core/remote_access.cpp +++ b/renderdoc/core/remote_access.cpp @@ -398,6 +398,8 @@ struct RemoteAccess : public IRemoteAccess SAFE_DELETE(ser); } + virtual ~RemoteAccess() {} + bool Connected() { return m_Socket != NULL && m_Socket->Connected(); } void Shutdown() diff --git a/renderdoc/core/remote_replay.cpp b/renderdoc/core/remote_replay.cpp index 49f498b2e..bd655e13f 100644 --- a/renderdoc/core/remote_replay.cpp +++ b/renderdoc/core/remote_replay.cpp @@ -267,7 +267,7 @@ struct RemoteRenderer : public IRemoteRenderer m_RemoteDrivers.reserve(m.size()); for(auto it=m.begin(); it != m.end(); ++it) m_RemoteDrivers.push_back(*it); } - ~RemoteRenderer() + virtual ~RemoteRenderer() { SAFE_DELETE(m_Socket); } diff --git a/renderdoc/replay/replay_renderer.h b/renderdoc/replay/replay_renderer.h index 8d1810299..058919d1c 100644 --- a/renderdoc/replay/replay_renderer.h +++ b/renderdoc/replay/replay_renderer.h @@ -61,7 +61,7 @@ public: uint32_t PickVertex(uint32_t frameID, uint32_t eventID, uint32_t x, uint32_t y); private: ReplayOutput(ReplayRenderer *parent, void *w); - ~ReplayOutput(); + virtual ~ReplayOutput(); void SetFrameEvent(int frameID, int eventID); void SetContextFilter(ResourceId id, uint32_t firstDefEv, uint32_t lastDefEv); @@ -127,7 +127,7 @@ struct ReplayRenderer : public IReplayRenderer { public: ReplayRenderer(); - ~ReplayRenderer(); + virtual ~ReplayRenderer(); APIProperties GetAPIProperties();