3 files changed, 9 insertions, 9 deletions
diff --git a/searchlib/src/tests/queryeval/weak_and/rise_wand.h b/searchlib/src/tests/queryeval/weak_and/rise_wand.h
index 7a5e46c05ea..250993bf139 100644
--- a/searchlib/src/tests/queryeval/weak_and/rise_wand.h
+++ b/searchlib/src/tests/queryeval/weak_and/rise_wand.h
@@ -28,10 +28,10 @@ template <typename Scorer, typename Cmp>
 class RiseWand : public search::queryeval::SearchIterator
 {
 public:
-    typedef uint32_t docid_t;
-    typedef uint64_t score_t;
-    typedef search::queryeval::wand::Terms Terms;
-    typedef search::queryeval::SearchIterator *PostingStreamPtr;
+    using docid_t = uint32_t;
+    using score_t = uint64_t;
+    using Terms = search::queryeval::wand::Terms;
+    using PostingStreamPtr = search::queryeval::SearchIterator*;
 
 private:
     // comparator class that compares two streams. The variables a and b are
@@ -125,8 +125,8 @@ public:
     void doUnpack(uint32_t docid) override;
 };
 
-typedef RiseWand<TermFreqScorer, std::greater_equal<uint64_t> > TermFrequencyRiseWand;
-typedef RiseWand<DotProductScorer, std::greater<uint64_t> > DotProductRiseWand;
+using TermFrequencyRiseWand = RiseWand<TermFreqScorer, std::greater_equal<uint64_t> >;
+using DotProductRiseWand = RiseWand<DotProductScorer, std::greater<uint64_t> >;
 
 } // namespacve rise
 
diff --git a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp
index 87eec226221..fd73243b4fa 100644
--- a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp
+++ b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp
@@ -18,8 +18,8 @@ using namespace search::fef;
 using namespace search::queryeval;
 using namespace vespalib;
 
-typedef ParallelWeakAndSearch::MatchParams PWMatchParams;
-typedef ParallelWeakAndSearch::RankParams PWRankParams;
+using PWMatchParams = ParallelWeakAndSearch::MatchParams;
+using PWRankParams = ParallelWeakAndSearch::RankParams;
 
 namespace {
 
diff --git a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
index 828538b5e8e..e1593f7ad1d 100644
--- a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
+++ b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
@@ -13,7 +13,7 @@ using namespace search::fef;
 using namespace search::queryeval;
 using namespace search::queryeval::test;
 
-typedef SearchHistory History;
+using History = SearchHistory;
 
 namespace {