diff -r 9c5e388abf87 -r 0f9b39cb455d src/sim/eventq.hh
--- a/src/sim/eventq.hh	Fri Jul 06 14:34:59 2012 +0100
+++ b/src/sim/eventq.hh	Fri Jul 06 15:56:07 2012 +0100
@@ -431,17 +431,12 @@
     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;
     }