summaryrefslogtreecommitdiff
path: root/src/mem/ruby/slicc_interface
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:41 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:41 -0500
commitcc2cc588693bb73b1892aea82fd0ac9729196f25 (patch)
tree29056c28b5492831634fcab6692e94ffe66af3eb /src/mem/ruby/slicc_interface
parent82d136285dac52a97384961a814d5a0dda4a6482 (diff)
downloadgem5-cc2cc588693bb73b1892aea82fd0ac9729196f25.tar.xz
ruby: eliminate type Time
There is another type Time in src/base class which results in a conflict.
Diffstat (limited to 'src/mem/ruby/slicc_interface')
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Util.hh1
1 files changed, 0 insertions, 1 deletions
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)