diff options
| author | Paul Phillips <paulp@improving.org> | 2010-07-01 21:39:38 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-07-01 21:39:38 +0000 |
| commit | 9421f2ecaf85cb2e409e73dad7554e466303c284 (patch) | |
| tree | 3117b3728dbb259661c9e1892e117ec16edca927 | |
| parent | 60a7e53a5f7abbde3237aa1a1d2a90ff5e0818be (diff) | |
| download | scala-9421f2ecaf85cb2e409e73dad7554e466303c284.tar.gz scala-9421f2ecaf85cb2e409e73dad7554e466303c284.tar.bz2 scala-9421f2ecaf85cb2e409e73dad7554e466303c284.zip | |
Abandoned any pretense of selectivity and put f...
Abandoned any pretense of selectivity and put forkjoin.jar on every
compilation path from locker to strap. Review postponed until the
afterlife.
| -rw-r--r-- | build.xml | 9 | ||||
| -rw-r--r-- | src/library/scala/Enumeration.scala | 1 |
2 files changed, 5 insertions, 5 deletions
@@ -630,6 +630,7 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/continuations-plugin"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> </compilationpath> </scalacfork> <copy @@ -676,6 +677,7 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${build-quick.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> </compilationpath> </scalacfork> <touch file="${build-quick.dir}/scalap.complete" verbose="no"/> @@ -1130,6 +1132,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/library"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/continuations-plugin"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> </compilationpath> </scalacfork> <copy @@ -1148,10 +1151,7 @@ BOOTSTRAPPING BUILD (STRAP) srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-strap.dir}/classes/library"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> - </compilationpath> + <compilationpath refid="strap.compilation.path"/> </scalacfork> <touch file="${build-strap.dir}/plugins.complete" verbose="no"/> <stopwatch name="strap.plugins.timer" action="total"/> @@ -1179,6 +1179,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/scalap"/> <pathelement location="${build-strap.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> </compilationpath> </scalacfork> <touch file="${build-strap.dir}/scalap.complete" verbose="no"/> diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index c7c247fed7..871de3714d 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -11,7 +11,6 @@ package scala import scala.collection.SetLike import scala.collection.{ mutable, immutable, generic } import java.lang.reflect.{ Modifier, Method => JMethod, Field => JField } -import java.util.NoSuchElementException /** <p> * Defines a finite set of values specific to the enumeration. Typically |