diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-04-24 12:10:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 12:10:42 +0200 |
commit | 9ff4bdb407ed8d855a3f86a17c99906ff738177b (patch) | |
tree | fc2b050224d7dde92d57e1f9cac12c1e5aaf6b90 /vespalib/src | |
parent | 32ae190acc9ac5081049e1c7008d1602c68cf821 (diff) |
Revert "Balder/enforce override 2"
Diffstat (limited to 'vespalib/src')
-rw-r--r-- | vespalib/src/vespa/vespalib/util/closure.h | 7 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/util/exception.h | 1 |
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 |