diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-08 14:57:43 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-08 14:57:43 +0100 |
| commit | 21a765feb0efeeecd671ede637a12f5088ac8257 (patch) | |
| tree | 5e3bf3a75c0dc8a505ba7033470fe50ed2250039 /src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | |
| parent | 896e7cc42e703f735c8fefbb51c6e700a6651814 (diff) | |
| parent | dc3fccb59d9ac848550b3264608ce9b7bdbfe624 (diff) | |
| download | scala-21a765feb0efeeecd671ede637a12f5088ac8257.tar.gz scala-21a765feb0efeeecd671ede637a12f5088ac8257.tar.bz2 scala-21a765feb0efeeecd671ede637a12f5088ac8257.zip | |
Merge pull request #3391 from xeno-by/ticket/8131
SI-8131 fixes residual race condition in runtime reflection
Diffstat (limited to 'src/reflect/scala/reflect/runtime/JavaUniverseForce.scala')
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index 8811b5513e..fb893cbff1 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -32,8 +32,6 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => // inaccessible: this._skolemizationLevel // inaccessible: this._undoLog // inaccessible: this._intersectionWitness - // inaccessible: this._volatileRecursions - // inaccessible: this._pendingVolatiles // inaccessible: this._subsametypeRecursions // inaccessible: this._pendingSubTypes // inaccessible: this._basetypeRecursions @@ -206,6 +204,7 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => this.NoSymbol this.CyclicReference // inaccessible: this.TypeHistory + this.SymbolOps this.TermName this.TypeName this.Liftable |