From 8ac1b32ad3b190de82f5c4f1d1666f093ad8c20f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 3 Feb 2013 11:59:38 +0100 Subject: Integration of settings, platform, pathresolver, etc. --- src/dotty/tools/dotc/core/SymbolLoaders.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dotty/tools/dotc/core/SymbolLoaders.scala') 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) -- cgit v1.2.3