summaryrefslogtreecommitdiffstats
path: root/storageframework
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-02-16 12:33:01 +0000
committerGeir Storli <geirst@yahooinc.com>2022-02-16 12:33:01 +0000
commit9abf0ea266fa7ab4402b0a96aa0514ab8b5622a6 (patch)
treeb348787db025500b3bcd6c5c9d2d02629d7f9bf2 /storageframework
parent764afc2ec75333d0cbea6830facf233a97124597 (diff)
Use std::nullopt for empty optionals.
Diffstat (limited to 'storageframework')
-rw-r--r--storageframework/src/vespa/storageframework/generic/component/component.h2
-rw-r--r--storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp2
2 files changed, 2 insertions, 2 deletions
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)));
}
}