diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 1 | ||||
| -rw-r--r-- | src/library/scala/runtime/BoxesRunTime.java | 14 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 166b38f503..5b298b3761 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -434,6 +434,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") private def newRunnerThread(): Thread = { threadId += 1 compileRunner = new PresentationCompilerThread(this, projectName) + compileRunner.setDaemon(true) compileRunner.start() compileRunner } diff --git a/src/library/scala/runtime/BoxesRunTime.java b/src/library/scala/runtime/BoxesRunTime.java index 94047d6f53..258a176671 100644 --- a/src/library/scala/runtime/BoxesRunTime.java +++ b/src/library/scala/runtime/BoxesRunTime.java @@ -44,14 +44,6 @@ public final class BoxesRunTime return OTHER; } - private static int eqTypeCode(Number a) { - int code = typeCode(a); - if (code == CHAR) - return OTHER; - else - return code; - } - private static String boxDescription(Object a) { return "" + a.getClass().getSimpleName() + "(" + a + ")"; } @@ -160,8 +152,8 @@ public final class BoxesRunTime } public static boolean equalsNumNum(java.lang.Number xn, java.lang.Number yn) { - int xcode = eqTypeCode(xn); - int ycode = eqTypeCode(yn); + int xcode = typeCode(xn); + int ycode = typeCode(yn); switch (ycode > xcode ? ycode : xcode) { case INT: return xn.intValue() == yn.intValue(); @@ -197,7 +189,7 @@ public final class BoxesRunTime return xn == null; char ch = yc.charValue(); - switch (eqTypeCode(xn)) { + switch (typeCode(xn)) { case INT: return xn.intValue() == ch; case LONG: |