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

Commit 01c104cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Compiler fixes for Msvc & Gcc"

parents d8e616de 4463a663

system/vendor_libs/test_vendor_lib/desktop/test_environment.cc

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ using test_vendor_lib::AsyncTaskId; 
using test_vendor_lib::TaskCallback;



void TestEnvironment::initialize(std::promise<void> barrier) {

  LOG_INFO();

  LOG_INFO("Initialized barrier");



  barrier_ = std::move(barrier);

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.cc

+4 −4
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ void LinkLayerController::IncomingDisconnectPacket( 


void LinkLayerController::IncomingEncryptConnection(

    model::packets::LinkLayerPacketView incoming) {

  LOG_INFO();

  LOG_INFO("IncomingEncryptConnection");



  // TODO: Check keys

  Address peer = incoming.GetSourceAddress();
@@ -630,7 +630,7 @@ void LinkLayerController::IncomingEncryptConnection( 


void LinkLayerController::IncomingEncryptConnectionResponse(

    model::packets::LinkLayerPacketView incoming) {

  LOG_INFO();

  LOG_INFO("IncomingEncryptConnectionResponse");

  // TODO: Check keys

  uint16_t handle =

      connections_.GetHandleOnlyAddress(incoming.GetSourceAddress());
@@ -1353,7 +1353,7 @@ void LinkLayerController::IncomingLeConnectCompletePacket( 


void LinkLayerController::IncomingLeEncryptConnection(

    model::packets::LinkLayerPacketView incoming) {

  LOG_INFO();

  LOG_INFO("IncomingLeEncryptConnection");



  Address peer = incoming.GetSourceAddress();

  uint16_t handle = connections_.GetHandleOnlyAddress(peer);
@@ -1376,7 +1376,7 @@ void LinkLayerController::IncomingLeEncryptConnection( 


void LinkLayerController::IncomingLeEncryptConnectionResponse(

    model::packets::LinkLayerPacketView incoming) {

  LOG_INFO();

  LOG_INFO("IncomingLeEncryptConnectionResponse");

  // TODO: Check keys

  uint16_t handle =

      connections_.GetHandleOnlyAddress(incoming.GetSourceAddress());

system/vendor_libs/test_vendor_lib/model/setup/test_channel_transport.cc

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <stddef.h>  // for size_t



#include <cstdint>      // for uint8_t

#include <cstring>      // for strerror

#include <type_traits>  // for remove_extent_t



#include "net/async_data_channel.h"  // for AsyncDataChannel

system/vendor_libs/test_vendor_lib/test/h4_parser_unittest.cc

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ TEST_F(H4ParserTest, RejectNoData) { 
TEST_F(H4ParserTest, TooMuchIsDeath) {

  PacketData bad_bit({0xfd});

  ASSERT_DEATH(parser_.Consume(bad_bit.data(), parser_.BytesRequested() + 1),

               "More bytes read (.*) than expected (.*)!");

               "More bytes read .* than expected .*!");

}



TEST_F(H4ParserTest, WrongTypeIsDeath) {

system/vendor_libs/test_vendor_lib/types/bluetooth/uuid.cc

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "uuid.h"



#include <algorithm>

#include <cstring>

#include <random>



namespace bluetooth {