From cc2cc588693bb73b1892aea82fd0ac9729196f25 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 1 Sep 2014 16:55:41 -0500
Subject: ruby: eliminate type Time There is another type Time in src/base
 class which results in a conflict.

---
 src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mem/ruby/slicc_interface')

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index 52a47518f..4398a4a00 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -47,7 +47,6 @@ random(int n)
 }
 
 inline Cycles zero_time() { return Cycles(0); }
-inline Cycles TimeToCycles(Time t) { return Cycles(t); }
 
 inline NodeID
 intToID(int nodenum)
-- 
cgit v1.2.3