From 3c497896a20b1e4636a628802b5e722800a20bd2 Mon Sep 17 00:00:00 2001
From: Lester Solbakken <lesters@oath.com>
Date: Thu, 6 Sep 2018 10:01:28 +0200
Subject: Add using HeapSize to avoid long namespace qualifiers

---
 searchcore/src/tests/proton/matching/matching_test.cpp      | 3 ++-
 searchcore/src/vespa/searchcore/proton/matching/matcher.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 4813bf3bdc7..7c6779fdc63 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -53,6 +53,7 @@ using namespace search;
 using search::attribute::test::MockAttributeContext;
 using search::index::schema::DataType;
 using storage::spi::Timestamp;
+using search::fef::indexproperties::hitcollector::HeapSize;
 
 void inject_match_phase_limiting(Properties &setup, const vespalib::string &attribute, size_t max_hits, bool descending)
 {
@@ -287,7 +288,7 @@ struct MyWorld {
         Matcher::SP matcher = createMatcher();
         search::fef::Properties overrides;
         auto mtf = matcher->create_match_tools_factory(*req, searchContext, attributeContext, metaStore, overrides);
-        auto diversity = mtf->createDiversifier(search::fef::indexproperties::hitcollector::HeapSize::lookup(config));
+        auto diversity = mtf->createDiversifier(HeapSize::lookup(config));
         EXPECT_EQUAL(expectDiverse, static_cast<bool>(diversity));
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
index 13562c4e45a..b32af7e3e5a 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
@@ -28,6 +28,7 @@ using search::FeatureSet;
 using search::attribute::IAttributeContext;
 using search::fef::MatchDataLayout;
 using search::fef::MatchData;
+using search::fef::indexproperties::hitcollector::HeapSize;
 using search::queryeval::Blueprint;
 using search::queryeval::SearchIterator;
 using vespalib::Doom;
@@ -243,8 +244,7 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl
         }
 
         const Properties & rankProperties = request.propertiesMap.rankProperties();
-        uint32_t heapSize = search::fef::indexproperties::hitcollector:: HeapSize::lookup(rankProperties,
-                                                                                          _rankSetup->getHeapSize());
+        uint32_t heapSize = HeapSize::lookup(rankProperties, _rankSetup->getHeapSize());
 
         MatchParams params(searchContext.getDocIdLimit(), heapSize, _rankSetup->getArraySize(),
                            _rankSetup->getRankScoreDropLimit(), request.offset, request.maxhits,
-- 
cgit v1.2.3