Revert "Sqlite: Flatten calls inside functions"

This reverts commit 2a301d41c41afb1e1fceda0b1a22fa507c668366.

Reason for revert: msvc uses a different syntax

Change-Id: Iec4ae2a65e6957c6e1368cc481a63fab0e55ce9e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

3 files changed, 24 insertions, 28 deletions

diff --git a/src/libs/sqlite/sqlitebasestatement.h b/src/libs/sqlite/sqlitebasestatement.h
index 6e26ba8247..3c49029344 100644
--- a/src/libs/sqlite/sqlitebasestatement.h
+++ b/src/libs/sqlite/sqlitebasestatement.h
@@ -27,12 +27,6 @@
 
 using std::int64_t;
 
-#ifdef Q_CC_MSVC
-#define FLATTEN [[msvc::flatten]]
-#else
-#define FLATTEN [[gnu::flatten]]
-#endif
-
 namespace Sqlite {
 
 class Database;
@@ -156,7 +150,7 @@ public:
     using BaseStatement::BaseStatement;
     StatementImplementation(StatementImplementation &&) = default;
 
-    FLATTEN void execute()
+    void execute()
     {
         Resetter resetter{this};
         BaseStatement::next();
@@ -172,7 +166,7 @@ public:
     }
 
     template<typename... ValueType>
-    FLATTEN void write(const ValueType &...values)
+    void write(const ValueType&... values)
     {
         Resetter resetter{this};
         bindValues(values...);
@@ -196,7 +190,7 @@ public:
              std::size_t capacity = 32,
              typename = std::enable_if_t<is_container<Container>::value>,
              typename... QueryTypes>
-    FLATTEN auto values(const QueryTypes &...queryValues)
+    auto values(const QueryTypes &...queryValues)
     {
         Resetter resetter{this};
         Container resultValues;
@@ -217,7 +211,7 @@ public:
              template<typename...> typename Container = std::vector,
              typename = std::enable_if_t<!is_container<ResultType>::value>,
              typename... QueryTypes>
-    FLATTEN auto values(const QueryTypes &...queryValues)
+    auto values(const QueryTypes &...queryValues)
     {
         return values<Container<ResultType>, capacity>(queryValues...);
     }
@@ -237,7 +231,7 @@ public:
     }
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto optionalValue(const QueryTypes &...queryValues)
+    auto optionalValue(const QueryTypes &...queryValues)
     {
         Resetter resetter{this};
         std::optional<ResultType> resultValue;
@@ -251,7 +245,7 @@ public:
     }
 
     template<typename Type>
-    FLATTEN static auto toValue(Utils::SmallStringView sqlStatement, Database &database)
+    static auto toValue(Utils::SmallStringView sqlStatement, Database &database)
     {
         StatementImplementation statement(sqlStatement, database);
 
@@ -263,7 +257,7 @@ public:
     }
 
     template<typename Callable, typename... QueryTypes>
-    FLATTEN void readCallback(Callable &&callable, const QueryTypes &...queryValues)
+    void readCallback(Callable &&callable, const QueryTypes &...queryValues)
     {
         Resetter resetter{this};
 
@@ -278,7 +272,7 @@ public:
     }
 
     template<typename Container, typename... QueryTypes>
-    FLATTEN void readTo(Container &container, const QueryTypes &...queryValues)
+    void readTo(Container &container, const QueryTypes &...queryValues)
     {
         Resetter resetter{this};
 
@@ -289,13 +283,13 @@ public:
     }
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto range(const QueryTypes &...queryValues)
+    auto range(const QueryTypes &...queryValues)
     {
         return SqliteResultRange<ResultType>{*this, queryValues...};
     }
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto rangeWithTransaction(const QueryTypes &...queryValues)
+    auto rangeWithTransaction(const QueryTypes &...queryValues)
     {
         return SqliteResultRangeWithTransaction<ResultType>{*this, queryValues...};
     }
diff --git a/src/libs/sqlite/sqlitereadstatement.h b/src/libs/sqlite/sqlitereadstatement.h
index eebce41780..4f8091598b 100644
--- a/src/libs/sqlite/sqlitereadstatement.h
+++ b/src/libs/sqlite/sqlitereadstatement.h
@@ -32,7 +32,7 @@ public:
     using Base::values;
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto valueWithTransaction(const QueryTypes &...queryValues)
+    auto valueWithTransaction(const QueryTypes &...queryValues)
     {
         return withDeferredTransaction(Base::database(), [&] {
             return Base::template value<ResultType>(queryValues...);
@@ -40,7 +40,7 @@ public:
     }
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto optionalValueWithTransaction(const QueryTypes &...queryValues)
+    auto optionalValueWithTransaction(const QueryTypes &...queryValues)
     {
         return withDeferredTransaction(Base::database(), [&] {
             return Base::template optionalValue<ResultType>(queryValues...);
@@ -48,7 +48,7 @@ public:
     }
 
     template<typename ResultType, std::size_t capacity = 32, typename... QueryTypes>
-    FLATTEN auto valuesWithTransaction(const QueryTypes &...queryValues)
+    auto valuesWithTransaction(const QueryTypes &...queryValues)
     {
         return withDeferredTransaction(Base::database(), [&] {
             return Base::template values<ResultType, capacity>(queryValues...);
@@ -56,7 +56,7 @@ public:
     }
 
     template<typename Callable, typename... QueryTypes>
-    FLATTEN void readCallbackWithTransaction(Callable &&callable, const QueryTypes &...queryValues)
+    void readCallbackWithTransaction(Callable &&callable, const QueryTypes &...queryValues)
     {
         withDeferredTransaction(Base::database(), [&] {
             Base::readCallback(std::forward<Callable>(callable), queryValues...);
@@ -64,7 +64,7 @@ public:
     }
 
     template<typename Container, typename... QueryTypes>
-    FLATTEN void readToWithTransaction(Container &container, const QueryTypes &...queryValues)
+    void readToWithTransaction(Container &container, const QueryTypes &...queryValues)
     {
         withDeferredTransaction(Base::database(), [&] { Base::readTo(container, queryValues...); });
     }
diff --git a/src/libs/sqlite/sqlitereadwritestatement.h b/src/libs/sqlite/sqlitereadwritestatement.h
index 8e3825cb52..2b3e6c3247 100644
--- a/src/libs/sqlite/sqlitereadwritestatement.h
+++ b/src/libs/sqlite/sqlitereadwritestatement.h
@@ -32,7 +32,7 @@ public:
     using Base::write;
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto valueWithTransaction(const QueryTypes &...queryValues)
+    auto valueWithTransaction(const QueryTypes &...queryValues)
     {
         return withImmediateTransaction(Base::database(), [&] {
             return Base::template value<ResultType>(queryValues...);
@@ -40,15 +40,17 @@ public:
     }
 
     template<typename ResultType, typename... QueryTypes>
-    FLATTEN auto optionalValueWithTransaction(const QueryTypes &...queryValues)
+    auto optionalValueWithTransaction(const QueryTypes &...queryValues)
     {
         return withImmediateTransaction(Base::database(), [&] {
             return Base::template optionalValue<ResultType>(queryValues...);
         });
     }
 
-    template<typename ResultType, std::size_t capacity = 32, typename... QueryTypes>
-    FLATTEN auto valuesWithTransaction(const QueryTypes &...queryValues)
+    template<typename ResultType,
+             std::size_t capacity = 32,
+             typename... QueryTypes>
+    auto valuesWithTransaction(const QueryTypes &...queryValues)
     {
         return withImmediateTransaction(Base::database(), [&] {
             return Base::template values<ResultType, capacity>(queryValues...);
@@ -56,7 +58,7 @@ public:
     }
 
     template<typename Callable, typename... QueryTypes>
-    FLATTEN void readCallbackWithTransaction(Callable &&callable, const QueryTypes &...queryValues)
+    void readCallbackWithTransaction(Callable &&callable, const QueryTypes &...queryValues)
     {
         withImmediateTransaction(Base::database(), [&] {
             Base::readCallback(std::forward<Callable>(callable), queryValues...);
@@ -64,14 +66,14 @@ public:
     }
 
     template<typename Container, typename... QueryTypes>
-    FLATTEN void readToWithTransaction(Container &container, const QueryTypes &...queryValues)
+    void readToWithTransaction(Container &container, const QueryTypes &...queryValues)
     {
         withImmediateTransaction(Base::database(), [&] {
             Base::readTo(container, queryValues...);
         });
     }
 
-    FLATTEN void executeWithTransaction()
+    void executeWithTransaction()
     {
         withImmediateTransaction(Base::database(), [&] {
             Base::execute();