From 253fd51a96df4eac47228dec665a9b7d44ee5e8f Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 22 Jun 2017 08:34:53 +0100 Subject: [PATCH] Removed a superfluous base class inside SharedResourcePointer --- modules/juce_core/memory/juce_SharedResourcePointer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_core/memory/juce_SharedResourcePointer.h b/modules/juce_core/memory/juce_SharedResourcePointer.h index ee75cf661c..181f93fc6f 100644 --- a/modules/juce_core/memory/juce_SharedResourcePointer.h +++ b/modules/juce_core/memory/juce_SharedResourcePointer.h @@ -126,7 +126,7 @@ public: int getReferenceCount() const noexcept { return getSharedObjectHolder().refCount; } private: - struct SharedObjectHolder : public ReferenceCountedObject + struct SharedObjectHolder { SpinLock lock; ScopedPointer sharedInstance; @@ -154,7 +154,7 @@ private: // There's no need to assign to a SharedResourcePointer because every // instance of the class is exactly the same! - SharedResourcePointer& operator= (const SharedResourcePointer&) JUCE_DELETED_FUNCTION; + SharedResourcePointer& operator= (const SharedResourcePointer&) = delete; JUCE_LEAK_DETECTOR (SharedResourcePointer) };