1 files changed, 6 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java
index 2109b730e1a..bfc0938abcc 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/CompositeTensorFunction.java
@@ -18,10 +18,14 @@ public abstract class CompositeTensorFunction extends TensorFunction {
 
     /** Finds the type this produces by first converting it to a primitive function */
     @Override
-    public final TensorType type(TypeContext context) { return toPrimitive().type(context); }
+    public final <NAMETYPE extends TypeContext.Name> TensorType type(TypeContext<NAMETYPE> context) {
+        return toPrimitive().type(context);
+    }
 
     /** Evaluates this by first converting it to a primitive function */
     @Override
-    public final Tensor evaluate(EvaluationContext context) { return toPrimitive().evaluate(context); }
+    public final <NAMETYPE extends TypeContext.Name> Tensor evaluate(EvaluationContext<NAMETYPE> context) {
+        return toPrimitive().evaluate(context);
+    }
 
 }