diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-17 13:57:06 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-17 15:26:00 -0800 |
| commit | 0288a0788ae1ffbe9064992f1ac02f647bb64c17 (patch) | |
| tree | 90daaee72dd44da92286310e23a99ff829298581 /build.xml | |
| parent | a77d90b893593a2e2675110bde16e393cc2d0329 (diff) | |
| download | scala-0288a0788ae1ffbe9064992f1ac02f647bb64c17.tar.gz scala-0288a0788ae1ffbe9064992f1ac02f647bb64c17.tar.bz2 scala-0288a0788ae1ffbe9064992f1ac02f647bb64c17.zip | |
Fix for "type _$1 defined twice".
Actually not a fix, only a workaround. Package objects strike
again: you don't want to have existentials in there, like this:
private val resolverFunction: PartialFunction[Throwable, Try[_]] = ...
There are a few irrelevant-to-that-bug changes included which I
did while debugging and figured I'd keep them. With this patch I
can merge/am merging the scala.concurrent work.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1535,6 +1535,7 @@ DOCUMENTATION docUncompilable="${src.dir}/library-aux" sourcepath="${src.dir}" classpathref="pack.classpath" + addparams="${scalac.args.all}" docRootContent="${src.dir}/library/rootdoc.txt"> <src> <files includes="${src.dir}/actors"/> @@ -1620,6 +1621,7 @@ DOCUMENTATION classpathref="pack.classpath" srcdir="${src.dir}/compiler" docRootContent="${src.dir}/compiler/rootdoc.txt"> + addparams="${scalac.args.all}" <include name="**/*.scala"/> </scaladoc> <touch file="${build-docs.dir}/compiler.complete" verbose="no"/> |