From a69c74924971adc97ff050cca1e79d9fb8db2975 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 28 Jul 2015 16:24:45 -0700 Subject: [PATCH] Fix compilation with scala 2.11.6 We forgot to specify return types on overloaded methods, and a previous version of the scala compiler failed to flag this as an error. --- uncore/src/main/scala/cache.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uncore/src/main/scala/cache.scala b/uncore/src/main/scala/cache.scala index 38bf1930..dcfc188d 100644 --- a/uncore/src/main/scala/cache.scala +++ b/uncore/src/main/scala/cache.scala @@ -441,13 +441,13 @@ abstract class L2XactTracker extends XactTracker with L2HellaCacheParameters { def connectInternalDataBeatCounter[T <: HasL2BeatAddr]( in: DecoupledIO[T], beat: UInt = UInt(0), - full_block: Bool = Bool(true)) = { + full_block: Bool = Bool(true)): (UInt, Bool) = { connectDataBeatCounter(in.fire(), in.bits, beat, full_block) } def connectInternalDataBeatCounter[T <: HasL2Data]( in: ValidIO[T], - full_block: Bool = Bool(true)) = { + full_block: Bool): Bool = { connectDataBeatCounter(in.valid, in.bits, UInt(0), full_block)._2 }