diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-08-26 10:30:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-01 06:58:04 +0000 |
| commit | 04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 (patch) | |
| tree | 4a3e9f078730bb538e2ca2751d189ff14a89901e /src/libs/utils/pointeralgorithm.h | |
| parent | 34a9491a08639f8df0b55d74d51f4dadaa1cc2fd (diff) | |
Utils: Remove Utils::optional
Since we are now requiring macOS 10.14 we can remove our local
implementation of optional and use std::optional for macOS too.
Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/libs/utils/pointeralgorithm.h')
| -rw-r--r-- | src/libs/utils/pointeralgorithm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/utils/pointeralgorithm.h b/src/libs/utils/pointeralgorithm.h index ca5b7974606..0a790f5b175 100644 --- a/src/libs/utils/pointeralgorithm.h +++ b/src/libs/utils/pointeralgorithm.h @@ -253,13 +253,13 @@ auto toRawPointer(const SourceContainer &sources) // take: ///////////////// template<typename C> -Q_REQUIRED_RESULT optional<ValueType<C>> take(C &container, PointerType<C> p) +Q_REQUIRED_RESULT std::optional<ValueType<C>> take(C &container, PointerType<C> p) { return take(container, [p](const ValueType<C> &v) { return v.get() == p; }); } -template <typename C> -Q_REQUIRED_RESULT optional<ValueType<C>> take(C &container, std::nullptr_t) +template<typename C> +Q_REQUIRED_RESULT std::optional<ValueType<C>> take(C &container, std::nullptr_t) { return take(container, static_cast<PointerType<C>>(nullptr)); } |