diff options
author | Petr Vaněk <arkamar@atlas.cz> | 2022-08-17 12:08:52 +0200 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-08-27 12:38:25 +0100 |
commit | 2ad25f5aab3e13a207f6a242481da11ba9437471 (patch) | |
tree | a13c2ce4f3b305800591499b7fdadd3f5349f850 /dev-cpp/doctest/files | |
parent | net-libs/libbtbb: remove sourceforge upstream metadata (diff) | |
download | gentoo-2ad25f5aab3e13a207f6a242481da11ba9437471.tar.gz gentoo-2ad25f5aab3e13a207f6a242481da11ba9437471.tar.bz2 gentoo-2ad25f5aab3e13a207f6a242481da11ba9437471.zip |
dev-cpp/doctest: drop 2.4.6, 2.4.8-r1
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/26896
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-cpp/doctest/files')
-rw-r--r-- | dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch | 23 | ||||
-rw-r--r-- | dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch | 56 |
2 files changed, 0 insertions, 79 deletions
diff --git a/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch b/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch deleted file mode 100644 index 69efd40e6a42..000000000000 --- a/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch +++ /dev/null @@ -1,23 +0,0 @@ -This patch follows proposed fixes to upstream. - -PR-1: https://github.com/onqtam/doctest/pull/505 -PR-2: https://github.com/onqtam/doctest/pull/520 - - -diff --git a/examples/all_features/stringification.cpp b/examples/all_features/stringification.cpp -index a8b5d5b..492e1ec 100644 ---- a/examples/all_features/stringification.cpp -+++ b/examples/all_features/stringification.cpp -@@ -103,9 +103,6 @@ TEST_CASE("all asserts should fail and show how the objects get stringified") { - MyTypeInherited<int> bla1; - bla1.one = 5; - bla1.two = 4u; -- MyTypeInherited<int> bla2; -- bla2.one = 5; -- bla2.two = 6u; - - Bar::Foo f1; - Bar::Foo f2; --- -2.32.0 - 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 deleted file mode 100644 index 1a0343282685..000000000000 --- a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 - |