Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9132f167 authored by Erwin Jansen's avatar Erwin Jansen Committed by Myles Watson
Browse files

Alias iterator in packet-gen 

The msvc compiler is unable to translate some of the generated code:

error: no viable conversion from 'std::array<uint8_t, 248>::iterator'
(aka '_Array_iterator<unsigned char, 248ULL>') to 'uint8_t *' (aka
'unsigned char *')

Instead of assigning the value to a ptr, we alias the iterator instead.

Test: atest bluetooth_test_gd
Tag: #gd-refactor
Bug: 182505215
Change-Id: I389b26d71ef5bd8f96ae819d34ce11590f14a5e6
parent a85402a1

system/gd/packet/parser/fields/array_field.cc

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void ArrayField::GenExtractor(std::ostream& s, int num_leading_bits, bool for_st 
  if (element_field_->BuilderParameterMustBeMoved()) {

    s << element_field_->GetDataType() << " " << element_field_->GetName() << "_ptr;";

  } else {

    s << element_field_->GetDataType() << "* " << element_field_->GetName() << "_ptr = ret_it;";

    s << "auto " << element_field_->GetName() << "_ptr = ret_it;";

  }

  element_field_->GenExtractor(s, num_leading_bits, for_struct);

  if (element_field_->BuilderParameterMustBeMoved()) {