diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-cpp/doctest/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-cpp/doctest/files')
| -rw-r--r-- | dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch new file mode 100644 index 000000000000..1a0343282685 --- /dev/null +++ b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch @@ -0,0 +1,56 @@ +This patch is derived from upstream commit ce13bc44b99c ("Fix move-only +types failing to decompose correctly (#634)"). + +Upstream-PR: https://github.com/doctest/doctest/pull/634 + +diff --git a/doctest/doctest.h b/doctest/doctest.h +index d25f526..31096ff 100644 +--- a/doctest/doctest.h ++++ b/doctest/doctest.h +@@ -1320,7 +1320,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") + assertType::Enum m_at; + + explicit Expression_lhs(L&& in, assertType::Enum at) +- : lhs(doctest::detail::forward<L>(in)) ++ : lhs(static_cast<L&&>(in)) + , m_at(at) {} + + DOCTEST_NOINLINE operator Result() { +@@ -1394,8 +1394,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP + // https://github.com/catchorg/Catch2/issues/870 + // https://github.com/catchorg/Catch2/issues/565 + template <typename L> +- Expression_lhs<const L> operator<<(const L &&operand) { +- return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at); ++ Expression_lhs<L> operator<<(L&& operand) { ++ return Expression_lhs<L>(static_cast<L&&>(operand), m_at); + } + + template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr> +diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h +index b0d786f..ff9fed0 100644 +--- a/doctest/parts/doctest_fwd.h ++++ b/doctest/parts/doctest_fwd.h +@@ -1317,7 +1317,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") + assertType::Enum m_at; + + explicit Expression_lhs(L&& in, assertType::Enum at) +- : lhs(doctest::detail::forward<L>(in)) ++ : lhs(static_cast<L&&>(in)) + , m_at(at) {} + + DOCTEST_NOINLINE operator Result() { +@@ -1391,8 +1391,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP + // https://github.com/catchorg/Catch2/issues/870 + // https://github.com/catchorg/Catch2/issues/565 + template <typename L> +- Expression_lhs<const L> operator<<(const L &&operand) { +- return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at); ++ Expression_lhs<L> operator<<(L&& operand) { ++ return Expression_lhs<L>(static_cast<L&&>(operand), m_at); + } + + template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr> +-- +2.35.1 + |