8 files changed, 30 insertions, 30 deletions

diff --git a/src/cpu/inorder/cpu.hh b/src/cpu/inorder/cpu.hh
index 36c90a0e9..adcd28019 100644
--- a/src/cpu/inorder/cpu.hh
+++ b/src/cpu/inorder/cpu.hh
@@ -638,25 +638,25 @@ class InOrderCPU : public BaseCPU
     inline void tickThreadStats();
 
     /** Per-Thread Tick */
-    Stats::Vector<> threadCycles;
+    Stats::Vector threadCycles;
 
     /** Tick for SMT */
-    Stats::Scalar<> smtCycles;
+    Stats::Scalar smtCycles;
 
     /** Stat for total number of times the CPU is descheduled. */
-    Stats::Scalar<> timesIdled;
+    Stats::Scalar timesIdled;
 
     /** Stat for total number of cycles the CPU spends descheduled. */
-    Stats::Scalar<> idleCycles;
+    Stats::Scalar idleCycles;
 
     /** Stat for the number of committed instructions per thread. */
-    Stats::Vector<> committedInsts;
+    Stats::Vector committedInsts;
 
     /** Stat for the number of committed instructions per thread. */
-    Stats::Vector<> smtCommittedInsts;
+    Stats::Vector smtCommittedInsts;
 
     /** Stat for the total number of committed instructions. */
-    Stats::Scalar<> totalCommittedInsts;
+    Stats::Scalar totalCommittedInsts;
 
     /** Stat for the CPI per thread. */
     Stats::Formula cpi;
diff --git a/src/cpu/inorder/pipeline_stage.hh b/src/cpu/inorder/pipeline_stage.hh
index 2fd8f2215..b074639fb 100644
--- a/src/cpu/inorder/pipeline_stage.hh
+++ b/src/cpu/inorder/pipeline_stage.hh
@@ -340,19 +340,19 @@ class PipelineStage
 
     //@TODO: Use Stats for the pipeline stages
     /** Stat for total number of idle cycles. */
-    //Stats::Scalar<> stageIdleCycles;
+    //Stats::Scalar stageIdleCycles;
     /** Stat for total number of blocked cycles. */
-    //Stats::Scalar<> stageBlockedCycles;
+    //Stats::Scalar stageBlockedCycles;
     /** Stat for total number of normal running cycles. */
-    //Stats::Scalar<> stageRunCycles;
+    //Stats::Scalar stageRunCycles;
     /** Stat for total number of unblocking cycles. */
-    //Stats::Scalar<> stageUnblockCycles;
+    //Stats::Scalar stageUnblockCycles;
     /** Stat for total number of squashing cycles. */
-    //Stats::Scalar<> stageSquashCycles;
+    //Stats::Scalar stageSquashCycles;
     /** Stat for total number of staged instructions. */
-    //Stats::Scalar<> stageProcessedInsts;
+    //Stats::Scalar stageProcessedInsts;
     /** Stat for total number of squashed instructions. */
-    //Stats::Scalar<> stageSquashedInsts;
+    //Stats::Scalar stageSquashedInsts;
 };
 
 #endif
diff --git a/src/cpu/inorder/resource.hh b/src/cpu/inorder/resource.hh
index 9b9e3c3dc..b857e59ed 100644
--- a/src/cpu/inorder/resource.hh
+++ b/src/cpu/inorder/resource.hh
@@ -232,7 +232,7 @@ class Resource {
     //
     /////////////////////////////////////////////////////////////////
     /** Number of Instruction Requests the Resource Processes */
-    Stats::Scalar<> instReqsProcessed;
+    Stats::Scalar instReqsProcessed;
 };
 
 class ResourceEvent : public Event
diff --git a/src/cpu/inorder/resources/bpred_unit.hh b/src/cpu/inorder/resources/bpred_unit.hh
index b945922a7..bd68459d1 100644
--- a/src/cpu/inorder/resources/bpred_unit.hh
+++ b/src/cpu/inorder/resources/bpred_unit.hh
@@ -238,21 +238,21 @@ class BPredUnit
     ReturnAddrStack RAS[ThePipeline::MaxThreads];
 
     /** Stat for number of BP lookups. */
