deinline large destructors

6 files changed, 23 insertions, 2 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp
index 5e598f0f82b..2d96eddf493 100644
--- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp
@@ -17,6 +17,8 @@ IndexEnvironment::IndexEnvironment(const ITableManager & tableManager) :
 {
 }
 
+IndexEnvironment::~IndexEnvironment() {}
+
 bool
 IndexEnvironment::addField(const vespalib::string & name, bool isAttribute)
 {
diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h
index 61a0805e0c1..d45817d0097 100644
--- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h
@@ -32,6 +32,7 @@ private:
 
 public:
     IndexEnvironment(const search::fef::ITableManager & tableManager);
+    ~IndexEnvironment();
 
     // inherit documentation
     virtual const search::fef::Properties & getProperties() const override { return _properties; }
diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp
index a69dd525f96..2a841de4b34 100644
--- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp
@@ -14,7 +14,8 @@ namespace storage {
 
 namespace {
 
-search::fef::Location parseLocation(const string & location_str)
+search::fef::Location
+parseLocation(const string & location_str)
 {
     search::fef::Location fefLocation;
     if (location_str.empty()) {
@@ -57,5 +58,7 @@ QueryEnvironment::QueryEnvironment(const string & location_str,
 {
 }
 
+QueryEnvironment::~QueryEnvironment() {}
+
 } // namespace storage
 
diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
index 48d0ef7645a..05ddcba92d3 100644
--- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h
@@ -32,6 +32,7 @@ public:
                      const IndexEnvironment & indexEnv,
                      const search::fef::Properties & properties,
                      const search::IAttributeManager * attrMgr = NULL);
+    ~QueryEnvironment();
 
     // inherit documentation
     virtual const search::fef::Properties & getProperties() const { return _properties; }
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index fa68c046aa6..e83ec55b93f 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -105,7 +105,11 @@ SearchVisitor::SummaryGenerator::SummaryGenerator() :
 {
 }
 
-vespalib::ConstBufferRef SearchVisitor::SummaryGenerator::fillSummary(AttributeVector::DocId lid, const HitsAggregationResult::SummaryClassType & summaryClass)
+SearchVisitor::SummaryGenerator::~SummaryGenerator() { }
+
+
+vespalib::ConstBufferRef
+SearchVisitor::SummaryGenerator::fillSummary(AttributeVector::DocId lid, const HitsAggregationResult::SummaryClassType & summaryClass)
 {
     if (_docsumWriter != NULL) {
         _rawBuf.reset();
@@ -135,6 +139,8 @@ SearchVisitor::GroupingEntry::GroupingEntry(Grouping * grouping) :
 {
 }
 
+SearchVisitor::GroupingEntry::~GroupingEntry() { }
+
 void SearchVisitor::GroupingEntry::aggregate(const document::Document & doc, search::HitRank rank)
 {
     if (_count < _limit) {
@@ -393,6 +399,8 @@ SearchVisitor::PositionInserter::PositionInserter(search::AttributeVector & attr
 {
 }
 
+SearchVisitor::PositionInserter::~PositionInserter() {}
+
 void
 SearchVisitor::PositionInserter::onPrimitive(const IteratorContent & c)
 {
@@ -458,6 +466,8 @@ SearchVisitor::RankController::RankController() :
 {
 }
 
+SearchVisitor::RankController::~RankController() {}
+
 void
 SearchVisitor::RankController::setupRankProcessors(search::Query & query, 
                                                    const vespalib::string & location,
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index 101fd91c5af..e8de5f85e5a 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -101,6 +101,7 @@ private:
     class PositionInserter : public AttributeInserter {
     public:
         PositionInserter(search::AttributeVector & attribute, search::AttributeVector::DocId docId);
+        ~PositionInserter();
     private:
         virtual void onPrimitive(const IteratorContent & c);
         virtual void onStructStart(const Content & fv);
@@ -133,6 +134,7 @@ private:
 
     public:
         RankController();
+        ~RankController();
         bool valid() const { return _rankProcessor.get() != NULL; }
         void setRankProfile(const vespalib::string &rankProfile) { _rankProfile = rankProfile; }
         const vespalib::string &getRankProfile() const { return _rankProfile; }
@@ -368,6 +370,7 @@ private:
     class GroupingEntry : std::shared_ptr<Grouping> {
     public:
         GroupingEntry(Grouping * grouping);
+        ~GroupingEntry();
         void aggregate(const document::Document & doc, search::HitRank rank);
         const Grouping & operator * () const { return *_grouping; }
         Grouping & operator * () { return *_grouping; }
@@ -384,6 +387,7 @@ private:
     {
     public:
         SummaryGenerator();
+        ~SummaryGenerator();
         GetDocsumsState & getDocsumState() { return _docsumState; }
         vsm::GetDocsumsStateCallback & getDocsumCallback() { return _callback; }
         void setFilter(std::unique_ptr<vsm::DocsumFilter> filter) { _docsumFilter = std::move(filter); }