Change the way the Delegate and Instance classes are stopped from being copyabel.

Author: hicklin

src/app/clusters/service-area-server/service-area-delegate.h

@@ -38,31 +38,22 @@ constexpr size_t kMaxNumProgressElements   = 255;
 
 constexpr size_t kMaxSizeStatusText = 256;
 
-/**
- * Uncopyable is a helper to ensure that Service Area cluster instances and delegates
- * are unique and cannot be copied.
- */
-class Uncopyable
-{
-protected:
-    Uncopyable() {}
-    ~Uncopyable() = default;
-
-private:
-    Uncopyable(const Uncopyable &)             = delete;
-    Uncopyable & operator=(const Uncopyable &) = delete;
-};
-
 /**
  * ServiceArea::Delegate Defines methods for implementing application-specific
  * logic for the Service Area Cluster.
  */
-class Delegate : public Uncopyable
+class Delegate
 {
 public:
     Delegate()          = default;
     virtual ~Delegate() = default;
 
+    /**
+     * Stop this class objects from being copied.
+     */
+    Delegate(const Delegate &) = delete;
+    Delegate & operator=(const Delegate &) = delete;
+
     friend class Instance;
 
 protected:

src/app/clusters/service-area-server/service-area-server.h

@@ -44,7 +44,7 @@ namespace ServiceArea {
  * Custom implementations of the Service Area cluster override functions in the Delegate class
  * must be provided to operate with specific devices.
  */
-class Instance : public AttributeAccessInterface, public CommandHandlerInterface, public Uncopyable
+class Instance : public AttributeAccessInterface, public CommandHandlerInterface
 {
 public:
     /**
@@ -60,6 +60,13 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
 
     ~Instance() override;
 
+    /**
+     * Stop this class objects from being copied.
+     */
+    Instance(const Instance &) = delete;
+    Instance & operator=(const Instance &) = delete;
+
+
     /**
      * @brief Initialise the Service Area server instance.
      * @return an error if the given endpoint and cluster Id have not been enabled in zap or if the