diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-05-14 14:42:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-19 17:35:42 +0100 |
commit | 77a5a1cc12d71f6483f0cde48a3911e1b150edda (patch) | |
tree | 839704635f857f208a718a90cb8711b1f0e8a404 | |
parent | 63b208437462367309e00499c422e7e522db85c4 (diff) | |
download | poky-77a5a1cc12d71f6483f0cde48a3911e1b150edda.tar.gz |
babeltrace2: Update patch to upstreamed version of patch
Update to the version of patch that landed upstream
(From OE-Core rev: 916dceb531d4bf5a852864af30913c972ea31cf0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch index d923437a2a..4dffa7bfa5 100644 --- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 1b514ab2e878216426acc493eeab96088576faf9 Mon Sep 17 00:00:00 2001 | 1 | From a73cef80a0d4129f74ab2e160a15693235aad4d1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 20 Mar 2025 18:10:08 -0700 | 3 | Date: Thu, 20 Mar 2025 18:10:08 -0700 |
4 | Subject: [PATCH] Make bt_field_blob_get_length return size_t instead of | 4 | Subject: [PATCH] Cast result of bt_field_blob_get_length to size_t in |
5 | uint64_t | 5 | constructor of bt2s::span |
6 | 6 | ||
7 | Fixes errors e.g. | 7 | Fixes errors e.g. |
8 | | ../../git/src/cpp-common/bt2/field.hpp:1139:82: error: non-constant-expression cannot be narrowed from type 'std::uint64_t' (aka 'unsigned long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] | 8 | | ../../git/src/cpp-common/bt2/field.hpp:1139:82: error: non-constant-expression cannot be narrowed from type 'std::uint64_t' (aka 'unsigned long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] |
@@ -16,22 +16,23 @@ Fixes errors e.g. | |||
16 | | | ^~~~~~~~~~~~~~ | 16 | | | ^~~~~~~~~~~~~~ |
17 | | | static_cast<size_type>( ) | 17 | | | static_cast<size_type>( ) |
18 | 18 | ||
19 | Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/120] | 19 | Upstream-Status: Backport [https://github.com/efficios/babeltrace/commit/1e6b34e411c61135ad256047a985a9bad927eae0] |
20 | |||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
21 | --- | 22 | --- |
22 | src/cpp-common/bt2/field.hpp | 2 +- | 23 | src/cpp-common/bt2/field.hpp | 2 +- |
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 25 | ||
25 | diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp | 26 | diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp |
26 | index 8b291f7a1..cbfff84f0 100644 | 27 | index 8b291f7a..3a7d30a4 100644 |
27 | --- a/src/cpp-common/bt2/field.hpp | 28 | --- a/src/cpp-common/bt2/field.hpp |
28 | +++ b/src/cpp-common/bt2/field.hpp | 29 | +++ b/src/cpp-common/bt2/field.hpp |
29 | @@ -1139,7 +1139,7 @@ public: | 30 | @@ -1136,7 +1136,7 @@ public: |
30 | return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()}; | ||
31 | } | ||
32 | 31 | ||
33 | - std::uint64_t length() const noexcept | 32 | bt2s::span<typename internal::CommonBlobFieldSpec<LibObjT>::Data> data() const noexcept |
34 | + std::size_t length() const noexcept | ||
35 | { | 33 | { |
36 | return bt_field_blob_get_length(this->libObjPtr()); | 34 | - return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()}; |
35 | + return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), static_cast<std::size_t>(this->length())}; | ||
37 | } | 36 | } |
37 | |||
38 | std::uint64_t length() const noexcept | ||