MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

babeltrace2: Update patch to upstreamed version of patch

Browse Source 
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>
This commit is contained in:
Khem Raj 2025-05-14 14:42:27 -07:00 committed by Richard Purdie
parent 63b2084374
commit 77a5a1cc12
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/recipes-kernel/lttng/babeltrace2/0001-Make-bt_field_blob_get_length-return-size_t-instead-.patch
View File

@ -1,8 +1,8 @@
From 1b514ab2e878216426acc493eeab96088576faf9 Mon Sep 17 00:00:00 2001
From a73cef80a0d4129f74ab2e160a15693235aad4d1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Mar 2025 18:10:08 -0700
Subject: [PATCH] Make bt_field_blob_get_length return size_t instead of
uint64_t
Subject: [PATCH] Cast result of bt_field_blob_get_length to size_t in
constructor of bt2s::span
Fixes errors e.g.
| ../../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.
| | ^~~~~~~~~~~~~~
| | static_cast<size_type>( )
Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/120]
Upstream-Status: Backport [https://github.com/efficios/babeltrace/commit/1e6b34e411c61135ad256047a985a9bad927eae0]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/cpp-common/bt2/field.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp
index 8b291f7a1..cbfff84f0 100644
index 8b291f7a..3a7d30a4 100644
--- a/src/cpp-common/bt2/field.hpp
+++ b/src/cpp-common/bt2/field.hpp
@@ -1139,7 +1139,7 @@ public:
return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
@@ -1136,7 +1136,7 @@ public:
bt2s::span<typename internal::CommonBlobFieldSpec<LibObjT>::Data> data() const noexcept
{
- return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
+ return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), static_cast<std::size_t>(this->length())};
}
- std::uint64_t length() const noexcept
+ std::size_t length() const noexcept
{
return bt_field_blob_get_length(this->libObjPtr());
}
std::uint64_t length() const noexcept