Changeset 17275 for trunk/Mars

Timestamp:

10/20/13 18:31:31 (11 years ago)

Author:

tbretz

Message:

The allowed-scheme to distinguish between what to do in case of a successfully processed event and an unsucessfully processed event was buggy.

File:

• trunk/Mars/mcore/Queue.h (modified) (3 diffs)

trunk/Mars/mcore/Queue.h

@@ -13 +13 @@
 //    splice();                // used to efficiently implement post with mutex
 
+using namespace std;
+
 template<class T, class List=std::list<T>>
 class Queue
@@ -86 +88 @@
             // successfull [allowed==0], the next event will be processed
             // immediately.
-            if (!fCallback || !fCallback(*it))
+
+            if (fCallback && fCallback(*it))
                 allowed = 0;
 
@@ -92 +95 @@
 
             // Whenever an event was successfully processed, allowed
-            // is larger than zero and thus the event will be popped
-            if (allowed==0)
+            // is equal to zero and thus the event will be popped
+            if (allowed>0)
                 continue;
 
             fList.erase(it);
-
             fSize--;
-            allowed--;
-
         }