-    Stats::Scalar<> lookups;
+    Stats::Scalar lookups;
     /** Stat for number of conditional branches predicted. */
-    Stats::Scalar<> condPredicted;
+    Stats::Scalar condPredicted;
     /** Stat for number of conditional branches predicted incorrectly. */
-    Stats::Scalar<> condIncorrect;
+    Stats::Scalar condIncorrect;
     /** Stat for number of BTB lookups. */
-    Stats::Scalar<> BTBLookups;
+    Stats::Scalar BTBLookups;
     /** Stat for number of BTB hits. */
-    Stats::Scalar<> BTBHits;
+    Stats::Scalar BTBHits;
     /** Stat for number of times the BTB is correct. */
-    Stats::Scalar<> BTBCorrect;
+    Stats::Scalar BTBCorrect;
     /** Stat for number of times the RAS is used to get a target. */
-    Stats::Scalar<> usedRAS;
+    Stats::Scalar usedRAS;
     /** Stat for number of times the RAS is incorrect. */
-    Stats::Scalar<> RASIncorrect;
+    Stats::Scalar RASIncorrect;
 };
 
 #endif // __CPU_INORDER_BPRED_UNIT_HH__
diff --git a/src/cpu/inorder/resources/branch_predictor.hh b/src/cpu/inorder/resources/branch_predictor.hh
index 57745343c..47053910d 100644
--- a/src/cpu/inorder/resources/branch_predictor.hh
+++ b/src/cpu/inorder/resources/branch_predictor.hh
@@ -78,8 +78,8 @@ class BranchPredictor : public Resource {
     // RESOURCE STATISTICS
     //
     /////////////////////////////////////////////////////////////////
-    Stats::Scalar<> predictedTaken;
-    Stats::Scalar<> predictedNotTaken;
+    Stats::Scalar predictedTaken;
+    Stats::Scalar predictedNotTaken;
 
 };
 
diff --git a/src/cpu/inorder/resources/execution_unit.hh b/src/cpu/inorder/resources/execution_unit.hh
index e969497a2..46691bbf2 100644
--- a/src/cpu/inorder/resources/execution_unit.hh
+++ b/src/cpu/inorder/resources/execution_unit.hh
@@ -69,8 +69,8 @@ class ExecutionUnit : public Resource {
     // RESOURCE STATISTICS
     //
     /////////////////////////////////////////////////////////////////
-    Stats::Scalar<> predictedTakenIncorrect;
-    Stats::Scalar<> predictedNotTakenIncorrect;
+    Stats::Scalar predictedTakenIncorrect;
+    Stats::Scalar predictedNotTakenIncorrect;
 };
 
 
diff --git a/src/cpu/inorder/resources/inst_buffer.hh b/src/cpu/inorder/resources/inst_buffer.hh
index f4851e868..baadd42ff 100644
--- a/src/cpu/inorder/resources/inst_buffer.hh
+++ b/src/cpu/inorder/resources/inst_buffer.hh
@@ -86,7 +86,7 @@ class InstBuffer : public Resource {
     //
     /////////////////////////////////////////////////////////////////
     /** Number of Instruction Requests the Resource Processes */
-    Stats::Scalar<> instsBypassed;
+    Stats::Scalar instsBypassed;
 
 };
 
diff --git a/src/cpu/inorder/resources/mult_div_unit.hh b/src/cpu/inorder/resources/mult_div_unit.hh
index 003f6fbb1..76180714c 100644
--- a/src/cpu/inorder/resources/mult_div_unit.hh
+++ b/src/cpu/inorder/resources/mult_div_unit.hh
@@ -116,10 +116,10 @@ class MultDivUnit : public Resource {
     std::string lastInstName;
 
     /** Number of Instruction Requests the Resource Processes */
-    Stats::Scalar<> multInstReqsProcessed;
+    Stats::Scalar multInstReqsProcessed;
 
     /** Number of Instruction Requests the Resource Processes */
-    Stats::Scalar<> divInstReqsProcessed;
+    Stats::Scalar divInstReqsProcessed;
 
     MDUEvent *mduEvent;    
 };