From c9c54cbc1f20ed5f54bc63035fe7881604c795ff Mon Sep 17 00:00:00 2001
From: Håvard Pettersen <havardpe@oath.com>
Date: Sat, 13 Jun 2020 15:08:51 +0000
Subject: auto-detect actual type typify results

---
 eval/src/vespa/eval/eval/aggr.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'eval/src')

diff --git a/eval/src/vespa/eval/eval/aggr.h b/eval/src/vespa/eval/eval/aggr.h
index e7431c2c23b..169f0b1d2af 100644
--- a/eval/src/vespa/eval/eval/aggr.h
+++ b/eval/src/vespa/eval/eval/aggr.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <vespa/vespalib/util/typify.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vector>
 #include <map>
@@ -120,10 +121,7 @@ public:
 } // namespave vespalib::eval::aggr
 
 struct TypifyAggr {
-    template <template<typename> typename A> struct Result {
-        static constexpr bool is_type = false;
-        template <typename T> using templ = A<T>;
-    };
+    template <template<typename> typename TT> using Result = TypifyResultSimpleTemplate<TT>;
     template <typename F> static decltype(auto) resolve(Aggr aggr, F &&f) {
         switch (aggr) {
         case Aggr::AVG:   return f(Result<aggr::Avg>());
-- 
cgit v1.2.3