diff options
| author | James Iry <jamesiry@gmail.com> | 2013-02-07 21:34:25 -0800 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-02-07 21:34:25 -0800 |
| commit | 6bcb830c080c846a7ad4bf5e1949f6b2d02d45fe (patch) | |
| tree | ece506776cdcc917a55b08b01198f8f49d8bdecb /src/reflect | |
| parent | 20b92e050365b8086a2ff368ef3e31f3a56c872c (diff) | |
| parent | 1426fec358342e0b052c5a96ee2b7e60d4d4066b (diff) | |
| download | scala-6bcb830c080c846a7ad4bf5e1949f6b2d02d45fe.tar.gz scala-6bcb830c080c846a7ad4bf5e1949f6b2d02d45fe.tar.bz2 scala-6bcb830c080c846a7ad4bf5e1949f6b2d02d45fe.zip | |
Merge pull request #2079 from JamesIry/2.10.x_SI-7070
SI-7070 Turn restriction on companions in pkg objs into warning
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/settings/MutableSettings.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/Settings.scala | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/internal/settings/MutableSettings.scala b/src/reflect/scala/reflect/internal/settings/MutableSettings.scala index ec3501d5bc..81368df7a6 100644 --- a/src/reflect/scala/reflect/internal/settings/MutableSettings.scala +++ b/src/reflect/scala/reflect/internal/settings/MutableSettings.scala @@ -47,6 +47,4 @@ abstract class MutableSettings extends AbsSettings { def XoldPatmat: BooleanSetting def XnoPatmatAnalysis: BooleanSetting def XfullLubs: BooleanSetting - def companionsInPkgObjs: BooleanSetting - } diff --git a/src/reflect/scala/reflect/runtime/Settings.scala b/src/reflect/scala/reflect/runtime/Settings.scala index 2d5b76f094..0e0cf3fc40 100644 --- a/src/reflect/scala/reflect/runtime/Settings.scala +++ b/src/reflect/scala/reflect/runtime/Settings.scala @@ -43,7 +43,6 @@ private[reflect] class Settings extends MutableSettings { val printtypes = new BooleanSetting(false) val uniqid = new BooleanSetting(false) val verbose = new BooleanSetting(false) - val companionsInPkgObjs = new BooleanSetting(false) val Yrecursion = new IntSetting(0) val maxClassfileName = new IntSetting(255) |