summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/Global.scala
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2012-09-21 21:14:19 +0200
committerSimon Ochsenreither <simon@ochsenreither.de>2012-10-08 05:24:41 +0200
commit17fd905e868db7de4c7f9046bb9c4937e281c1fe (patch)
tree52fa111b1d86d12f9bdf28e526b4f35ab6d2fc10 /src/compiler/scala/tools/nsc/Global.scala
parent7be1652cbf1300fe5fea44681a480c33467c2296 (diff)
downloadscala-17fd905e868db7de4c7f9046bb9c4937e281c1fe.tar.gz
scala-17fd905e868db7de4c7f9046bb9c4937e281c1fe.tar.bz2
scala-17fd905e868db7de4c7f9046bb9c4937e281c1fe.zip
SI-6388 Remove deprecated items in the compiler jar
Deprecations in the following files were not removed to prevent SBT from breaking: - src/compiler/scala/tools/nsc/Interpreter.scala - src/compiler/scala/tools/nsc/InterpreterLoop.scala - src/compiler/scala/tools/nsc/interpreter/ILoop.scala - src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index cb5e2ad555..f46ed54441 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -1743,12 +1743,9 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
// deprecated method: but I see no simple way out, so I leave it for now.
def forJVM = settings.target.value startsWith "jvm"
override def forMSIL = settings.target.value startsWith "msil"
- def forInteractive = onlyPresentation
- def forScaladoc = onlyPresentation
+ def forInteractive = false
+ def forScaladoc = false
def createJavadoc = false
-
- @deprecated("Use forInteractive or forScaladoc, depending on what you're after", "2.9.0")
- def onlyPresentation = false
}
object Global {