Revert "Balder/enforce override 2"

2 files changed, 6 insertions, 2 deletions

diff --git a/vespalib/src/vespa/vespalib/util/closure.h b/vespalib/src/vespa/vespalib/util/closure.h
index a494c8d97df..81ea8430609 100644
--- a/vespalib/src/vespa/vespalib/util/closure.h
+++ b/vespalib/src/vespa/vespalib/util/closure.h
@@ -102,7 +102,9 @@ class Closure0_2 : public Closure0<R> {
     T1 _arg1;
     T2 _arg2;
 
-    R call() override { return _func(std::move(_arg1), std::move(_arg2)); }
+    virtual R call() override
+    { return _func(std::move(_arg1), std::move(_arg2)); }
+
 public:
     Closure0_2(Func func, T1 &&arg1, T2 &&arg2)
         : _func(func), _arg1(std::move(arg1)), _arg2(std::move(arg2)) {}
@@ -118,7 +120,8 @@ class Closure0_3 : public Closure0<R> {
     T2 _arg2;
     T3 _arg3;
 
-    R call() override { return _func(std::move(_arg1), std::move(_arg2), std::move(_arg3)); }
+    virtual R call() override
+    { return _func(std::move(_arg1), std::move(_arg2), std::move(_arg3)); }
 
 public:
     Closure0_3(Func func, T1 &&arg1, T2 &&arg2, T3 &&arg3)
diff --git a/vespalib/src/vespa/vespalib/util/exception.h b/vespalib/src/vespa/vespalib/util/exception.h
index 1ea1a9e5e61..af2f1bc225a 100644
--- a/vespalib/src/vespa/vespalib/util/exception.h
+++ b/vespalib/src/vespa/vespalib/util/exception.h
@@ -6,6 +6,7 @@
 #include <vespa/vespalib/util/macro.h>
 #include <vespa/vespalib/util/error.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <string>
 #include <exception>
 
 #define VESPALIB_EXCEPTION_USEBACKTRACES