Index: trunk/FACT++/src/StateMachineImp.cc
===================================================================
--- trunk/FACT++/src/StateMachineImp.cc	(revision 10217)
+++ trunk/FACT++/src/StateMachineImp.cc	(revision 10218)
@@ -144,5 +144,5 @@
     // 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,5 +162,5 @@
 {
     fMutex.lock();
-    fEventQueue.push_back(cmd);
+    fEventQueue.push(cmd);
     fMutex.unlock();
 }
@@ -182,5 +182,5 @@
     // and remove event from the stack
     Event *cmd = fEventQueue.front();
-    fEventQueue.pop_front();
+    fEventQueue.pop();
 
     fMutex.unlock();
Index: trunk/FACT++/src/StateMachineImp.h
===================================================================
--- trunk/FACT++/src/StateMachineImp.h	(revision 10217)
+++ trunk/FACT++/src/StateMachineImp.h	(revision 10218)
@@ -3,5 +3,5 @@
 
 #include <map>
-#include <deque>
+#include <queue>
 #include <mutex>
 #include <vector>
@@ -35,5 +35,5 @@
 
     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