dird: add or delete default copy constructors and assign operators

- SchedulerJobItem and SchedulerJobItemQueue
bareos · Nov 21, 2019 · ad12e9a · ad12e9a
1 parent 859d591
commit ad12e9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/core/src/dird/scheduler_job_item_queue.h b/core/src/dird/scheduler_job_item_queue.h
@@ -34,7 +34,14 @@ class JobResource;
 struct SchedulerJobItemQueuePrivate;
 
 struct SchedulerJobItem {
+  ~SchedulerJobItem() = default;
+
   SchedulerJobItem() = default;
+  SchedulerJobItem(const SchedulerJobItem& other) = default;
+  SchedulerJobItem(SchedulerJobItem&& other) = default;
+  SchedulerJobItem& operator=(const SchedulerJobItem& other) = default;
+  SchedulerJobItem& operator=(SchedulerJobItem&& other) = default;
+
   SchedulerJobItem(JobResource* job_in,
                    RunResource* run_in,
                    time_t runtime_in,
@@ -43,11 +50,13 @@ struct SchedulerJobItem {
   {
     is_valid = job && runtime;
   };
+
   bool operator==(const SchedulerJobItem& rhs) const
   {
     return runtime == rhs.runtime && job == rhs.job &&
            priority == rhs.priority && run == rhs.run;
   }
+
   bool operator!=(const SchedulerJobItem& rhs) const { return !(*this == rhs); }
 
   JobResource* job{nullptr};
@@ -68,6 +77,11 @@ class SchedulerJobItemQueue {
   bool Empty() const;
   void Clear();
 
+  SchedulerJobItemQueue(const SchedulerJobItemQueue& other) = delete;
+  SchedulerJobItemQueue(SchedulerJobItemQueue&& other) = delete;
+  SchedulerJobItemQueue& operator=(const SchedulerJobItemQueue& other) = delete;
+  SchedulerJobItemQueue& operator=(SchedulerJobItemQueue&& other) = delete;
+
  private:
   static constexpr int default_priority{10};
   std::unique_ptr<SchedulerJobItemQueuePrivate> impl_;

diff --git a/core/src/dird/scheduler_private.h b/core/src/dird/scheduler_private.h
@@ -37,7 +37,6 @@ class SchedulerTimeAdapter;
 class SchedulerPrivate {
  public:
   ~SchedulerPrivate();
-
   SchedulerPrivate();
 
   SchedulerPrivate(const SchedulerPrivate& other) = delete;