diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 11:38:41 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-04 11:38:41 +1000 |
commit | 288d4ef1509160b21134e3ddacca5ee8311919ba (patch) | |
tree | b7b335b7f26bf6dbcda43d024c554eb06cbd97f1 /test/files/run/t7582 | |
parent | da46355a90442636ee7634c31a69eae8e8b9cd42 (diff) | |
parent | 333187a7c020b7d51d68c5435852305e70d89d41 (diff) | |
download | scala-288d4ef1509160b21134e3ddacca5ee8311919ba.tar.gz scala-288d4ef1509160b21134e3ddacca5ee8311919ba.tar.bz2 scala-288d4ef1509160b21134e3ddacca5ee8311919ba.zip |
Merge remote-tracking branch 'origin/2.12.x' into merge/2.11.x-to-2.12.x-20160203
Diffstat (limited to 'test/files/run/t7582')
-rw-r--r-- | test/files/run/t7582/InlineHolder.scala | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/files/run/t7582/InlineHolder.scala b/test/files/run/t7582/InlineHolder.scala index 3cbf233ce1..a18b9effaa 100644 --- a/test/files/run/t7582/InlineHolder.scala +++ b/test/files/run/t7582/InlineHolder.scala @@ -1,6 +1,3 @@ -/* - * filter: inliner warning; re-run with - */ package p1 { object InlineHolder { @inline def inlinable = p1.PackageProtectedJava.protectedMethod() + 1 |