stats: Fix all stats usages to deal with template fixes

4 files changed, 61 insertions, 61 deletions

diff --git a/src/dev/copy_engine.hh b/src/dev/copy_engine.hh
index 12531f68c..dfe469588 100644
--- a/src/dev/copy_engine.hh
+++ b/src/dev/copy_engine.hh
@@ -164,8 +164,8 @@ class CopyEngine : public PciDev
 
   private:
 
-    Stats::Vector<> bytesCopied;
-    Stats::Vector<> copiesProcessed;
+    Stats::Vector bytesCopied;
+    Stats::Vector copiesProcessed;
 
     // device registers
     CopyEngineReg::Regs regs;
diff --git a/src/dev/etherdevice.hh b/src/dev/etherdevice.hh
index e43f3b686..5d86275b4 100644
--- a/src/dev/etherdevice.hh
+++ b/src/dev/etherdevice.hh
@@ -69,20 +69,20 @@ class EtherDevice : public PciDev
     void regStats();
 
   protected:
-    Stats::Scalar<> txBytes;
-    Stats::Scalar<> rxBytes;
-    Stats::Scalar<> txPackets;
-    Stats::Scalar<> rxPackets;
-    Stats::Scalar<> txIpChecksums;
-    Stats::Scalar<> rxIpChecksums;
-    Stats::Scalar<> txTcpChecksums;
-    Stats::Scalar<> rxTcpChecksums;
-    Stats::Scalar<> txUdpChecksums;
-    Stats::Scalar<> rxUdpChecksums;
-    Stats::Scalar<> descDmaReads;
-    Stats::Scalar<> descDmaWrites;
-    Stats::Scalar<> descDmaRdBytes;
-    Stats::Scalar<> descDmaWrBytes;
+    Stats::Scalar txBytes;
+    Stats::Scalar rxBytes;
+    Stats::Scalar txPackets;
+    Stats::Scalar rxPackets;
+    Stats::Scalar txIpChecksums;
+    Stats::Scalar rxIpChecksums;
+    Stats::Scalar txTcpChecksums;
+    Stats::Scalar rxTcpChecksums;
+    Stats::Scalar txUdpChecksums;
+    Stats::Scalar rxUdpChecksums;
+    Stats::Scalar descDmaReads;
+    Stats::Scalar descDmaWrites;
+    Stats::Scalar descDmaRdBytes;
+    Stats::Scalar descDmaWrBytes;
     Stats::Formula totBandwidth;
     Stats::Formula totPackets;
     Stats::Formula totBytes;
@@ -91,33 +91,33 @@ class EtherDevice : public PciDev
     Stats::Formula rxBandwidth;
     Stats::Formula txPacketRate;
     Stats::Formula rxPacketRate;
-    Stats::Scalar<> postedSwi;
+    Stats::Scalar postedSwi;
     Stats::Formula coalescedSwi;
-    Stats::Scalar<> totalSwi;
-    Stats::Scalar<> postedRxIdle;
+    Stats::Scalar totalSwi;
+    Stats::Scalar postedRxIdle;
     Stats::Formula coalescedRxIdle;
-    Stats::Scalar<> totalRxIdle;
-    Stats::Scalar<> postedRxOk;
+    Stats::Scalar totalRxIdle;
+    Stats::Scalar postedRxOk;
     Stats::Formula coalescedRxOk;
-    Stats::Scalar<> totalRxOk;
-    Stats::Scalar<> postedRxDesc;
+    Stats::Scalar totalRxOk;
+    Stats::Scalar postedRxDesc;
     Stats::Formula coalescedRxDesc;
-    Stats::Scalar<> totalRxDesc;
-    Stats::Scalar<> postedTxOk;
+    Stats::Scalar totalRxDesc;
+    Stats::Scalar postedTxOk;
     Stats::Formula coalescedTxOk;
-    Stats::Scalar<> totalTxOk;
-    Stats::Scalar<> postedTxIdle;
+    Stats::Scalar totalTxOk;
+    Stats::Scalar postedTxIdle;
     Stats::Formula coalescedTxIdle;
-    Stats::Scalar<> totalTxIdle;
-    Stats::Scalar<> postedTxDesc;
+    Stats::Scalar totalTxIdle;
+    Stats::Scalar postedTxDesc;
     Stats::Formula coalescedTxDesc;
