From 08b41ce467c2b767397c034a406875585a377c73 Mon Sep 17 00:00:00 2001
From: tkong <thipor@kong.name>
Date: Sat, 7 Apr 2012 19:31:32 +0200
Subject: make PresentationCompilerThread a daemon

---
 src/compiler/scala/tools/nsc/interactive/Global.scala | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

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
   }
-- 
cgit v1.2.3


From 9574fd3b598f716fe55b43b9636daf791ba008d5 Mon Sep 17 00:00:00 2001
From: Dmitry Nadezhin <Dmitry.Nadezhin@gmail.com>
Date: Sat, 7 Apr 2012 21:46:49 +0400
Subject: Small simplification of commit
 87c9fc0df0f0e74d3a07f95634356d6425877091. eqTypeCode(Number) is equivalent to
 typeCode(Number). CHAR code is impossible because java.lang.Character is not
 subclass of java.lang.Number.

---
 src/library/scala/runtime/BoxesRunTime.java | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src')

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:
-- 
cgit v1.2.3