diff options
-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 f54d4123ec4..b4a19b2d684 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -36,7 +36,7 @@ endif() # Warnings that are specific to C++ compilation # Note: this is not a union of C_WARN_OPTS, since CMAKE_CXX_FLAGS already includes CMAKE_C_FLAGS, which in turn includes C_WARN_OPTS transitively if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") - set(CXX_SPECIFIC_WARN_OPTS "-Wnoexcept -Wnon-virtual-dtor -Wformat-security -Wno-overloaded-virtual") + set(CXX_SPECIFIC_WARN_OPTS "-Wnon-virtual-dtor -Wformat-security -Wno-overloaded-virtual") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(VESPA_ATOMIC_LIB "") 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 { |