git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 1b514ab2e878216426acc493eeab96088576faf9 Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Thu, 20 Mar 2025 18:10:08 -0700
   4 Subject: [PATCH] Make bt_field_blob_get_length return size_t instead of
   5  uint64_t
   6
   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]
   9 |  1139 |         return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
  10 |       |                                                                                  ^~~~~~~~~~~~~~
  11 | ../../git/src/plugins/ctf/common/src/msg-iter.cpp:744:56: note: in instantiation of member function 'bt2::CommonBlobField<bt_field>::data' requested here
  12 |   744 |     std::memcpy(&this->_stackTopCurSubField().asBlob().data()[_mCurBlobFieldDataOffset],
  13 |       |                                                        ^
  14 | ../../git/src/cpp-common/bt2/field.hpp:1139:82: note: insert an explicit cast to silence this issue
  15 |  1139 |         return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
  16 |       |                                                                                  ^~~~~~~~~~~~~~
  17 |       |                                                                                  static_cast<size_type>( )
  18
  19 Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/120]
  20 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  21 ---
  22  src/cpp-common/bt2/field.hpp | 2 +-
  23  1 file changed, 1 insertion(+), 1 deletion(-)
  24
  25 diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp
  26 index 8b291f7a1..cbfff84f0 100644
  27 --- a/src/cpp-common/bt2/field.hpp
  28 +++ b/src/cpp-common/bt2/field.hpp
  29 @@ -1139,7 +1139,7 @@ public:
  30          return {internal::CommonBlobFieldSpec<LibObjT>::data(this->libObjPtr()), this->length()};
  31      }
  32
  33 -    std::uint64_t length() const noexcept
  34 +    std::size_t length() const noexcept
  35      {
  36          return bt_field_blob_get_length(this->libObjPtr());
  37      }