mem: Co-ordination of CMOs in the xbar

[gem5.git] / src / mem / xbar.hh

diff --git a/src/mem/xbar.hh b/src/mem/xbar.hh
index a92eb044ea29e928bc69a16137032319c242f9c9..f826e142acdab03bcdc2fd5f0af75901b961d7fe 100644 (file)
--- a/src/mem/xbar.hh
+++ b/src/mem/xbar.hh
@@ -237,7 +237,7 @@ class BaseXBar : public MemObject
         void releaseLayer();
 
         /** event used to schedule a release of the layer */
-        EventWrapper<Layer, &Layer::releaseLayer> releaseEvent;
+        EventFunctionWrapper releaseEvent;
 
         /**
          * Stats for occupancy and utilization. These stats capture
@@ -439,8 +439,6 @@ class BaseXBar : public MemObject
 
     BaseXBar(const BaseXBarParams *p);
 
-    virtual ~BaseXBar();
-
     /**
      * Stats for transaction distribution and data passing through the
      * crossbar. The transaction distribution is globally counting
@@ -456,6 +454,8 @@ class BaseXBar : public MemObject
 
   public:
 
+    virtual ~BaseXBar();
+
     virtual void init();
 
     /** A function used to return the port associated with this object. */