Changeset 7408 for code/trunk

Timestamp:

Sep 11, 2010, 3:09:48 PM (14 years ago)

Author:

dafrick

Message:

Did not get all xmlElements…

Location:

code/trunk/src/modules

Files:

• notifications/NotificationDispatcher.cc (modified) (1 diff)
• notifications/NotificationQueue.cc (modified) (1 diff)
• objects/Script.cc (modified) (2 diffs)

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

@@ -105 +105 @@
     @param triggered
         Whether it has been triggered or untriggered. The NotificationDispatcher only reacts to the first kind of events.
+    @param trigger
+        The object that caused the event to be fired.
     @return
         Returns true if the NotificationDispatcher was successfully triggered.

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

@@ -151 +151 @@
             std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator it = this->ordering_.begin();
             // Iterate through all elements whose creation time is smaller than the current time minus the display time.
-            while(it != this->ordering_.upper_bound(&this->timeLimit_))
+            while(it != this->ordering_.upper_bound(&this->timeLimit_) && it != this->ordering_.end())
             {
                 NotificationContainer* temp = *it;

code/trunk/src/modules/objects/Script.cc

@@ -80 +80 @@
     void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(Script, XMLPort, xmlElement, mode);
+        SUPER(Script, XMLPort, xmlelement, mode);
 
         XMLPortParam(Script, "code", setCode, getCode, xmlelement, mode);
@@ -103 +103 @@
     void Script::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(Script, XMLEventPort, xmlElement, mode);
+        SUPER(Script, XMLEventPort, xmlelement, mode);
 
         XMLPortEventState(Script, BaseObject, "trigger", trigger, xmlelement, mode);