Override

4 files changed, 7 insertions, 6 deletions

diff --git a/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp
index 4332d6bf045..e323904226c 100644
--- a/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp
+++ b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.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 <vespa/vespalib/trace/slime_trace_serializer.h>
-#include <vespa/vespalib/trace/trace.h>
+#include "slime_trace_serializer.h"
+#include "trace.h"
+#include <cassert>
 
 using namespace vespalib::slime;
 
diff --git a/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h
index 802f0ab5fe9..976a8d1904a 100644
--- a/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h
+++ b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <vespa/vespalib/trace/tracevisitor.h>
-#include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/data/slime/cursor.h>
 #include <stack>
 
 namespace vespalib {
@@ -17,7 +17,7 @@ class SlimeTraceSerializer : public TraceVisitor
 {
 public:
     SlimeTraceSerializer(slime::Cursor & cursor);
-    void visit(const TraceNode & node);
+    void visit(const TraceNode & node) override;
     static const Memory TIMESTAMP;
     static const Memory PAYLOAD;
     static const Memory CHILDREN;
diff --git a/vespalib/src/vespa/vespalib/util/closuretask.h b/vespalib/src/vespa/vespalib/util/closuretask.h
index 0bba289817e..8152897d447 100644
--- a/vespalib/src/vespa/vespalib/util/closuretask.h
+++ b/vespalib/src/vespa/vespalib/util/closuretask.h
@@ -15,7 +15,7 @@ class ClosureTask : public Executor::Task {
 
 public:
     ClosureTask(std::unique_ptr<Closure> closure) : _closure(std::move(closure)) {}
-    virtual void run() { _closure->call(); }
+    void run() override { _closure->call(); }
 };
 
 /**
diff --git a/vespalib/src/vespa/vespalib/util/exception.h b/vespalib/src/vespa/vespalib/util/exception.h
index a9abf6146b2..af2f1bc225a 100644
--- a/vespalib/src/vespa/vespalib/util/exception.h
+++ b/vespalib/src/vespa/vespalib/util/exception.h
@@ -206,7 +206,7 @@ public:
               const stringref &location = "", int skipStack = 0);
 
     /** @brief Returns a string describing the current exception, including cause if any */
-    const char *what() const throw(); // should not be overridden
+    const char *what() const throw() override; // should not be overridden
 
     /** @brief Returns a pointer to underlying cause (or NULL if no cause) */
     const Exception *getCause() const { return _cause.get(); }