Changeset 16528

Timestamp:

05/31/13 14:26:29 (11 years ago)

Author:

tbretz

Message:

Made the list a class member to avoid accesses from outsize and confusion by the compiler with overwritten functions; added empty()

File:

• trunk/FACT++/src/queue.h (modified) (8 diffs)

trunk/FACT++/src/queue.h

@@ -7 +7 @@
 
 template<class T>
-class Queue : std::list<T>
+class Queue
 {
+    size_t fSize;                 // Only necessary for before C++11
+
+    std::list<T> fList;
+
     std::mutex fMutex;        // Mutex needed for the conditional
     std::condition_variable fCond; // Conditional
@@ -19 +23 @@
         kAbort,
     };
-
-    size_t fSize;                 // Only necessary for before C++11
 
     state_t fState;               // Stop signal for the thread
@@ -35 +37 @@
         while (1)
         {
-            while (std::list<T>::empty() && fState==kRun)
+            while (fList.empty() && fState==kRun)
                 fCond.wait(lock);
 
@@ -41 +43 @@
                 break;
 
-            if (fState==kStop && std::list<T>::empty())
+            if (fState==kStop && fList.empty())
                 break;
 
-            const T &val = std::list<T>::front();
+            const T &val = fList.front();
 
             // Theoretically, we can loose a signal here, but this is
@@ -55 +57 @@
             lock.lock();
 
-            std::list<T>::pop_front();
+            fList.pop_front();
             fSize--;
         }
 
-        std::list<T>::clear();
+        fList.clear();
         fSize = 0;
 
@@ -134 +136 @@
             return false;
 
-        std::list<T>::push_back(val);
+        fList.push_back(val);
         fSize++;
 
@@ -150 +152 @@
             return false;
 
-        std::list<T>::emplace_back(__args...);
+        fList.emplace_back(__args...);
         fSize++;
 
@@ -166 +168 @@
         return fSize;
     }
+
+    bool empty() const
+    {
+        return fSize==0;
+    }
 };