summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-07-09 12:35:46 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2012-07-09 12:35:46 -0400
commit745274cbd4851b3bf725b24138c1fd13746492ec (patch)
tree9e576039ec95bd3eb71352b91f41b296680be942 /src
parentd2f458e7b5b84b09706bf2b7a1f1ce7ed249d9b4 (diff)
downloadgem5-745274cbd4851b3bf725b24138c1fd13746492ec.tar.xz
EventManager: Rename queue accessor and remove cast operator
This patch renames the queue() accessor to the less ambigious eventQueue, and also removes the cast operator. The queue() member function cause problems in derived classes that declare members with the same name, e.g. a MemObject subclass that has a packet queue on its own. The operator is not causing any harm at this point, but as it is not used there is little point in keeping it.
Diffstat (limited to 'src')
-rw-r--r--src/sim/eventq.hh11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index b04b43702..09483f4e2 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -431,17 +431,12 @@ class EventManager
EventQueue *eventq;
public:
- EventManager(EventManager &em) : eventq(em.queue()) {}
- EventManager(EventManager *em) : eventq(em ? em->queue() : NULL) {}
+ EventManager(EventManager &em) : eventq(em.eventq) {}
+ EventManager(EventManager *em) : eventq(em ? em->eventq : NULL) {}
EventManager(EventQueue *eq) : eventq(eq) {}
EventQueue *
- queue() const
- {
- return eventq;
- }
-
- operator EventQueue *() const
+ eventQueue() const
{
return eventq;
}