diff options
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/src/tests/distributor/top_level_distributor_test.cpp b/storage/src/tests/distributor/top_level_distributor_test.cpp index e420d4d5f8e..2c19652b4c2 100644 --- a/storage/src/tests/distributor/top_level_distributor_test.cpp +++ b/storage/src/tests/distributor/top_level_distributor_test.cpp @@ -253,7 +253,7 @@ TEST_F(TopLevelDistributorTest, tick_aggregates_status_requests_from_all_stripes FakeClock clock; ThreadPoolImpl pool(clock); int ticksBeforeWait = 1; - framework::Thread::UP tp(pool.startThread(thread, "statustest", 5ms, 5s, ticksBeforeWait, {})); + framework::Thread::UP tp(pool.startThread(thread, "statustest", 5ms, 5s, ticksBeforeWait, std::nullopt)); while (true) { std::this_thread::sleep_for(1ms); diff --git a/storageframework/src/vespa/storageframework/generic/component/component.h b/storageframework/src/vespa/storageframework/generic/component/component.h index 45cf30d1902..09af1d276f3 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.h +++ b/storageframework/src/vespa/storageframework/generic/component/component.h @@ -183,7 +183,7 @@ public: vespalib::duration maxProcessTime = vespalib::duration::zero(), vespalib::duration waitTime = vespalib::duration::zero(), int ticksBeforeWait = 1, - std::optional<vespalib::CpuUsage::Category> cpu_category = {}); + std::optional<vespalib::CpuUsage::Category> cpu_category = std::nullopt); // Check upgrade flag settings. Note that this flag may change at any time. // Thus the results of these functions should not be cached. diff --git a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp index 626680f0a95..d7f6189d36c 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp +++ b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp @@ -171,7 +171,7 @@ public: ost.str(), _waitTime.load(std::memory_order_relaxed), _maxProcessTime.load(std::memory_order_relaxed), - _ticksBeforeWait.load(std::memory_order_relaxed), {}))); + _ticksBeforeWait.load(std::memory_order_relaxed), std::nullopt))); } } |