Merge branch 'pull-1352-reformatted' into 2.10.x

# By Martin Odersky
* pull-1352-reformatted:
  Disabled failing build manager tests.
  New test case for SI-6337
  New test case for closing SI-6385
  Value classes: eliminated half-boxing
  Cleanup of OverridingPairs
  Fixes SI-6260

1 files changed, 16 insertions, 0 deletions

diff --git a/test/files/run/t6337a.scala b/test/files/run/t6337a.scala
new file mode 100644
index 0000000000..f5490f5cf0
--- /dev/null
+++ b/test/files/run/t6337a.scala
@@ -0,0 +1,16 @@
+object Test {
+  def main(args: Array[String]) {
+    val x = X(XX(3))
+    assert(x.q.x.x + 9 == 13)
+  }
+}
+trait Q extends Any {
+   def x: Int
+   def inc: XX
+}
+case class X(val x: Q) extends AnyVal {
+   def q = X(x.inc)
+}
+case class XX(val x: Int) extends AnyVal with Q {
+   def inc = XX(x + 1)
+}