diff options
Diffstat (limited to 'dev-cpp/nlohmann_json/files')
| -rw-r--r-- | dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch | 42 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch | 76 |
2 files changed, 0 insertions, 118 deletions
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch deleted file mode 100644 index a2931880dbcd..000000000000 --- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a49829bd984c0282be18fcec070df0c31bf77dd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org> -Date: Tue, 21 Feb 2023 12:59:21 +0100 -Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range - comparisons -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a build error on GCC 13: - - /home/arsen/nlohmann_json/tests/src/unit-iterators2.cpp: In function ‘void _DOCTEST_ANON_FUNC_2()’: - /home/arsen/nlohmann_json/tests/src/unit-iterators2.cpp:946:32: error: no match for ‘operator==’ (operand types are ‘doctest::detail::Expression_lhs<std::ranges::reverse_view<std::ranges::ref_view<nlohmann::json_abi_v3_11_2::basic_json<> > >&>’ and ‘nlohmann::json_abi_v3_11_2::json’ {aka ‘nlohmann::json_abi_v3_11_2::basic_json<>’}) - 946 | CHECK(reversed == j_expected); - | ^~ ~~~~~~~~~~ - | | - | nlohmann::json_abi_v3_11_2::json {aka nlohmann::json_abi_v3_11_2::basic_json<>} - -Bug: https://bugs.gentoo.org/895692 -Closes: #3927 ---- -Forwarded: https://github.com/nlohmann/json/pull/3950 - - tests/src/unit-iterators2.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp -index 27926084..72a5d9dc 100644 ---- a/tests/src/unit-iterators2.cpp -+++ b/tests/src/unit-iterators2.cpp -@@ -943,7 +943,7 @@ TEST_CASE("iterators 2") - json j_expected{5, 4, 3, 2, 1}; - - auto reversed = j | std::views::reverse; -- CHECK(reversed == j_expected); -+ CHECK(std::ranges::equal(reversed, j_expected)); - } - - SECTION("transform") --- -2.39.2 - diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch deleted file mode 100644 index 5205e67a3c2c..000000000000 --- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/nlohmann/json/issues/3927 -https://github.com/nlohmann/json/pull/3895 - -From a5b09d50b786638ed9deb09ef13860a3cb64eb6b Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Tue, 20 Dec 2022 22:08:12 +0000 -Subject: [PATCH] custom allocators: define missing 'rebind' type - -`gcc-13` added an assert to standard headers to make sure custom -allocators have intended implementation of rebind type instead -of inherited rebind. gcc change: - https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 - -Without the fix build fails on this week's `gcc-13` as: - - In file included from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/string:54, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/locale:41, - from tests/src/unit-regression2.cpp:19: - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<my_allocator<unsigned char>, unsigned char, void>': - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = my_allocator<unsigned char>; _Up = unsigned char]' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = my_allocator<unsigned char>]' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<my_allocator<unsigned char>, unsigned char>::rebind<unsigned char>' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<unsigned char, my_allocator<unsigned char> >' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector<unsigned char, my_allocator<unsigned char> >' - tests/src/unit-regression2.cpp:807:63: required from here - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A - 70 | _Tp>::value, - | ^~~~~ - -The change adds trivial `rebind` definition with expected return type -and satisfies conversion requirements. ---- a/tests/src/unit-allocator.cpp -+++ b/tests/src/unit-allocator.cpp -@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T> - { - using std::allocator<T>::allocator; - -+ bad_allocator() = default; -+ template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { } -+ - template<class... Args> - void construct(T* /*unused*/, Args&& ... /*unused*/) - { - throw std::bad_alloc(); - } -+ -+ template <class U> -+ struct rebind -+ { -+ using other = bad_allocator<U>; -+ }; - }; - } // namespace - ---- a/tests/src/unit-regression2.cpp -+++ b/tests/src/unit-regression2.cpp -@@ -187,6 +187,15 @@ class my_allocator : public std::allocator<T> - { - public: - using std::allocator<T>::allocator; -+ -+ my_allocator() = default; -+ template<class U> my_allocator(const my_allocator<U>& /*unused*/) { } -+ -+ template <class U> -+ struct rebind -+ { -+ using other = my_allocator<U>; -+ }; - }; - - ///////////////////////////////////////////////////////////////////// - |