diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-02-03 11:59:38 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-02-03 11:59:38 +0100 |
| commit | 8ac1b32ad3b190de82f5c4f1d1666f093ad8c20f (patch) | |
| tree | 024b841641152deb5743d678885afae68ba8647b /src/dotty/tools/dotc/core/SymbolLoaders.scala | |
| parent | abc8f5e1c382b1ead761976227878c4c38ebfbf5 (diff) | |
| download | dotty-8ac1b32ad3b190de82f5c4f1d1666f093ad8c20f.tar.gz dotty-8ac1b32ad3b190de82f5c4f1d1666f093ad8c20f.tar.bz2 dotty-8ac1b32ad3b190de82f5c4f1d1666f093ad8c20f.zip | |
Integration of settings, platform, pathresolver, etc.
Diffstat (limited to 'src/dotty/tools/dotc/core/SymbolLoaders.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/SymbolLoaders.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/SymbolLoaders.scala b/src/dotty/tools/dotc/core/SymbolLoaders.scala index 41bd0fdeb..6aa959887 100644 --- a/src/dotty/tools/dotc/core/SymbolLoaders.scala +++ b/src/dotty/tools/dotc/core/SymbolLoaders.scala @@ -51,11 +51,11 @@ class SymbolLoaders { // offer a setting to resolve the conflict one way or the other. // This was motivated by the desire to use YourKit probes, which // require yjp.jar at runtime. See SI-2089. - if (ctx.settings.YtermConflict == ctx.settings.default.YtermConflict) + if (ctx.settings.termConflict.isDefault) throw new TypeError( s"""$owner contains object and package with same name: $name |one of them needs to be removed from classpath""".stripMargin) - else if (ctx.settings.YtermConflict.value == "package") { + else if (ctx.settings.termConflict.value == "package") { ctx.warning( s"Resolving package/object name conflict in favor of package ${preExisting.fullName}. The object will be inaccessible.") owner.info.decls.unlink(preExisting) |