Clean up type and base type usage a bit

1 files changed, 3 insertions, 6 deletions

diff --git a/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp b/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp
index adb7750ac66..0c03a36a211 100644
--- a/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/internal_max_reduce_prod_join_feature.cpp
@@ -66,9 +66,7 @@ void
 RawExecutor<BaseType>::execute(uint32_t docId)
 {
     using A = IntegerAttributeTemplate<BaseType>;
-    using AT = multivalue::Value<BaseType>;
-
-    const AT *values(nullptr);
+    const multivalue::Value<BaseType> *values(nullptr);
     const A *iattr = dynamic_cast<const A *>(_attribute);
     size_t count = iattr->getRawValues(docId, values);
     outputs().set_number(0, maxProduct(values, count, _queryVector));
@@ -99,9 +97,8 @@ template <typename BaseType>
 void
 BufferedExecutor<BaseType>::execute(uint32_t docId)
 {
-    _buffer.fill(*RawExecutor<BaseType>::_attribute, docId);
-    feature_t val = maxProduct(_buffer, _buffer.size(), RawExecutor<BaseType>::_queryVector);
-    RawExecutor<BaseType>::outputs().set_number(0, val);
+    _buffer.fill(*(this->_attribute), docId);
+    this->outputs().set_number(0, maxProduct(_buffer, _buffer.size(), this->_queryVector));
 }
 
 /**