summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-07-21 17:57:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-07-21 21:30:56 +0200
commit826edb304b2c429be534d85fb8244be767ea67cf (patch)
tree450d4bdb7ab7521168b31245ea43c6666c9185bc /external
parent3cbb5180a1e0e6643eb682c9a6b30057353dc5e3 (diff)
external/skia: Fix previous std::result_of_t -> std::invoke_result_t change
...84c412cb8392d306ab87fc06855677612f9938a6 "external/skia: Deprecated std::result_of_t has been removed from C++20" Change-Id: I7d14306039dbcdbc9509471402299d8cbb9e48c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99168 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/skia/c++20.patch.04
1 files changed, 2 insertions, 2 deletions
diff --git a/external/skia/c++20.patch.0 b/external/skia/c++20.patch.0
index 71b384fcc2da..34edcb065735 100644
--- a/external/skia/c++20.patch.0
+++ b/external/skia/c++20.patch.0
@@ -5,13 +5,13 @@
template<typename C, std::size_t... Is>
constexpr auto SkMakeArrayFromIndexSequence(C c, std::index_sequence<Is...>)
--> std::array<std::result_of_t<C(std::size_t)>, sizeof...(Is)> {
-+-> std::array<std::invoke_result_t<C(std::size_t)>, sizeof...(Is)> {
++-> std::array<std::invoke_result_t<C, std::size_t>, sizeof...(Is)> {
return {{ c(Is)... }};
}
template<size_t N, typename C> constexpr auto SkMakeArray(C c)
--> std::array<std::result_of_t<C(std::size_t)>, N> {
-+-> std::array<std::invoke_result_t<C(std::size_t)>, N> {
++-> std::array<std::invoke_result_t<C, std::size_t>, N> {
return SkMakeArrayFromIndexSequence(c, std::make_index_sequence<N>{});
}