[patch] qt-creator-14.0.0-clang-19.patch

qt-creator-clang-19.patch (text/plain), 2.18 KB, created by Alfred Wingate on 2024-08-09 01:43:49 UTC

https://bugs.gentoo.org/937600

Clang-19 implemented __cpp_template_template_args in C++17 breaks qt-creators old workaround for it lacking.

https://github.com/llvm/llvm-project/pull/89807
https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1

https://github.com/ThePhD/sol2/issues/1617
https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f

diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index f173f9844a5..42b77d60e8a 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -258,7 +258,7 @@ template<template<typename> class C, // result container type
          typename Result = std::decay_t<std::invoke_result_t<F, Value&>>,
          typename ResultContainer = C<Result>>
 Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
-#ifdef Q_CC_CLANG
+#ifndef __cpp_template_template_args
 // "Matching of template template-arguments excludes compatible templates"
 // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0)
 // in C++17 makes the above match e.g. C=std::vector even though that takes two
@@ -833,7 +833,7 @@ Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function)
     return transform<ResultContainer>(std::forward<SC>(container), function);
 }
 
-#ifdef Q_CC_CLANG
+#ifndef __cpp_template_template_args
 template<template<typename, typename> class C, // result container type
          typename SC,                          // input container type
          typename F,                           // function type
diff --git a/src/libs/3rdparty/sol2/include/sol/optional_implementation.hpp b/src/libs/3rdparty/sol2/include/sol/optional_implementation.hpp
index 26f41d0c..e22226d6 100644
--- a/src/libs/3rdparty/sol2/include/sol/sol.hpp
+++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp
@@ -2191,7 +2191,8 @@ namespace sol {
 			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
 
 			*this = nullopt;
-			this->construct(std::forward<Args>(args)...);
+			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
+			return **this;
 		}
 
 		/// Swaps this optional with the other.