diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2017-02-13 15:36:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 15:36:57 +0100 |
commit | b29783237c03ade1dd19cc564170c7a87d7b8b84 (patch) | |
tree | 9aa30b02b5267665bb204a38c4912c3b763f4375 /compiler/src/dotty/tools/dotc/core/Definitions.scala | |
parent | 07b67a8416c501d7f7b37442f3a294d9f9252895 (diff) | |
parent | 36e91d4ed0a293943d66f409f7515953e961067f (diff) | |
download | dotty-b29783237c03ade1dd19cc564170c7a87d7b8b84.tar.gz dotty-b29783237c03ade1dd19cc564170c7a87d7b8b84.tar.bz2 dotty-b29783237c03ade1dd19cc564170c7a87d7b8b84.zip |
Merge pull request #1931 from dotty-staging/fix-#1501
Fix #1501 - Check trait inheritance condition
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/Definitions.scala')
-rw-r--r-- | compiler/src/dotty/tools/dotc/core/Definitions.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 866f6e7fa..2797bb8a6 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -476,7 +476,7 @@ class Definitions { lazy val BoxedNumberClass = ctx.requiredClass("java.lang.Number") lazy val ThrowableClass = ctx.requiredClass("java.lang.Throwable") lazy val ClassCastExceptionClass = ctx.requiredClass("java.lang.ClassCastException") - lazy val JavaSerializableClass = ctx.requiredClass("java.lang.Serializable") + lazy val JavaSerializableClass = ctx.requiredClass("java.io.Serializable") lazy val ComparableClass = ctx.requiredClass("java.lang.Comparable") // in scalac modified to have Any as parent |