diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-03 16:25:42 +0200 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-03 16:25:42 +0200 |
commit | 9b2154e43a8a138e561a004ccab85660d3c0b4dd (patch) | |
tree | a271163aa9d6a9c79b1d5f03297bc9296b101fb8 /test/files/neg | |
parent | d85224b3a1b0884172ee6985b643a2dda49094d6 (diff) | |
parent | 5b9af1b9ff327e8efa2c8b6e8b9ed8d3cdf2598e (diff) | |
download | scala-9b2154e43a8a138e561a004ccab85660d3c0b4dd.tar.gz scala-9b2154e43a8a138e561a004ccab85660d3c0b4dd.tar.bz2 scala-9b2154e43a8a138e561a004ccab85660d3c0b4dd.zip |
Merge remote-tracking branch 'scala/2.10.x'
Conflicts:
build.number
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/t5845.check | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/files/neg/t5845.check b/test/files/neg/t5845.check index c0b402fccb..8c6100d6de 100644 --- a/test/files/neg/t5845.check +++ b/test/files/neg/t5845.check @@ -1,4 +1,7 @@ +t5845.scala:9: error: value +++ is not a member of Int + println(5 +++ 5) + ^ t5845.scala:15: error: value +++ is not a member of Int println(5 +++ 5) ^ -one error found +two errors found |