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

Commit 57f63ae0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: Build fixes for clang-14" am: 61fa5839 am: a5d7d20e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2215182



Change-Id: I2f675007025c519334e561ab826f1a27a2ba3556
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 904d2ad2 a5d7d20e

system/bta/include/bta_groups.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#pragma once

#include <list>

#include <vector>



#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/gd/packet/iterator.h

+15 −1
Original line number Diff line number Diff line
@@ -27,9 +27,23 @@ 
namespace bluetooth {

namespace packet {



// std::iterator is deprecated in C++17 onwards. Instead, you must declare all

// 5 aliases that the iterator needs for the std library.

#if __cplusplus >= 201703L

struct IteratorTraits {

  using iterator_category = std::random_access_iterator_tag;

  using value_type = uint8_t;

  using difference_type = std::ptrdiff_t;

  using pointer = uint8_t*;

  using reference = uint8_t&;

};

#else

struct IteratorTraits : public std::iterator<std::random_access_iterator_tag, uint8_t> {};

#endif



// Templated Iterator for endianness

template <bool little_endian>

class Iterator : public std::iterator<std::random_access_iterator_tag, uint8_t> {

class Iterator : public IteratorTraits {

 public:

  Iterator(const std::forward_list<View>& data, size_t offset);

  Iterator(const Iterator& itr) = default;

system/gd/packet/parser/main.cc

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
 */



#include <unistd.h>



#include <cerrno>

#include <cstdio>

#include <cstring>

#include <filesystem>

#include <fstream>

#include <iomanip>
@@ -27,10 +29,8 @@ 
#include <vector>



#include "declarations.h"

#include "struct_parser_generator.h"



#include "language_y.h"



#include "struct_parser_generator.h"



int yylex_init(void**);

int yylex_destroy(void*);

system/internal_include/bt_trace.h

+1 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...); 


#ifdef __cplusplus



#include <array>

#include <iomanip>

#include <sstream>

#include <type_traits>

system/packet/base/iterator.h

+16 −2
Original line number Diff line number Diff line
@@ -24,9 +24,23 @@ namespace bluetooth { 
// Forward declare Packet class

class Packet;



// std::iterator is deprecated in C++17 onwards. Instead, you must declare all

// 5 aliases that the iterator needs for the std library.

#if __cplusplus >= 201703L

struct IteratorTraits {

  using iterator_category = std::random_access_iterator_tag;

  using value_type = uint8_t;

  using difference_type = std::ptrdiff_t;

  using pointer = uint8_t*;

  using reference = uint8_t&;

};

#else

struct IteratorTraits

    : public std::iterator<std::random_access_iterator_tag, uint8_t> {};

#endif



// Iterator is a custom iterator class for Packets.

class Iterator

    : public std::iterator<std::random_access_iterator_tag, uint8_t> {

class Iterator : public IteratorTraits {

 public:

  Iterator(std::shared_ptr<const Packet> packet, size_t i);

  Iterator(const Iterator& itr);