-    Stats::Scalar<> totalTxDesc;
-    Stats::Scalar<> postedRxOrn;
+    Stats::Scalar totalTxDesc;
+    Stats::Scalar postedRxOrn;
     Stats::Formula coalescedRxOrn;
-    Stats::Scalar<> totalRxOrn;
+    Stats::Scalar totalRxOrn;
     Stats::Formula coalescedTotal;
-    Stats::Scalar<> postedInterrupts;
-    Stats::Scalar<> droppedPackets;
+    Stats::Scalar postedInterrupts;
+    Stats::Scalar droppedPackets;
 };
 
 #endif //__DEV_ETHERDEVICE_HH__
diff --git a/src/dev/ide_disk.hh b/src/dev/ide_disk.hh
index 68ae5c3c0..1b455e8ad 100644
--- a/src/dev/ide_disk.hh
+++ b/src/dev/ide_disk.hh
@@ -238,12 +238,12 @@ class IdeDisk : public SimObject
     /** Interrupt pending */
     bool intrPending;
 
-    Stats::Scalar<> dmaReadFullPages;
-    Stats::Scalar<> dmaReadBytes;
-    Stats::Scalar<> dmaReadTxs;
-    Stats::Scalar<> dmaWriteFullPages;
-    Stats::Scalar<> dmaWriteBytes;
-    Stats::Scalar<> dmaWriteTxs;
+    Stats::Scalar dmaReadFullPages;
+    Stats::Scalar dmaReadBytes;
+    Stats::Scalar dmaReadTxs;
+    Stats::Scalar dmaWriteFullPages;
+    Stats::Scalar dmaWriteBytes;
+    Stats::Scalar dmaWriteTxs;
     Stats::Formula rdBandwidth;
     Stats::Formula wrBandwidth;
     Stats::Formula totBandwidth;
diff --git a/src/dev/sinic.hh b/src/dev/sinic.hh
index 3185e8696..cd8412ef4 100644
--- a/src/dev/sinic.hh
+++ b/src/dev/sinic.hh
@@ -283,35 +283,35 @@ class Device : public Base
  * Statistics
  */
   private:
-    Stats::Scalar<> rxBytes;
+    Stats::Scalar rxBytes;
     Stats::Formula  rxBandwidth;
-    Stats::Scalar<> rxPackets;
+    Stats::Scalar rxPackets;
     Stats::Formula  rxPacketRate;
-    Stats::Scalar<> rxIpPackets;
-    Stats::Scalar<> rxTcpPackets;
-    Stats::Scalar<> rxUdpPackets;
-    Stats::Scalar<> rxIpChecksums;
-    Stats::Scalar<> rxTcpChecksums;
-    Stats::Scalar<> rxUdpChecksums;
-
-    Stats::Scalar<> txBytes;
+    Stats::Scalar rxIpPackets;
+    Stats::Scalar rxTcpPackets;
+    Stats::Scalar rxUdpPackets;
+    Stats::Scalar rxIpChecksums;
+    Stats::Scalar rxTcpChecksums;
+    Stats::Scalar rxUdpChecksums;
+
+    Stats::Scalar txBytes;
     Stats::Formula  txBandwidth;
     Stats::Formula totBandwidth;
     Stats::Formula totPackets;
     Stats::Formula totBytes;
     Stats::Formula totPacketRate;
-    Stats::Scalar<> txPackets;
+    Stats::Scalar txPackets;
     Stats::Formula  txPacketRate;
-    Stats::Scalar<> txIpPackets;
-    Stats::Scalar<> txTcpPackets;
-    Stats::Scalar<> txUdpPackets;
-    Stats::Scalar<> txIpChecksums;
-    Stats::Scalar<> txTcpChecksums;
-    Stats::Scalar<> txUdpChecksums;
-
-    Stats::Scalar<> totalVnicDistance;
-    Stats::Scalar<> numVnicDistance;
-    Stats::Scalar<> maxVnicDistance;
+    Stats::Scalar txIpPackets;
+    Stats::Scalar txTcpPackets;
+    Stats::Scalar txUdpPackets;
+    Stats::Scalar txIpChecksums;
+    Stats::Scalar txTcpChecksums;
+    Stats::Scalar txUdpChecksums;
+
+    Stats::Scalar totalVnicDistance;
+    Stats::Scalar numVnicDistance;
+    Stats::Scalar maxVnicDistance;
     Stats::Formula avgVnicDistance;
 
     int _maxVnicDistance;