diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 11:35:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 11:35:34 +0200 |
| commit | 3acc8a7761d2f16366fd3ad888d191e805d57abf (patch) | |
| tree | d955106f98d9443681591bea1a81d99265fdca99 | |
| parent | 8df1e7bc3dfe0c307ba3d73db3baab40504782e0 (diff) | |
| parent | 0029b01ea76687ff84db17eeba19446bf63742b4 (diff) | |
Merge pull request #14768 from vespa-engine/balder/use-Wnoexcept
Use -Wnoexcept
| -rw-r--r-- | build_settings.cmake | 2 | ||||
| -rw-r--r-- | staging_vespalib/src/tests/metrics/mock_tick.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 1a05ffe5073..b4a19b2d684 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -53,7 +53,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST endif() endif() else() - set(CXX_SPECIFIC_WARN_OPTS "-Wsuggest-override -Wnon-virtual-dtor -Wformat-security") + set(CXX_SPECIFIC_WARN_OPTS "-Wnoexcept -Wsuggest-override -Wnon-virtual-dtor -Wformat-security") if(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8" OR (VESPA_OS_DISTRO STREQUAL "rhel" AND VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND diff --git a/staging_vespalib/src/tests/metrics/mock_tick.h b/staging_vespalib/src/tests/metrics/mock_tick.h index e8f621508ae..d2e985b5ba3 100644 --- a/staging_vespalib/src/tests/metrics/mock_tick.h +++ b/staging_vespalib/src/tests/metrics/mock_tick.h @@ -15,8 +15,9 @@ class MockTick : public Tick { private: using Guard = std::unique_lock<std::mutex>; struct Value { - TimeStamp value{0.0}; - bool valid{false}; + Value() noexcept : value(0.0), valid(false) {} + TimeStamp value; + bool valid; }; TimeStamp _first_value; @@ -55,7 +56,7 @@ private: } public: - explicit MockTick(TimeStamp first_value) + explicit MockTick(TimeStamp first_value) noexcept : _first_value(first_value), _lock(), _cond(), _alive(true), _prev(), _next() {} TimeStamp first() override { return _first_value; } TimeStamp next(TimeStamp prev) override { |