diff options
| author | Håvard Pettersen <3535158+havardpe@users.noreply.github.com> | 2023-06-21 10:00:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-21 10:00:22 +0200 |
| commit | added31515f420a956679af9447120e9c7e3136c (patch) | |
| tree | 8f1f768048f02f5eb7ec97bb1c7ce6e954a5c48a /vespalib/src | |
| parent | d5c988a942b764223952585b628c4eeef2341a6f (diff) | |
| parent | d3954e4a58d780e2c224d56b532894a5687159b7 (diff) | |
Merge pull request #27496 from vespa-engine/toregge/prefer-using-use-std-conditional-t-pass-2
Avoid warning about missing typename in nexus.
Diffstat (limited to 'vespalib/src')
| -rw-r--r-- | vespalib/src/vespa/vespalib/test/nexus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vespalib/src/vespa/vespalib/test/nexus.h b/vespalib/src/vespa/vespalib/test/nexus.h index aeb9337b975..f3b77b9bcc1 100644 --- a/vespalib/src/vespa/vespalib/test/nexus.h +++ b/vespalib/src/vespa/vespalib/test/nexus.h @@ -38,7 +38,7 @@ public: ThreadPool pool; using result_t = std::decay_t<decltype(entry(std::declval<Nexus&>()))>; constexpr bool is_void = std::same_as<result_t, void>; - using stored_t = std::conditional<is_void, std::monostate, result_t>::type; + using stored_t = std::conditional_t<is_void, std::monostate, result_t>; std::mutex lock; std::optional<stored_t> result; auto handle_result = [&](stored_t thread_result) noexcept { |