Remove unneeded operator= overloads

Author: Molter73

collector/lib/CollectorStatsExporter.h

@@ -2,7 +2,6 @@
 #define _COLLECTOR_STATS_EXPORTER_H_
 
 #include <memory>
-#include <utility>
 
 #include "CollectorConfig.h"
 #include "CollectorStats.h"
@@ -14,32 +13,6 @@ namespace collector {
 
 class CollectorStatsExporter {
  public:
-  CollectorStatsExporter() = default;
-  CollectorStatsExporter(const CollectorStatsExporter&) = delete;
-  CollectorStatsExporter(CollectorStatsExporter&&) = delete;
-  CollectorStatsExporter& operator=(const CollectorStatsExporter&) = delete;
-  ~CollectorStatsExporter() = default;
-
-  CollectorStatsExporter& operator=(CollectorStatsExporter&& other) noexcept {
-    auto swap_running = other.thread_.running();
-
-    if (swap_running) {
-      other.stop();
-    }
-
-    registry_.swap(other.registry_);
-    std::swap(config_, other.config_);
-    std::swap(system_inspector_, other.system_inspector_);
-    connections_total_reporter_.swap(other.connections_total_reporter_);
-    connections_rate_reporter_.swap(other.connections_rate_reporter_);
-
-    if (swap_running) {
-      start();
-    }
-
-    return *this;
-  }
-
   CollectorStatsExporter(std::shared_ptr<prometheus::Registry> registry, const CollectorConfig* config, system_inspector::Service* si);
 
   bool start();

collector/lib/system-inspector/Service.cpp

@@ -33,31 +33,7 @@
 
 namespace collector::system_inspector {
 
-Service::Service() = default;
 Service::~Service() = default;
-Service& Service::operator=(Service&& other) noexcept {
-  {
-    auto other_sinsp_lock = std::lock_guard<std::mutex>(other.libsinsp_mutex_);
-    auto this_sinsp_lock = std::lock_guard<std::mutex>(libsinsp_mutex_);
-
-    inspector_.swap(other.inspector_);
-    container_metadata_inspector_.swap(other.container_metadata_inspector_);
-    default_formatter_.swap(other.default_formatter_);
-  }
-
-  signal_handlers_.swap(other.signal_handlers_);
-
-  userspace_stats_ = other.userspace_stats_;
-  global_event_filter_ = other.global_event_filter_;
-
-  {
-    auto other_running_lock = std::lock_guard<std::mutex>(other.running_mutex_);
-    auto this_running_lock = std::lock_guard<std::mutex>(running_mutex_);
-    std::swap(running_, other.running_);
-  }
-
-  return *this;
-}
 
 Service::Service(const CollectorConfig& config, CollectorOutput* client)
     : inspector_(std::make_unique<sinsp>(true)),

collector/lib/system-inspector/Service.h

@@ -24,11 +24,10 @@ namespace collector::system_inspector {
 
 class Service : public SystemInspector {
  public:
-  Service();
   Service(const Service&) = delete;
   Service(Service&&) = delete;
   Service& operator=(const Service&) = delete;
-  Service& operator=(Service&&) noexcept;
+  Service& operator=(Service&&) = delete;
   ~Service() override;
 
   Service(const CollectorConfig& config, CollectorOutput* client);