summaryrefslogtreecommitdiff
path: root/test/files/neg/t3240.check
diff options
context:
space:
mode:
authorVojin Jovanovic <vojin.jovanovic@epfl.ch>2012-01-25 15:24:18 +0100
committerVojin Jovanovic <vojin.jovanovic@epfl.ch>2012-01-25 15:24:18 +0100
commitf814d40ea917592f78d2e8ca4c78f34ce4b5f297 (patch)
treecafac6a0d757419132fd75ab788f8163a619780b /test/files/neg/t3240.check
parent85daadef89a9ed5c3901a5822221366ee6746d49 (diff)
parentde2b0c68785afc0f801fbe8d2750366e90c9fa70 (diff)
downloadscala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.gz
scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.bz2
scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.zip
Merge branch 'master' into execution-context
Diffstat (limited to 'test/files/neg/t3240.check')
-rw-r--r--test/files/neg/t3240.check5
1 files changed, 1 insertions, 4 deletions
diff --git a/test/files/neg/t3240.check b/test/files/neg/t3240.check
index 7ebabd5fcd..efae682c66 100644
--- a/test/files/neg/t3240.check
+++ b/test/files/neg/t3240.check
@@ -1,7 +1,4 @@
t3240.scala:3: error: only classes can have declared but undefined members
type t
^
-t3240.scala:5: error: type arguments [this.t] do not conform to method asInstanceOf's type parameter bounds [T0]
- a.getOrElse(defVal).asInstanceOf[t]
- ^
-two errors found
+one error found