Deinline

3 files changed, 12 insertions, 12 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 470e612770d..b25c7b67299 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -155,7 +155,7 @@ public:
     using GenerationHolder = vespalib::GenerationHolder;
     typedef GenerationHandler::generation_t generation_t;
 
-    virtual ~AttributeVector();
+    ~AttributeVector() override;
 protected:
     /**
      * Will update statistics by calling onUpdateStat if necessary.
diff --git a/searchlib/src/vespa/searchlib/attribute/componentguard.h b/searchlib/src/vespa/searchlib/attribute/componentguard.h
index db795b896d3..2d7db868054 100644
--- a/searchlib/src/vespa/searchlib/attribute/componentguard.h
+++ b/searchlib/src/vespa/searchlib/attribute/componentguard.h
@@ -19,8 +19,8 @@ private:
     Guard      _generationGuard;
 public:
     ComponentGuard();
-    ComponentGuard(ComponentGuard &&) = default;
-    ComponentGuard & operator = (ComponentGuard &&) = default;
+    ComponentGuard(ComponentGuard &&);
+    ComponentGuard & operator = (ComponentGuard &&);
     ComponentGuard(const ComponentGuard &);
     ComponentGuard & operator = (const ComponentGuard &);
     virtual ~ComponentGuard();
diff --git a/searchlib/src/vespa/searchlib/attribute/componentguard.hpp b/searchlib/src/vespa/searchlib/attribute/componentguard.hpp
index 69f5857ed53..937d2b31740 100644
--- a/searchlib/src/vespa/searchlib/attribute/componentguard.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/componentguard.hpp
@@ -6,10 +6,7 @@
 namespace search {
 
 template <typename T>
-ComponentGuard<T>::ComponentGuard() :
-    _component(),
-    _generationGuard()
-{ }
+ComponentGuard<T>::ComponentGuard()  = default;
 
 template <typename T>
 ComponentGuard<T>::ComponentGuard(const Component & component) :
@@ -18,10 +15,13 @@ ComponentGuard<T>::ComponentGuard(const Component & component) :
 { }
 
 template <typename T>
-ComponentGuard<T>::ComponentGuard(const ComponentGuard & rhs) :
-        _component(rhs._component),
-        _generationGuard(rhs._generationGuard)
-{ }
+ComponentGuard<T>::ComponentGuard(const ComponentGuard &) = default;
+
+template <typename T>
+ComponentGuard<T>::ComponentGuard(ComponentGuard &&) = default;
+
+template <typename T>
+ComponentGuard<T> & ComponentGuard<T>::operator = (ComponentGuard &&) = default;
 
 template <typename T>
 ComponentGuard<T> &
@@ -32,6 +32,6 @@ ComponentGuard<T>::operator = (const ComponentGuard & rhs) {
 }
 
 template <typename T>
-ComponentGuard<T>::~ComponentGuard() { }
+ComponentGuard<T>::~ComponentGuard() = default;
 
 }