diff options
| author | Seth Tisue <seth@tisue.net> | 2017-02-17 06:56:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-17 06:56:11 -0800 |
| commit | 71a8a4429f3ca004ebbf88f78146691bb9f084d9 (patch) | |
| tree | a766ac4fab6d91d3fad2789ba5bf8d85775aabba /src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | |
| parent | 04c45e15f198c3e33b0e6709fb8ca5267f129fac (diff) | |
| parent | c8b80053bd41b5a6cf4c03b2a709099ae1b668d7 (diff) | |
| download | scala-71a8a4429f3ca004ebbf88f78146691bb9f084d9.tar.gz scala-71a8a4429f3ca004ebbf88f78146691bb9f084d9.tar.bz2 scala-71a8a4429f3ca004ebbf88f78146691bb9f084d9.zip | |
Merge branch '2.12.x' into merge-2.11.x-to-2.12.x-20170214
Diffstat (limited to 'src/reflect/scala/reflect/runtime/JavaUniverseForce.scala')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index f082ba2293..72e21f67fe 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -429,6 +429,7 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => definitions.hijackedCoreClasses definitions.symbolsNotPresentInBytecode definitions.isPossibleSyntheticParent + definitions.ShowAsInfixAnnotationClass definitions.abbrvTag definitions.numericWeight definitions.boxedModule |