diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2024-03-04 14:14:27 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-04 08:56:50 -0800 |
commit | 1ac098f00d1f6d9c7850429d37abcbb03b17cc41 (patch) | |
tree | 22cee8aa1a7e22470dd8fdac4e8c3d129b18ffbd /meta-oe/recipes-devtools | |
parent | 428f86671ab627db9b0f04bdf99dad1561536911 (diff) | |
download | meta-openembedded-1ac098f00d1f6d9c7850429d37abcbb03b17cc41.tar.gz |
nlohmann-json: Upgrade to 3.11.3
Remove two backported patches and the ptest output as below.
# ./run-ptest
PASS: test-algorithms_cpp11
PASS: test-allocator_cpp11
PASS: test-alt-string_cpp11
PASS: test-assert_macro_cpp11
PASS: test-binary_formats_cpp11
PASS: test-bjdata_cpp11
PASS: test-bson_cpp11
PASS: test-byte_container_with_subtype_cpp11
PASS: test-capacity_cpp11
PASS: test-cbor_cpp11
PASS: test-class_const_iterator_cpp11
PASS: test-class_iterator_cpp11
PASS: test-class_lexer_cpp11
PASS: test-class_parser_cpp11
PASS: test-comparison_cpp11
PASS: test-comparison_cpp20
PASS: test-comparison_legacy_cpp11
PASS: test-comparison_legacy_cpp20
PASS: test-concepts_cpp11
PASS: test-constructor1_cpp11
PASS: test-constructor2_cpp11
PASS: test-convenience_cpp11
PASS: test-conversions_cpp11
PASS: test-conversions_cpp17
PASS: test-custom-base-class_cpp11
[snip]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/nlohmann-json/files/0001-custom-allocators-define-missing-rebind-type-3895.patch | 61 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nlohmann-json/files/0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb (renamed from meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb) | 4 |
3 files changed, 1 insertions, 95 deletions
diff --git a/meta-oe/recipes-devtools/nlohmann-json/files/0001-custom-allocators-define-missing-rebind-type-3895.patch b/meta-oe/recipes-devtools/nlohmann-json/files/0001-custom-allocators-define-missing-rebind-type-3895.patch deleted file mode 100644 index d964586c1..000000000 --- a/meta-oe/recipes-devtools/nlohmann-json/files/0001-custom-allocators-define-missing-rebind-type-3895.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From 6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergei Trofimovich <slyich@gmail.com> | ||
3 | Date: Wed, 8 Mar 2023 11:31:56 +0000 | ||
4 | Subject: [PATCH] custom allocators: define missing 'rebind' type (#3895) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/nlohmann/json/commit/6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee] | ||
7 | |||
8 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
9 | --- | ||
10 | tests/src/unit-allocator.cpp | 9 +++++++++ | ||
11 | tests/src/unit-regression2.cpp | 9 +++++++++ | ||
12 | 2 files changed, 18 insertions(+) | ||
13 | |||
14 | diff --git a/tests/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp | ||
15 | index 76e3b03f..f2e63552 100644 | ||
16 | --- a/tests/src/unit-allocator.cpp | ||
17 | +++ b/tests/src/unit-allocator.cpp | ||
18 | @@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T> | ||
19 | { | ||
20 | using std::allocator<T>::allocator; | ||
21 | |||
22 | + bad_allocator() = default; | ||
23 | + template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { } | ||
24 | + | ||
25 | template<class... Args> | ||
26 | void construct(T* /*unused*/, Args&& ... /*unused*/) | ||
27 | { | ||
28 | throw std::bad_alloc(); | ||
29 | } | ||
30 | + | ||
31 | + template <class U> | ||
32 | + struct rebind | ||
33 | + { | ||
34 | + using other = bad_allocator<U>; | ||
35 | + }; | ||
36 | }; | ||
37 | } // namespace | ||
38 | |||
39 | diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp | ||
40 | index 2bb9b32e..dbafb436 100644 | ||
41 | --- a/tests/src/unit-regression2.cpp | ||
42 | +++ b/tests/src/unit-regression2.cpp | ||
43 | @@ -189,6 +189,15 @@ class my_allocator : public std::allocator<T> | ||
44 | { | ||
45 | public: | ||
46 | using std::allocator<T>::allocator; | ||
47 | + | ||
48 | + my_allocator() = default; | ||
49 | + template<class U> my_allocator(const my_allocator<U>& /*unused*/) { } | ||
50 | + | ||
51 | + template <class U> | ||
52 | + struct rebind | ||
53 | + { | ||
54 | + using other = my_allocator<U>; | ||
55 | + }; | ||
56 | }; | ||
57 | |||
58 | ///////////////////////////////////////////////////////////////////// | ||
59 | -- | ||
60 | 2.25.1 | ||
61 | |||
diff --git a/meta-oe/recipes-devtools/nlohmann-json/files/0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch b/meta-oe/recipes-devtools/nlohmann-json/files/0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch deleted file mode 100644 index 463912e4b..000000000 --- a/meta-oe/recipes-devtools/nlohmann-json/files/0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 660d0b58565073975d6f5d94365d6cbf150a4cf8 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> | ||
3 | Date: Sun, 5 Mar 2023 14:11:22 +0100 | ||
4 | Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range | ||
5 | comparisons (#3950) | ||
6 | |||
7 | Closes https://github.com/nlohmann/json/issues/3927 | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/nlohmann/json/commit/660d0b58565073975d6f5d94365d6cbf150a4cf8] | ||
10 | |||
11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
12 | --- | ||
13 | tests/src/unit-iterators2.cpp | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp | ||
17 | index 27926084..72a5d9dc 100644 | ||
18 | --- a/tests/src/unit-iterators2.cpp | ||
19 | +++ b/tests/src/unit-iterators2.cpp | ||
20 | @@ -943,7 +943,7 @@ TEST_CASE("iterators 2") | ||
21 | json j_expected{5, 4, 3, 2, 1}; | ||
22 | |||
23 | auto reversed = j | std::views::reverse; | ||
24 | - CHECK(reversed == j_expected); | ||
25 | + CHECK(std::ranges::equal(reversed, j_expected)); | ||
26 | } | ||
27 | |||
28 | SECTION("transform") | ||
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb index 350932388..194e80546 100644 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb | |||
@@ -8,12 +8,10 @@ CVE_PRODUCT = "json-for-modern-cpp" | |||
8 | 8 | ||
9 | SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \ | 9 | SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \ |
10 | git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \ | 10 | git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \ |
11 | file://0001-custom-allocators-define-missing-rebind-type-3895.patch \ | ||
12 | file://0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch \ | ||
13 | file://run-ptest \ | 11 | file://run-ptest \ |
14 | " | 12 | " |
15 | 13 | ||
16 | SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" | 14 | SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" |
17 | SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37" | 15 | SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37" |
18 | 16 | ||
19 | SRCREV_FORMAT .= "_json-test-data" | 17 | SRCREV_FORMAT .= "_json-test-data" |