Move Normalization from search::streaming => search

2 files changed, 5 insertions, 4 deletions

diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
index 2af68c553b8..6f3ec3e1e73 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
@@ -22,20 +22,21 @@ using SharedSearcherBuf = std::shared_ptr<SearcherBuf>;
 
 class FieldSearcherBase
 {
+public:
+    FieldSearcherBase & operator = (const FieldSearcherBase & org) = delete;
 protected:
     FieldSearcherBase() noexcept;
     FieldSearcherBase(const FieldSearcherBase & org);
     virtual ~FieldSearcherBase();
-    FieldSearcherBase & operator = (const FieldSearcherBase & org) = delete;
     void prepare(const search::streaming::QueryTermList & qtl);
-protected:
+
     search::streaming::QueryTermList _qtl;
 };
 
 class FieldSearcher : public FieldSearcherBase
 {
 public:
-    using Normalizing = search::streaming::Normalizing;
+    using Normalizing = search::Normalizing;
     enum MatchType {
         REGULAR,
         PREFIX,
diff --git a/streamingvisitors/src/vespa/vsm/searcher/tokenizereader.h b/streamingvisitors/src/vespa/vsm/searcher/tokenizereader.h
index f10c8910e82..2bb5e62e0aa 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/tokenizereader.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/tokenizereader.h
@@ -14,7 +14,7 @@ namespace vsm {
 class TokenizeReader {
 public:
     using byte = search::byte;
-    using Normalizing = search::streaming::Normalizing;
+    using Normalizing = search::Normalizing;
     TokenizeReader(const byte *p, uint32_t len, ucs4_t *q) noexcept
         : _p(p),
           _p_end(p + len),