summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-03-23 20:44:27 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2015-03-23 20:44:27 +0100
commitec0a860766467de78f4932431608d423705e1e41 (patch)
treed2dcc7b0a08a2df9c7508cd70292aedc2bd1019f /src
parent4d4eb913eccd6b8ef691ca249ec6d0f49649dc2e (diff)
parentb690ef83c13dc04521fda7eea04db8aec6effa08 (diff)
downloadscala-ec0a860766467de78f4932431608d423705e1e41.tar.gz
scala-ec0a860766467de78f4932431608d423705e1e41.tar.bz2
scala-ec0a860766467de78f4932431608d423705e1e41.zip
Merge pull request #4300 from CodeMettle/FiniteDuration.toCoarsest
Declare FiniteDuration.toCoarsest to return a FiniteDuration
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/concurrent/duration/Duration.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/duration/Duration.scala b/src/library/scala/concurrent/duration/Duration.scala
index 2eded9f060..3697950e2e 100644
--- a/src/library/scala/concurrent/duration/Duration.scala
+++ b/src/library/scala/concurrent/duration/Duration.scala
@@ -705,7 +705,7 @@ final class FiniteDuration(val length: Long, val unit: TimeUnit) extends Duratio
final def isFinite() = true
- final def toCoarsest: Duration = {
+ final override def toCoarsest: FiniteDuration = {
def loop(length: Long, unit: TimeUnit): FiniteDuration = {
def coarserOrThis(coarser: TimeUnit, divider: Int) =
if (length % divider == 0) loop(length / divider, coarser)