diff --git a/modules/juce_core/memory/juce_ReferenceCountedObject.h b/modules/juce_core/memory/juce_ReferenceCountedObject.h index 12e2f3afc7..b1d1a8629f 100644 --- a/modules/juce_core/memory/juce_ReferenceCountedObject.h +++ b/modules/juce_core/memory/juce_ReferenceCountedObject.h @@ -116,6 +116,8 @@ protected: private: //============================================================================== Atomic refCount; + + JUCE_DECLARE_NON_COPYABLE (ReferenceCountedObject) }; @@ -175,6 +177,8 @@ protected: private: //============================================================================== int refCount; + + JUCE_DECLARE_NON_COPYABLE (SingleThreadedReferenceCountedObject) }; diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp index a16337549e..f9362524d6 100644 --- a/modules/juce_data_structures/values/juce_ValueTree.cpp +++ b/modules/juce_data_structures/values/juce_ValueTree.cpp @@ -28,13 +28,13 @@ class ValueTree::SharedObject : public ReferenceCountedObject public: typedef ReferenceCountedObjectPtr Ptr; - explicit SharedObject (const Identifier& type_) noexcept - : type (type_), parent (nullptr) + explicit SharedObject (const Identifier& t) noexcept + : type (t), parent (nullptr) { } SharedObject (const SharedObject& other) - : ReferenceCountedObject (other), + : ReferenceCountedObject(), type (other.type), properties (other.properties), parent (nullptr) { for (int i = 0; i < other.children.size(); ++i) diff --git a/modules/juce_graphics/fonts/juce_Font.cpp b/modules/juce_graphics/fonts/juce_Font.cpp index dff5b091da..839cfdd1d9 100644 --- a/modules/juce_graphics/fonts/juce_Font.cpp +++ b/modules/juce_graphics/fonts/juce_Font.cpp @@ -216,7 +216,7 @@ public: } SharedFontInternal (const SharedFontInternal& other) noexcept - : ReferenceCountedObject (other), + : ReferenceCountedObject(), typefaceName (other.typefaceName), typefaceStyle (other.typefaceStyle), height (other.height), diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h index 9ea92c99cf..5d591076fa 100644 --- a/modules/juce_graphics/native/juce_RenderingHelpers.h +++ b/modules/juce_graphics/native/juce_RenderingHelpers.h @@ -1578,7 +1578,7 @@ namespace ClipRegions EdgeTableRegion (const Rectangle& r) : edgeTable (r) {} EdgeTableRegion (const RectangleList& r) : edgeTable (r) {} EdgeTableRegion (const Rectangle& bounds, const Path& p, const AffineTransform& t) : edgeTable (bounds, p, t) {} - EdgeTableRegion (const EdgeTableRegion& other) : Base (other), edgeTable (other.edgeTable) {} + EdgeTableRegion (const EdgeTableRegion& other) : Base(), edgeTable (other.edgeTable) {} Ptr clone() const { return new EdgeTableRegion (*this); } Ptr applyClipTo (const Ptr& target) const { return target->clipToEdgeTable (edgeTable); } @@ -1774,7 +1774,7 @@ namespace ClipRegions public: RectangleListRegion (const Rectangle& r) : clip (r) {} RectangleListRegion (const RectangleList& r) : clip (r) {} - RectangleListRegion (const RectangleListRegion& other) : Base (other), clip (other.clip) {} + RectangleListRegion (const RectangleListRegion& other) : Base(), clip (other.clip) {} Ptr clone() const { return new RectangleListRegion (*this); } Ptr applyClipTo (const Ptr& target) const { return target->clipToRectangleList (clip); }