Merge pull request ThoughtWorksInc#35 from Atry/upgrade-feature-scala

Upgrade feature.scala

Author: Atry

Expressions/build.sbt

@@ -1,8 +1,8 @@
-libraryDependencies += "com.thoughtworks.feature" %% "partialapply" % "2.3.0-M5"
+libraryDependencies += "com.thoughtworks.feature" %% "partialapply" % "2.3.0-M6"
 
-libraryDependencies += "com.thoughtworks.feature" %% "implicitapply" % "2.3.0-M5"
+libraryDependencies += "com.thoughtworks.feature" %% "implicitapply" % "2.3.0-M6"
 
-libraryDependencies += "com.thoughtworks.feature" %% "factory" % "2.3.0-M5"
+libraryDependencies += "com.thoughtworks.feature" %% "factory" % "2.3.0-M6"
 
 libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.3"
 

Expressions/src/main/scala/com/thoughtworks/expressions/opencl/Context.scala

@@ -3,7 +3,7 @@ package com.thoughtworks.expressions.opencl
 import com.dongxiguo.fastring.Fastring.Implicits._
 import com.thoughtworks.expressions.api.{Arrays, FloatArrays, Floats, Terms}
 import com.thoughtworks.expressions.opencl.Context.ClTypeDefinition.{ArrayDefinition, FloatDefinition}
-import com.thoughtworks.feature.Factory.{Factory1, Factory2, Factory3, Lt, inject}
+import com.thoughtworks.feature.Factory.{Factory1, Factory2, Factory3, Factory4, Factory5, Factory6, inject}
 import org.apache.commons.math3.linear.{MatrixUtils, RealMatrix}
 
 import scala.collection.mutable
@@ -314,14 +314,6 @@ trait Context extends FloatArrays {
     }
   }
 
-  // FIXME: Upgrade feature.scala
-  type Factory4[-Parameter0, -Parameter1, -Parameter2, -Parameter3, Output] =
-    Lt[Output, (Parameter0, Parameter1, Parameter2, Parameter3) => Output]
-  type Factory5[-Parameter0, -Parameter1, -Parameter2, -Parameter3, -Parameter4, Output] =
-    Lt[Output, (Parameter0, Parameter1, Parameter2, Parameter3, Parameter4) => Output]
-  type Factory6[-Parameter0, -Parameter1, -Parameter2, -Parameter3, -Parameter4, -Parameter5, Output] =
-    Lt[Output, (Parameter0, Parameter1, Parameter2, Parameter3, Parameter4, Parameter5) => Output]
-
   @inject
   def arrayParameterFactory[LocalElement <: ValueTerm]
     : Factory5[LocalElement#ThisType,