integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 2 insertions, 7 deletions

diff --git a/src/intersim/statwraper.cpp b/src/intersim/statwraper.cpp
index 9590f6f..c709dc0 100644
--- a/src/intersim/statwraper.cpp
+++ b/src/intersim/statwraper.cpp
@@ -2,10 +2,10 @@
 #include "stats.hpp"
 #include <stdio.h>
 
-void* StatCreate (const char * name, double bin_size, int num_bins) {
+Stats* StatCreate (const char * name, double bin_size, int num_bins) {
    Stats* newstat = new Stats(NULL,name,bin_size,num_bins);
    newstat->Clear ();
-   return(void *) newstat;  
+   return newstat;  
 }
 
 void StatClear(void * st)
@@ -45,11 +45,6 @@ void StatDisp (void * st)
    }
 }
 
-void StatDumptofile (void * st, FILE *f)
-{
-
-}
-
 #if 0 
 int main ()
 {