CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nlohmann-json: Upgrade to 3.11.3

Browse Source 
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>
This commit is contained in:
Mingli Yu 2024-03-04 14:14:27 +08:00 committed by Khem Raj
parent 428f86671a
commit 1ac098f00d
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 1 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
meta-oe/recipes-devtools/nlohmann-json/files/0001-custom-allocators-define-missing-rebind-type-3895.patch
View File

@ -1,61 +0,0 @@
From 6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 8 Mar 2023 11:31:56 +0000
Subject: [PATCH] custom allocators: define missing 'rebind' type (#3895)
Upstream-Status: Backport [https://github.com/nlohmann/json/commit/6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
tests/src/unit-allocator.cpp | 9 +++++++++
tests/src/unit-regression2.cpp | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/tests/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp
index 76e3b03f..f2e63552 100644
--- 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
diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp
index 2bb9b32e..dbafb436 100644
--- a/tests/src/unit-regression2.cpp
+++ b/tests/src/unit-regression2.cpp
@@ -189,6 +189,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>;
+ };
};
/////////////////////////////////////////////////////////////////////
--
2.25.1

31
meta-oe/recipes-devtools/nlohmann-json/files/0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch
View File

@ -1,31 +0,0 @@
From 660d0b58565073975d6f5d94365d6cbf150a4cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 5 Mar 2023 14:11:22 +0100
Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range
comparisons (#3950)
Closes https://github.com/nlohmann/json/issues/3927
Upstream-Status: Backport [https://github.com/nlohmann/json/commit/660d0b58565073975d6f5d94365d6cbf150a4cf8]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
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.25.1

4
meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb → meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
View File

@ -8,12 +8,10 @@ CVE_PRODUCT = "json-for-modern-cpp"
SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
file://0001-custom-allocators-define-missing-rebind-type-3895.patch \
file://0001-tests-unit-iterators2-use-std-ranges-equals-for-rang.patch \
file://run-ptest \
"
SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
SRCREV_FORMAT .= "_json-test-data"