Changeset 7412

Timestamp:

Sep 11, 2010, 4:16:10 PM (14 years ago)

Author:

dafrick

Message:

Fixed one (hopefully) final bug in Notifications.

Location:

code/trunk/src/modules/notifications

Files:

• NotificationQueue.cc (modified) (3 diffs)
• NotificationQueue.h (modified) (1 diff)

code/trunk/src/modules/notifications/NotificationQueue.cc

@@ -153 +153 @@
             while(it != this->ordering_.upper_bound(&this->timeLimit_))
             {
-                NotificationContainer* temp = *it;
+                std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator temp = it;
                 it++;
                 this->remove(temp); // Remove the Notifications that have expired.
@@ -238 +238 @@
     {
         NotificationContainer* container = this->notifications_.back();
-        this->ordering_.erase(container);
+        // Get all the NotificationContainers that were sent the same time the NotificationContainer we want to pop was sent.
+        std::pair<std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator, std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator> iterators = this->ordering_.equal_range(container);
+        // Iterate thourgh all suspects and remove the container as soon as we find it.
+        for(std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator it = iterators.first; it != iterators.second; it++)
+        {
+            if(container == *it)
+            {
+                this->ordering_.erase(it);
+                break;
+            }
+        }
         this->notifications_.pop_back();
 
@@ -252 +262 @@
     @brief
         Removes the Notification that is stored in the input NotificationContainer.
-    @param container
-        The NotificationContainer with the Notification to be removed.
-    */
-    void NotificationQueue::remove(NotificationContainer* container)
-    {
-        std::vector<NotificationContainer*>::iterator it = std::find(this->notifications_.begin(), this->notifications_.end(), container);
+    @param containerIterator
+        An iterator to the NotificationContainer to be removed.
+    */
+    void NotificationQueue::remove(const std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator& containerIterator)
+    {
+        std::vector<NotificationContainer*>::iterator it = std::find(this->notifications_.begin(), this->notifications_.end(), *containerIterator);
         // Get the index at which the Notification is.
         std::vector<NotificationContainer*>::difference_type index = it - this->notifications_.begin ();
-        this->ordering_.erase(container);
+        this->ordering_.erase(containerIterator);
         this->notifications_.erase(it);
 
         this->size_--;
 
-        delete container;
+        delete *containerIterator;
 
         // Removes the Notification from the GUI.

code/trunk/src/modules/notifications/NotificationQueue.h

@@ -158 +158 @@
             void push(Notification* notification, const std::time_t & time); //!< Adds (pushes) a Notification to the NotificationQueue.
             void pop(void); //!< Removes (pops) the least recently added Notification form the NotificationQueue.
-            void remove(NotificationContainer* container); //!< Removes the Notification that is stored in the input NotificationContainer.
+            void remove(const std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator& containerIterator); //!< Removes the Notification that is stored in the input NotificationContainer.
 
             void clear(void); //!< Clears the NotificationQueue by removing all NotificationContainers.