diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-07 11:16:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-07 11:16:35 +0000 |
commit | 9bb9d8e14827ecc4dba2d43e2d9e76248c120e1d (patch) | |
tree | 9e64c1471c0391410c824f75e2dc1fbfa8585229 /staging_vespalib | |
parent | f2e89d3361cae0e2e74bac89405a175d6ecf5e98 (diff) |
Add noexcept as indicated by -Wnoeexcept
Diffstat (limited to 'staging_vespalib')
8 files changed, 20 insertions, 24 deletions
diff --git a/staging_vespalib/src/tests/metrics/mock_tick.h b/staging_vespalib/src/tests/metrics/mock_tick.h index 3f244ea6c9f..e8f621508ae 100644 --- a/staging_vespalib/src/tests/metrics/mock_tick.h +++ b/staging_vespalib/src/tests/metrics/mock_tick.h @@ -55,7 +55,7 @@ private: } public: - MockTick(TimeStamp first_value) + explicit MockTick(TimeStamp first_value) : _first_value(first_value), _lock(), _cond(), _alive(true), _prev(), _next() {} TimeStamp first() override { return _first_value; } TimeStamp next(TimeStamp prev) override { @@ -81,7 +81,7 @@ class TickProxy : public Tick { private: std::shared_ptr<Tick> _tick; public: - TickProxy(std::shared_ptr<Tick> tick) : _tick(std::move(tick)) {} + explicit TickProxy(std::shared_ptr<Tick> tick) noexcept : _tick(std::move(tick)) {} TimeStamp first() override { return _tick->first(); } TimeStamp next(TimeStamp prev) override { return _tick->next(prev); } bool alive() const override { return _tick->alive(); } diff --git a/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp b/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp index e3ff7533d58..49bc52d6239 100644 --- a/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp +++ b/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp @@ -7,7 +7,7 @@ using namespace vespalib; class A { public: - virtual ~A() { } + virtual ~A() = default; virtual void assign(const A & rhs) { (void) rhs; assert(false); } // Required by the primitive array. virtual A * clone() const { assert(false); return nullptr; } // Required for the complex array. @@ -19,7 +19,7 @@ public: class Primitive : public A { public: - Primitive(size_t v=11) : _v(v) { } + Primitive(size_t v=11) noexcept : _v(v) { } size_t value() const { return _v; } bool operator == (const A & rhs) const override { return dynamic_cast<const Primitive &>(rhs).value() == value(); @@ -38,7 +38,7 @@ private: class Complex : public A { public: - Complex(size_t v=11) : _v(v) { } + Complex(size_t v=11) noexcept : _v(v) { } size_t value() const { return _v; } bool operator == (const A & rhs) const override { return dynamic_cast<const Complex &>(rhs).value() == value(); diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp b/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp index 2ca49105610..e75cdd09c8c 100644 --- a/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp +++ b/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp @@ -31,7 +31,7 @@ public: int _fail; int _val; - TestObj() + TestObj() noexcept : _m(), _cv(), _done(0), diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp b/staging_vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp index a2671bb81a7..03ec64b771e 100644 --- a/staging_vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp +++ b/staging_vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp @@ -33,7 +33,7 @@ public: int _fail; int _val; - TestObj() + TestObj() noexcept : _m(), _cv(), _done(0), diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp b/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp index df94e70f9d6..29b25cd0471 100644 --- a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp +++ b/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp @@ -33,7 +33,7 @@ public: int _fail; int _val; - TestObj() + TestObj() noexcept : _m(), _cv(), _done(0), diff --git a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp b/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp index cd7a3abb1eb..7909ec7486e 100644 --- a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp +++ b/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp @@ -1,10 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "dummy_metrics_manager.h" -namespace vespalib { -namespace metrics { +namespace vespalib::metrics { -DummyMetricsManager::~DummyMetricsManager() {} +DummyMetricsManager::~DummyMetricsManager() = default; Snapshot DummyMetricsManager::snapshot() @@ -20,5 +19,4 @@ DummyMetricsManager::totalSnapshot() return snap; } -} // namespace vespalib::metrics -} // namespace vespalib +} diff --git a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h b/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h index 6aeb1137732..1536888014a 100644 --- a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h +++ b/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h @@ -10,8 +10,7 @@ #include "metrics_manager.h" #include "clock.h" -namespace vespalib { -namespace metrics { +namespace vespalib::metrics { /** * Dummy manager that discards everything, use @@ -21,9 +20,9 @@ namespace metrics { class DummyMetricsManager : public MetricsManager { protected: - DummyMetricsManager() {} + DummyMetricsManager() noexcept {} public: - ~DummyMetricsManager(); + ~DummyMetricsManager() override; static std::shared_ptr<MetricsManager> create() { return std::shared_ptr<MetricsManager>(new DummyMetricsManager()); @@ -58,5 +57,4 @@ public: void sample(Gauge::Measurement) override {} }; -} // namespace vespalib::metrics -} // namespace vespalib +} diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp index 2c34ba306ab..b1c4a128feb 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp +++ b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp @@ -46,16 +46,16 @@ class IdentifiablePtr : public CloneablePtr<T> { public: IdentifiablePtr(const T &t) : CloneablePtr<T>(t.clone()) {} - IdentifiablePtr(IdentifiablePtr &&) = default; - IdentifiablePtr & operator = (IdentifiablePtr &&) = default; + IdentifiablePtr(IdentifiablePtr &&) noexcept = default; + IdentifiablePtr & operator = (IdentifiablePtr &&) noexcept = default; IdentifiablePtr(const IdentifiablePtr &) = default; IdentifiablePtr & operator = (const IdentifiablePtr &) = default; - IdentifiablePtr(T * p=NULL) : CloneablePtr<T>(p) { } - IdentifiablePtr(std::unique_ptr<T> &&rhs) + IdentifiablePtr(T * p=NULL) noexcept : CloneablePtr<T>(p) { } + IdentifiablePtr(std::unique_ptr<T> &&rhs) noexcept : CloneablePtr<T>(std::move(rhs)) { } - IdentifiablePtr &operator=(std::unique_ptr<T> &&rhs) + IdentifiablePtr &operator=(std::unique_ptr<T> &&rhs) noexcept { CloneablePtr<T>::operator=(std::move(rhs)); return *this; |