diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-23 17:34:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-23 17:34:09 +0200 |
| commit | 2734f8f555c51970cc45ec25ea132752e64527d9 (patch) | |
| tree | c3265f0d3a2ae27cf4c7d89336477d42aa7566f7 /vespalib | |
| parent | 22623e77106fdb23be55b2ee285ae1d8aa7a97b9 (diff) | |
| parent | 102227919bb1956116db7c24d8e56259fdfe90ec (diff) | |
Merge pull request #2236 from yahoo/balder/enforce-override-2
Balder/enforce override 2
Diffstat (limited to 'vespalib')
| -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, 2 insertions, 6 deletions
diff --git a/vespalib/src/vespa/vespalib/util/closure.h b/vespalib/src/vespa/vespalib/util/closure.h index 81ea8430609..a494c8d97df 100644 --- a/vespalib/src/vespa/vespalib/util/closure.h +++ b/vespalib/src/vespa/vespalib/util/closure.h @@ -102,9 +102,7 @@ class Closure0_2 : public Closure0<R> { T1 _arg1; T2 _arg2; - virtual R call() override - { return _func(std::move(_arg1), std::move(_arg2)); } - + 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)) {} @@ -120,8 +118,7 @@ class Closure0_3 : public Closure0<R> { T2 _arg2; T3 _arg3; - virtual R call() override - { return _func(std::move(_arg1), std::move(_arg2), std::move(_arg3)); } + 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 af2f1bc225a..1ea1a9e5e61 100644 --- a/vespalib/src/vespa/vespalib/util/exception.h +++ b/vespalib/src/vespa/vespalib/util/exception.h @@ -6,7 +6,6 @@ #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 |