Unify on an existing typedef.

3 files changed, 14 insertions, 61 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp b/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp
index 2ca92f6a264..3f86a7f57db 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp
@@ -3,9 +3,6 @@
 #include "attributeiterators.hpp"
 #include "postinglistattribute.h"
 
-#include <vespa/log/log.h>
-LOG_SETUP(".searchlib.attribute.attribute_iterators");
-
 namespace search {
 
 using queryeval::MinMaxPostingInfo;
@@ -77,12 +74,7 @@ FilterAttributeIterator::doUnpack(uint32_t docId)
 
 template <>
 void
-AttributePostingListIteratorT<btree::
-BTreeConstIterator<uint32_t,
-                   btree::BTreeNoLeafData,
-                   btree::NoAggregated,
-                   std::less<uint32_t>,
-                   btree::BTreeDefaultTraits> >::
+AttributePostingListIteratorT<InnerAttributePostingListIterator>::
 doUnpack(uint32_t docId)
 {
     _matchData->resetOnlyDocId(docId);
@@ -92,12 +84,7 @@ doUnpack(uint32_t docId)
 
 template <>
 void
-AttributePostingListIteratorT<btree::
-BTreeConstIterator<uint32_t,
-                   int32_t,
-                   btree::MinMaxAggregated,
-                   std::less<uint32_t>,
-                   btree::BTreeDefaultTraits> >::
+AttributePostingListIteratorT<WeightedInnerAttributePostingListIterator>::
 doUnpack(uint32_t docId)
 {
     _matchData->resetOnlyDocId(docId);
@@ -107,12 +94,7 @@ doUnpack(uint32_t docId)
 
 template <>
 void
-FilterAttributePostingListIteratorT<btree::
-BTreeConstIterator<uint32_t,
-                   btree::BTreeNoLeafData,
-                   btree::NoAggregated,
-                   std::less<uint32_t>,
-                   btree::BTreeDefaultTraits> >::
+FilterAttributePostingListIteratorT<InnerAttributePostingListIterator>::
 doUnpack(uint32_t docId)
 {
     _matchData->resetOnlyDocId(docId);
@@ -121,12 +103,7 @@ doUnpack(uint32_t docId)
 
 template <>
 void
-FilterAttributePostingListIteratorT<btree::
-BTreeConstIterator<uint32_t,
-                   int32_t,
-                   btree::MinMaxAggregated,
-                   std::less<uint32_t>,
-                   btree::BTreeDefaultTraits> >::
+FilterAttributePostingListIteratorT<WeightedInnerAttributePostingListIterator>::
 doUnpack(uint32_t docId)
 {
     _matchData->resetOnlyDocId(docId);
diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.h b/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
index bb4acdbd732..b84802cb17f 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
@@ -183,19 +183,11 @@ public:
 };
 
 
-typedef btree::BTreeConstIterator<uint32_t,
-                                  btree::BTreeNoLeafData,
-                                  btree::NoAggregated,
-                                  std::less<uint32_t>,
-                                  btree::BTreeDefaultTraits>
-InnerAttributePostingListIterator;
-
-typedef btree::BTreeConstIterator<uint32_t,
-                                  int32_t,
-                                  btree::MinMaxAggregated,
-                                  std::less<uint32_t>,
-                                  btree::BTreeDefaultTraits>
-WeightedInnerAttributePostingListIterator; 
+using InnerAttributePostingListIterator = btree::BTreeConstIterator<uint32_t, btree::BTreeNoLeafData, btree::NoAggregated,
+                                                                    std::less<uint32_t>, btree::BTreeDefaultTraits>;
+
+using WeightedInnerAttributePostingListIterator = btree::BTreeConstIterator<uint32_t, int32_t, btree::MinMaxAggregated,
+                                                                            std::less<uint32_t>, btree::BTreeDefaultTraits>; 
 
 template <typename PL>
 class AttributePostingListIteratorT : public AttributePostingListIterator
@@ -259,12 +251,7 @@ public:
 
 template <>
 inline int32_t
-AttributePostingListIteratorT<
-    btree::BTreeConstIterator<uint32_t,
-                              btree::BTreeNoLeafData,
-                              btree::NoAggregated,
-                              std::less<uint32_t>,
-                              btree::BTreeDefaultTraits> >::
+AttributePostingListIteratorT<InnerAttributePostingListIterator>::
 getWeight()
 {
     return 1;   // default weight 1 for single value attributes
@@ -272,15 +259,13 @@ getWeight()
 
 template <>
 void
-AttributePostingListIteratorT<btree::BTreeConstIterator<uint32_t, btree::BTreeNoLeafData, btree::NoAggregated,
-                              std::less<uint32_t>, btree::BTreeDefaultTraits> >::
+AttributePostingListIteratorT<InnerAttributePostingListIterator >::
 doUnpack(uint32_t docId);
 
 
 template <>
 void
-AttributePostingListIteratorT<btree::BTreeConstIterator<uint32_t, int32_t, btree::MinMaxAggregated,
-                              std::less<uint32_t>, btree::BTreeDefaultTraits> >::
+AttributePostingListIteratorT<WeightedInnerAttributePostingListIterator>::
 doUnpack(uint32_t docId);
 
 
diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp
index e17389ea532..4c2c0043de8 100644
--- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp
@@ -6,13 +6,7 @@
 #include "diversity.hpp"
 #include <vespa/searchlib/btree/btreeiterator.hpp>
 
-#include <vespa/log/log.h>
-LOG_SETUP(".searchlib.attribute.posting_list_search_context");
-
-
-namespace search {
-
-namespace attribute {
+namespace search::attribute {
 
 using btree::BTreeNode;
 
@@ -89,7 +83,4 @@ template class PostingListSearchContextT<int32_t>;
 template class PostingListFoldedSearchContextT<btree::BTreeNoLeafData>;
 template class PostingListFoldedSearchContextT<int32_t>;
 
-
-} // namespace attribute
-
-} // namespace search
+}