Changeset 3062

Timestamp:

Jul 2, 2013, 5:08:42 AM (8 years ago)

Author:

Peter

Message:

implement copy and assignment (compiler generated does not compile sinc emutex is not copyable)

Location:

trunk

Files:

• test/queue.cc (modified) (1 diff)
• yat/utility/Queue.h (modified) (3 diffs)

trunk/test/queue.cc

@@ -73 +73 @@
   workers.join_all();
 
-  std::cerr << "OK\n";
-  return 0;
+  Queue<std::string> queue2(queue);
+
+  queue2 = queue;
+
+  return suite.return_value();
 }

trunk/yat/utility/Queue.h

@@ -22 +22 @@
 
 #include <deque>
+#include <utility>
 
 namespace theplu {
@@ -58 +59 @@
     */
     typedef typename std::deque<T>::size_type size_type;
+
+    /**
+       \brief Create a Queue with no elements
+    */
+    Queue(void) {}
+
+    /**
+       \brief Create a Queue with no elements
+
+       \note is not thread safe
+    */
+    Queue(const Queue& other) : q_(other.q_) {}
 
     /**
@@ -129 +142 @@
     } // lock is released here
 
+
+    /**
+       \brief assignment operator
+
+       \note is not thread safe
+     */
+    Queue& operator=(const Queue& lhs)
+    {
+      q_ = lhs.q_;
+      return *this;
+    }
+
   private:
     std::deque<T> q_;
     mutable boost::mutex mutex_;
     boost::condition_variable condition_;
-
-    // Using compiler generated (not thread safe) copy and assignment
-    //Queue(const Queue&);
-    //Queue& operator=(const Queue&);
   };