Yet another merge with the main repository.

[gem5.git] / src / cpu / inorder / resources / agen_unit.hh

diff --git a/src/cpu/inorder/resources/agen_unit.hh b/src/cpu/inorder/resources/agen_unit.hh
index fbfd2f44690e3407c9da2f8d5e9b7e91bad7cc1b..f208ec6803e429d16c6e07855533eb6736fcdd07 100644 (file)
--- a/src/cpu/inorder/resources/agen_unit.hh
+++ b/src/cpu/inorder/resources/agen_unit.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_AGEN_UNIT_HH__
 #define __CPU_INORDER_AGEN_UNIT_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/params.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource.hh"
 
 class AGENUnit : public Resource {
   public:
@@ -49,7 +49,6 @@ class AGENUnit : public Resource {
   public:
     AGENUnit(std::string res_name, int res_id, int res_width,
              int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params);
-    virtual ~AGENUnit() {}
 
     enum Command {
         GenerateAddr