summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-09-05 04:14:03 +0000
committerPaul Phillips <paulp@improving.org>2009-09-05 04:14:03 +0000
commit0ae9ca5d2406efe2df10824beb192d958ee2c82e (patch)
tree4fb140d3eea1bd87bb67bd8b0f1bb680440d0bba
parentd6db8f82138dee3c91aec21bf6f2713c17b8124c (diff)
downloadscala-0ae9ca5d2406efe2df10824beb192d958ee2c82e.tar.gz
scala-0ae9ca5d2406efe2df10824beb192d958ee2c82e.tar.bz2
scala-0ae9ca5d2406efe2df10824beb192d958ee2c82e.zip
Fixed test case which still thought volatile va...
Fixed test case which still thought volatile vals were ok.
-rw-r--r--test/files/pos/attributes.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/files/pos/attributes.scala b/test/files/pos/attributes.scala
index 9bacab8816..55e3f6d4ac 100644
--- a/test/files/pos/attributes.scala
+++ b/test/files/pos/attributes.scala
@@ -37,9 +37,10 @@ abstract class A1 {
object O6 {
@serializable val x1 = new C1;
- @serializable @volatile val x2 = new C2;
- @serializable @volatile val x3 = new C3;
- @serializable @volatile @serializable val x4 = new C4;
+ // volatile val sensibly disallowed as of r18645
+ @serializable val x2 = new C2;
+ @serializable val x3 = new C3;
+ @serializable val x4 = new C4;
@serializable var y1: C1 = _;
@serializable @volatile var y2: C2 = _;