Including storage now builds fine with override enforcement.

3 files changed, 1 insertions, 63 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp
index 6e9eaae7c09..79a2d2001b6 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "multistringattribute.h"
+#include <vespa/searchlib/query/queryterm.h>
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h
index efbe44b605e..acc28217d09 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h
@@ -119,19 +119,8 @@ public:
     FakeMemTreeOccFactory(const Schema &schema);
     ~FakeMemTreeOccFactory();
 
-<<<<<<< HEAD
-    virtual
-    ~FakeMemTreeOccFactory(void);
-
-    virtual FakePosting::SP
-    make(const FakeWord &fw) override;
-
-    virtual void
-    setup(const std::vector<const FakeWord *> &fws) override;
-=======
     FakePosting::SP make(const FakeWord &fw) override;
     void setup(const std::vector<const FakeWord *> &fws) override;
->>>>>>> Use override
 };
 
 class FakeMemTreeOcc2Factory : public FakeMemTreeOccFactory
@@ -144,7 +133,6 @@ public:
     void setup(const std::vector<const FakeWord *> &fws) override;
 };
 
-
 /*
  * Updateable memory tree format.
  */
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp
index 316b80f9596..ee9bed6ba02 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakezcfilterocc.cpp
@@ -1373,24 +1373,10 @@ class FakeEGCompr64PosOcc : public FakeZcFilterOcc
 public:
     FakeEGCompr64PosOcc(const FakeWord &fw);
     ~FakeEGCompr64PosOcc();
-
-<<<<<<< HEAD
-    ~FakeEGCompr64PosOcc(void);
-
-    void setup(const FakeWord &fw);
-
-    size_t bitSize(void) const override;
-
-    virtual bool hasWordPositions(void) const override;
-
-    virtual SearchIterator *
-    createIterator(const TermFieldMatchDataArray &matchData) const override;
-=======
     void setup(const FakeWord &fw);
     size_t bitSize() const override;
     bool hasWordPositions() const override;
     SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override;
->>>>>>> Use override
 };
 
 
@@ -1514,23 +1500,10 @@ class FakeEG2Compr64PosOcc : public FakeZcFilterOcc
 public:
     FakeEG2Compr64PosOcc(const FakeWord &fw);
     ~FakeEG2Compr64PosOcc();
-
     void setup(const FakeWord &fw);
-
-<<<<<<< HEAD
-    void setup(const FakeWord &fw);
-
-    size_t bitSize(void) const override;
-
-    virtual bool hasWordPositions(void) const override;
-
-    virtual SearchIterator *
-    createIterator(const fef::TermFieldMatchDataArray &matchData) const override;
-=======
     size_t bitSize() const override;
     bool hasWordPositions() const override;
     SearchIterator *createIterator(const fef::TermFieldMatchDataArray &matchData) const override;
->>>>>>> Use override
 };
 
 
@@ -1653,23 +1626,11 @@ class FakeZcSkipPosOcc : public FakeZcFilterOcc
     search::index::PostingListCounts _counts;
 public:
     FakeZcSkipPosOcc(const FakeWord &fw);
-
-<<<<<<< HEAD
-    ~FakeZcSkipPosOcc(void);
-
-    size_t bitSize(void) const override;
-
-    virtual bool hasWordPositions(void) const override;
-
-    virtual SearchIterator *
-    createIterator(const TermFieldMatchDataArray &matchData) const override;
-=======
     ~FakeZcSkipPosOcc();
 
     size_t bitSize() const override;
     bool hasWordPositions() const override;
     SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override;
->>>>>>> Use override
 };
 
 
@@ -1726,21 +1687,9 @@ class FakeZc2SkipPosOcc : public FakeZcFilterOcc
 public:
     FakeZc2SkipPosOcc(const FakeWord &fw);
     ~FakeZc2SkipPosOcc();
-
-<<<<<<< HEAD
-    ~FakeZc2SkipPosOcc(void);
-
-    size_t bitSize(void) const override;
-
-    virtual bool hasWordPositions(void) const override;
-
-    virtual SearchIterator *
-    createIterator(const TermFieldMatchDataArray &matchData) const override;
-=======
     size_t bitSize() const override;
     bool hasWordPositions() const override;
     SearchIterator *createIterator(const TermFieldMatchDataArray &matchData) const override;
->>>>>>> Use override
 };