From 0f0144c74088e396fc1440166bed5a7c6d5f44f4 Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Mon, 23 Apr 2012 16:04:56 +0200
Subject: migrates stdlib and compiler to tags * all usages of ClassManifest
 and Manifest are replaced with tags * all manifest tests are replaced with
 tag tests

---
 .../parallel/benchmarks/arrays/Resetting.scala     |  8 +++----
 .../parallel_array/MatrixMultiplication.scala      | 26 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'test/benchmarks')

diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/arrays/Resetting.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/arrays/Resetting.scala
index e6feb59fcd..22d2107f62 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/arrays/Resetting.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/arrays/Resetting.scala
@@ -4,19 +4,19 @@ package scala.collection.parallel.benchmarks.arrays
 import scala.collection.parallel.benchmarks._
 
 
-abstract class Resetting[T: Manifest](elemcreate: Int => T, sz: Int, p: Int, what: String)
+abstract class Resetting[T: ClassTag](elemcreate: Int => T, sz: Int, p: Int, what: String)
 extends Bench {
   val size = sz
   val parallelism = p
   val runWhat = what
-  
+
   var anyarray: Array[Any] = null
   var castarray: AnyRef = null
   var gencastarray: Array[T] = null
   var manifarray: Array[T] = null
-  
+
   reset
-  
+
   def reset = what match {
     case "any" =>
       anyarray = new Array[Any](sz)
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala
index 5f902ff483..6d5b189c3a 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/MatrixMultiplication.scala
@@ -16,54 +16,54 @@ class MatrixMultiplication(sz: Int, p: Int, what: String)
 extends Resettable(sz, p, what, new Cont(_), new Array[Any](_), classOf[Cont]) {
   def companion = MatrixMultiplication
   collection.parallel.tasksupport.environment = forkjoinpool
-  
+
   val a = Matrix.unit[Int](sz)
   val b = Matrix.unit[Int](sz)
   var c = new Matrix[Int](sz)
-  
+
   def runpar = c = a * b //{ c.assignProduct(a, b) } //; println("--------"); c.output }
   def runseq = throw new UnsupportedOperationException
   def comparisonMap = collection.Map()
-  
-  class Matrix[T](n: Int)(implicit num: Numeric[T], man: Manifest[T]) {
+
+  class Matrix[T](n: Int)(implicit num: Numeric[T], tag: ClassTag[T]) {
     val array = new Array[T](n * n)
-    
+
     def apply(y: Int, x: Int) = array(y * n + x)
-    
+
     def update(y: Int, x: Int, elem: T) = array(y * n + x) = elem
-    
+
     def *(b: Matrix[T]) = {
       val m = new Matrix[T](n)
       m.assignProduct(this, b)
       m
     }
-    
+
     def assignProduct(a: Matrix[T], b: Matrix[T]) = {
       val range = ParRange(0, n * n, 1, false)
       for (i <- range) this(i / n, i % n) = calcProduct(a, b, i / n, i % n);
     }
-    
+
     private def calcProduct(a: Matrix[T], b: Matrix[T], y: Int, x: Int): T = {
       import num._
       var sum = zero
       for (i <- 0 until n) sum += a(y, i) * b(i, x)
       sum
     }
-    
+
     def output = for (y <- 0 until n) {
       for (x <- 0 until n) print(this(y, x))
       println
     }
   }
-  
+
   object Matrix {
-    def unit[T](n: Int)(implicit num: Numeric[T], man: Manifest[T]) = {
+    def unit[T](n: Int)(implicit num: Numeric[T], tag: ClassTag[T]) = {
       val m = new Matrix[T](n)
       for (i <- 0 until n) m(i, i) = num.one
       m
     }
   }
-  
+
 }
 
 
-- 
cgit v1.2.3