Changeset 10218 for trunk/FACT++/src

Timestamp:

03/03/11 12:45:37 (14 years ago)

Author:

tbretz

Message:

Replaced deque by queue

Location:

trunk/FACT++/src

Files:

• StateMachineImp.cc (modified) (3 diffs)
• StateMachineImp.h (modified) (2 diffs)

trunk/FACT++/src/StateMachineImp.cc

@@ -144 +144 @@
     // queue is empty
     if (fEventQueue.size())
-        for (Event *q=fEventQueue.front(); q; fEventQueue.pop_front())
+        for (Event *q=fEventQueue.front(); q; fEventQueue.pop())
             delete q;
 }
@@ -162 +162 @@
 {
     fMutex.lock();
-    fEventQueue.push_back(cmd);
+    fEventQueue.push(cmd);
     fMutex.unlock();
 }
@@ -182 +182 @@
     // and remove event from the stack
     Event *cmd = fEventQueue.front();
-    fEventQueue.pop_front();
+    fEventQueue.pop();
 
     fMutex.unlock();

trunk/FACT++/src/StateMachineImp.h

@@ -3 +3 @@
 
 #include <map>
-#include <deque>
+#include <queue>
 #include <mutex>
 #include <vector>
@@ -35 +35 @@
 
     std::vector<EventImp*> fListOfEvents; /// List of available commands as setup by user
-    std::deque<Event*>     fEventQueue;   /// Event queue (fifo) for the received commands
+    std::queue<Event*>     fEventQueue;   /// Event queue (fifo) for the received commands
 
     std::mutex fMutex;   /// Mutex to ensure thread-safe access to the command fifo