| @@ -116,6 +116,8 @@ protected: | |||||
| private: | private: | ||||
| //============================================================================== | //============================================================================== | ||||
| Atomic <int> refCount; | Atomic <int> refCount; | ||||
| JUCE_DECLARE_NON_COPYABLE (ReferenceCountedObject) | |||||
| }; | }; | ||||
| @@ -175,6 +177,8 @@ protected: | |||||
| private: | private: | ||||
| //============================================================================== | //============================================================================== | ||||
| int refCount; | int refCount; | ||||
| JUCE_DECLARE_NON_COPYABLE (SingleThreadedReferenceCountedObject) | |||||
| }; | }; | ||||
| @@ -28,13 +28,13 @@ class ValueTree::SharedObject : public ReferenceCountedObject | |||||
| public: | public: | ||||
| typedef ReferenceCountedObjectPtr<SharedObject> Ptr; | typedef ReferenceCountedObjectPtr<SharedObject> 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) | SharedObject (const SharedObject& other) | ||||
| : ReferenceCountedObject (other), | |||||
| : ReferenceCountedObject(), | |||||
| type (other.type), properties (other.properties), parent (nullptr) | type (other.type), properties (other.properties), parent (nullptr) | ||||
| { | { | ||||
| for (int i = 0; i < other.children.size(); ++i) | for (int i = 0; i < other.children.size(); ++i) | ||||
| @@ -216,7 +216,7 @@ public: | |||||
| } | } | ||||
| SharedFontInternal (const SharedFontInternal& other) noexcept | SharedFontInternal (const SharedFontInternal& other) noexcept | ||||
| : ReferenceCountedObject (other), | |||||
| : ReferenceCountedObject(), | |||||
| typefaceName (other.typefaceName), | typefaceName (other.typefaceName), | ||||
| typefaceStyle (other.typefaceStyle), | typefaceStyle (other.typefaceStyle), | ||||
| height (other.height), | height (other.height), | ||||
| @@ -1578,7 +1578,7 @@ namespace ClipRegions | |||||
| EdgeTableRegion (const Rectangle<float>& r) : edgeTable (r) {} | EdgeTableRegion (const Rectangle<float>& r) : edgeTable (r) {} | ||||
| EdgeTableRegion (const RectangleList& r) : edgeTable (r) {} | EdgeTableRegion (const RectangleList& r) : edgeTable (r) {} | ||||
| EdgeTableRegion (const Rectangle<int>& bounds, const Path& p, const AffineTransform& t) : edgeTable (bounds, p, t) {} | EdgeTableRegion (const Rectangle<int>& 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 clone() const { return new EdgeTableRegion (*this); } | ||||
| Ptr applyClipTo (const Ptr& target) const { return target->clipToEdgeTable (edgeTable); } | Ptr applyClipTo (const Ptr& target) const { return target->clipToEdgeTable (edgeTable); } | ||||
| @@ -1774,7 +1774,7 @@ namespace ClipRegions | |||||
| public: | public: | ||||
| RectangleListRegion (const Rectangle<int>& r) : clip (r) {} | RectangleListRegion (const Rectangle<int>& r) : clip (r) {} | ||||
| RectangleListRegion (const RectangleList& 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 clone() const { return new RectangleListRegion (*this); } | ||||
| Ptr applyClipTo (const Ptr& target) const { return target->clipToRectangleList (clip); } | Ptr applyClipTo (const Ptr& target) const { return target->clipToRectangleList (clip); } | ||||