christoph/fail
1
Fork 0
Code Releases Activity

removing redundant EventList::makeActive(event)

Browse Source 
This method has no users, and I'm preparing for modifying a dependency's
signature.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1023 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-04-03 14:05:26 +00:00
parent f3855293ca
commit 643299c26e
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/controller/EventList.cc
View File

@ -96,18 +96,6 @@ BaseEvent* EventList::getEventFromId(EventId id)
return (NULL); // Nothing found.
}
void EventList::makeActive(BaseEvent* ev)
{
assert(ev && "FATAL ERROR: Event object pointer cannot be NULL!");
ev->decreaseCounter();
if (ev->getCounter() > 0) {
return;
}
ev->resetCounter();
if(remove(ev)) // remove event from buffer-list
m_FireList.push_back(ev);
}
EventList::iterator EventList::makeActive(iterator it)
{
assert(it != m_BufferList.end() &&

13
core/controller/EventList.hpp
View File

@ -163,16 +163,9 @@ class EventList
*/
ExperimentFlow* getExperimentOf(BaseEvent* pEv);
/**
* Moves the events from the (internal) buffer-list to the fire-list. To
* actually fire the events activated by calling makeActive(), call
* fireActiveEvents().
* @param ev the event to trigger
* TODO: besserer Name statt "makeActive"?
*/
void makeActive(BaseEvent* ev);
/**
* Behaves like makeActive(BaseEvent) and additionally returns an
* updated iterator which points to the next BaseEvent-element.
* Moves the events from the (internal) buffer-list to the fire-list.
* To actually fire the events, call fireActiveEvents().
* Returns an updated iterator which points to the next element.
* @param ev the event to trigger
* @return returns the updated iteration, pointing to the next element
* after makeActive returns, "it" is invalid, so the returned