From 205cd44a49b7d9b36dfed661b384e7982656bd94 Mon Sep 17 00:00:00 2001 From: amantley Date: Wed, 27 Jun 2018 14:31:33 -0700 Subject: [PATCH] removed override keyword from OtherAvatar and MyAvatar destructors, also added the virtual keyword to the createOrb virtual method in OtherAvatar --- interface/src/avatar/MyAvatar.h | 2 +- interface/src/avatar/OtherAvatar.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 212abd6bde..0a2f6f8354 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -250,7 +250,7 @@ public: Q_ENUM(DriveKeys) explicit MyAvatar(QThread* thread); - ~MyAvatar() override; + virtual ~MyAvatar(); void instantiableAvatar() override {}; void registerMetaTypes(ScriptEnginePointer engine); diff --git a/interface/src/avatar/OtherAvatar.h b/interface/src/avatar/OtherAvatar.h index f7ad0ed669..f33952b78b 100644 --- a/interface/src/avatar/OtherAvatar.h +++ b/interface/src/avatar/OtherAvatar.h @@ -17,10 +17,10 @@ class OtherAvatar : public Avatar { public: explicit OtherAvatar(QThread* thread); - ~OtherAvatar() override; + virtual ~OtherAvatar(); virtual void instantiableAvatar() override { }; - void createOrb() override; + virtual void createOrb() override; void updateOrbPosition(); void removeOrb();