diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-25 16:39:39 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-25 18:16:40 -0800 |
| commit | cc067e6508546d3b830422d57034210489a54151 (patch) | |
| tree | b5dd29c21822f4dd6d3064dc1a734a45ca3a712c /test/files/run/t6028.check | |
| parent | 5abf901ea347fc0319c6a191454211f704d04961 (diff) | |
| parent | 2fa859e1b3eb2ac57058feaba87d96adfbac9209 (diff) | |
| download | scala-cc067e6508546d3b830422d57034210489a54151.tar.gz scala-cc067e6508546d3b830422d57034210489a54151.tar.bz2 scala-cc067e6508546d3b830422d57034210489a54151.zip | |
Merge remote-tracking branch 'origin/2.10.x' into pr/merge-2.10
* origin/2.10.x:
SI-6969, mishandling of SoftReferences in method cache.
SI-7011 Fix finding constructor type in captured var definitions
SI-6987 Tests fsc verbose output
SI-6987 Fixes fsc compile server verbose output
SI-6231 Report unsupported free var capture by a trait.
SI-6666 Restrict hidden `this` access in self/super calls.
SI-6902 Check unreachability under @unchecked
SI-6976 Fix value class separate compilation crasher.
Closes SI-6952: add correct error positions for Dynamic feature check.
Conflicts:
src/compiler/scala/tools/nsc/CompileServer.scala
src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
Diffstat (limited to 'test/files/run/t6028.check')
| -rw-r--r-- | test/files/run/t6028.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t6028.check b/test/files/run/t6028.check index 42921ae2f5..942f3d5f0c 100644 --- a/test/files/run/t6028.check +++ b/test/files/run/t6028.check @@ -15,7 +15,7 @@ package <empty> { } }; def bar(barParam: Int): Object = { - @volatile var MethodLocalObject$module: runtime.VolatileObjectRef = new runtime.VolatileObjectRef(<empty>); + @volatile var MethodLocalObject$module: runtime.VolatileObjectRef = new runtime.VolatileObjectRef(null); T.this.MethodLocalObject$1(barParam, MethodLocalObject$module) }; def tryy(tryyParam: Int): Function0 = { |