diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-06 09:19:36 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-06 09:19:36 -0700 |
| commit | ec1d28ee0dbd08f814984e95c3245c1d6fab79d8 (patch) | |
| tree | dacaff174b1f3a3c86015d55c1efb8b7beff6c8f /src | |
| parent | 8c3b69341f1f3c1ca42a35b496829bbef1696cbb (diff) | |
| download | scala-ec1d28ee0dbd08f814984e95c3245c1d6fab79d8.tar.gz scala-ec1d28ee0dbd08f814984e95c3245c1d6fab79d8.tar.bz2 scala-ec1d28ee0dbd08f814984e95c3245c1d6fab79d8.zip | |
A little BoxesRunTime fix.
That's why we have those nice test cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/runtime/BoxesRunTime.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/runtime/BoxesRunTime.java b/src/library/scala/runtime/BoxesRunTime.java index 241bf79ac8..94047d6f53 100644 --- a/src/library/scala/runtime/BoxesRunTime.java +++ b/src/library/scala/runtime/BoxesRunTime.java @@ -546,7 +546,7 @@ public final class BoxesRunTime public static Object takeOr(Object arg1, Object arg2) throws NoSuchMethodException { if ((arg1 instanceof Boolean) || (arg2 instanceof Boolean)) { if ((arg1 instanceof Boolean) && (arg2 instanceof Boolean)) - return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() & ((java.lang.Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() | ((java.lang.Boolean) arg2).booleanValue()); else throw new NoSuchMethodException(); } @@ -566,7 +566,7 @@ public final class BoxesRunTime public static Object takeXor(Object arg1, Object arg2) throws NoSuchMethodException { if ((arg1 instanceof Boolean) || (arg2 instanceof Boolean)) { if ((arg1 instanceof Boolean) && (arg2 instanceof Boolean)) - return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() & ((java.lang.Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() ^ ((java.lang.Boolean) arg2).booleanValue()); else throw new NoSuchMethodException(); } |