From: Khem Raj Date: Wed, 14 May 2025 21:42:27 +0000 (-0700) Subject: babeltrace2: Update patch to upstreamed version of patch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=916dceb531d4bf5a852864af30913c972ea31cf0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git babeltrace2: Update patch to upstreamed version of patch Update to the version of patch that landed upstream Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- 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 d923437a2ab..4dffa7bfa5b 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 @@ -From 1b514ab2e878216426acc493eeab96088576faf9 Mon Sep 17 00:00:00 2001 +From a73cef80a0d4129f74ab2e160a15693235aad4d1 Mon Sep 17 00:00:00 2001 From: Khem Raj 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( ) -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 --- 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::data(this->libObjPtr()), this->length()}; - } +@@ -1136,7 +1136,7 @@ public: -- std::uint64_t length() const noexcept -+ std::size_t length() const noexcept + bt2s::span::Data> data() const noexcept { - return bt_field_blob_get_length(this->libObjPtr()); +- return {internal::CommonBlobFieldSpec::data(this->libObjPtr()), this->length()}; ++ return {internal::CommonBlobFieldSpec::data(this->libObjPtr()), static_cast(this->length())}; } + + std::uint64_t length() const noexcept