diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-09-02 12:51:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 12:51:08 +0200 |
| commit | 50462a45dcbe91ef43652c235721b7a7ec0c8bb2 (patch) | |
| tree | 1fdcdd15dfee8a49f38de80b5a265fb50d196723 /src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | |
| parent | f90bf565a529d0e95155992a3c243952183f25a5 (diff) | |
| parent | 2277d37982bffb666b5c4bdb655d44234885e0bb (diff) | |
| download | scala-50462a45dcbe91ef43652c235721b7a7ec0c8bb2.tar.gz scala-50462a45dcbe91ef43652c235721b7a7ec0c8bb2.tar.bz2 scala-50462a45dcbe91ef43652c235721b7a7ec0c8bb2.zip | |
Merge pull request #5369 from lrytz/sd210
Fixes to mixin forwarders
Diffstat (limited to 'src/reflect/scala/reflect/runtime/JavaUniverseForce.scala')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index d56cecc965..b74ccb9177 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -379,7 +379,6 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => definitions.ElidableMethodClass definitions.ImplicitNotFoundClass definitions.ImplicitAmbiguousClass - definitions.JUnitTestClass definitions.MigrationAnnotationClass definitions.ScalaStrictFPAttr definitions.SwitchClass @@ -417,6 +416,7 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => definitions.ClassTargetClass definitions.MethodTargetClass definitions.LanguageFeatureAnnot + definitions.JUnitAnnotations definitions.languageFeatureModule definitions.metaAnnotations definitions.AnnotationDefaultAttr |