summaryrefslogtreecommitdiff
path: root/test/files/neg/deadline-inf-illegal.scala
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-09-20 10:22:01 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-09-20 10:22:01 -0700
commit45c0b2428219b6a00514e21529650b32631880b6 (patch)
tree88eeb6ce02a1ec9dda21e77f7add4a995a8b9879 /test/files/neg/deadline-inf-illegal.scala
parent1fc89420688d2123615e89a15e515c801729be5a (diff)
parent05367235ef4c519521cb28073f951e3d55fe3aad (diff)
downloadscala-45c0b2428219b6a00514e21529650b32631880b6.tar.gz
scala-45c0b2428219b6a00514e21529650b32631880b6.tar.bz2
scala-45c0b2428219b6a00514e21529650b32631880b6.zip
Merge pull request #1339 from rkuhn/wip-6389-finite-duration-mult
enable integer multiplication/divison on FiniteDuration, see SI-6389
Diffstat (limited to 'test/files/neg/deadline-inf-illegal.scala')
-rw-r--r--test/files/neg/deadline-inf-illegal.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/deadline-inf-illegal.scala b/test/files/neg/deadline-inf-illegal.scala
index 161089bfee..942cea7014 100644
--- a/test/files/neg/deadline-inf-illegal.scala
+++ b/test/files/neg/deadline-inf-illegal.scala
@@ -1,4 +1,4 @@
-import concurrent.util.{ Deadline, Duration }
+import concurrent.duration.{ Deadline, Duration }
class T {
val d: Duration = Duration.Zero