From 04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 26 Aug 2022 10:30:00 +0200
Subject: 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>
---
 src/libs/sqlite/sqlitealgorithms.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libs/sqlite/sqlitealgorithms.h')

diff --git a/src/libs/sqlite/sqlitealgorithms.h b/src/libs/sqlite/sqlitealgorithms.h
index bda904c0e8..9361be0b10 100644
--- a/src/libs/sqlite/sqlitealgorithms.h
+++ b/src/libs/sqlite/sqlitealgorithms.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <utils/optional.h>
 #include <utils/smallstringview.h>
 
+#include <optional>
 #include <type_traits>
 
 namespace Sqlite {
@@ -34,7 +34,7 @@ void insertUpdateDelete(SqliteRange &&sqliteRange,
     auto endSqliteIterator = sqliteRange.end();
     auto currentValueIterator = values.begin();
     auto endValueIterator = values.end();
-    Utils::optional<std::decay_t<decltype(*currentValueIterator)>> lastValue;
+    std::optional<std::decay_t<decltype(*currentValueIterator)>> lastValue;
 
     while (true) {
         bool hasMoreValues = currentValueIterator != endValueIterator;
-- 
cgit v1.2.1