summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml2
-rw-r--r--src/compiler/scala/tools/nsc/doc/Settings.scala3
2 files changed, 3 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index e880a9475c..3b8b20edec 100644
--- a/build.xml
+++ b/build.xml
@@ -1148,7 +1148,6 @@ DOCUMENTATION
<stopwatch name="docs.lib.timer"/>
<mkdir dir="${build-docs.dir}/library"/>
<scaladoc
- addParams="-Ysuppress-vt-typer-warnings"
destdir="${build-docs.dir}/library"
windowtitle="Scala Library"
doctitle="Scala ${version.number} API"
@@ -1232,7 +1231,6 @@ DOCUMENTATION
<stopwatch name="docs.comp.timer"/>
<mkdir dir="${build-docs.dir}/compiler"/>
<scaladoc
- addParams="-Ysuppress-vt-typer-warnings"
destdir="${build-docs.dir}/compiler"
windowtitle="Scala Compiler"
doctitle="Scala Compiler ${version.number} API"
diff --git a/src/compiler/scala/tools/nsc/doc/Settings.scala b/src/compiler/scala/tools/nsc/doc/Settings.scala
index 9861c159fc..1c878f1022 100644
--- a/src/compiler/scala/tools/nsc/doc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/doc/Settings.scala
@@ -24,4 +24,7 @@ class Settings(error: String => Unit) extends scala.tools.nsc.Settings(error) {
val stylesheetfile = StringSetting ("-stylesheetfile", "stylesheetfile", "File to change style of the generated documentation", "style.css")
val pagetop = StringSetting ("-top", "pagetop", "Include top text for each page", "")
val windowtitle = StringSetting ("-windowtitle", "windowtitle", "Specify window title of generated HTML documentation", "Scala 2")
+
+ // working around issue described in r18708.
+ suppressVTWarn.value = true
}