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

Commit 584e4472 authored by Xuan Xing's avatar Xuan Xing Committed by Automerger Merge Worker
Browse files

Explicitly return a const reference in mocks am: 934ef60b am: 5eb1d8ae am:... 

Explicitly return a const reference in mocks am: 934ef60b am: 5eb1d8ae am: 032dbf1c am: 056732d6

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



Change-Id: I3b86c2c4cb6ee4a76cc4f4fb4de7b9c18db8aa96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11a31065 056732d6

system/test/mock/mock_stack_btm_ble.h

+9 −3
Original line number Diff line number Diff line
@@ -225,7 +225,9 @@ extern struct BTM_BleVerifySignature BTM_BleVerifySignature; 
// Return: const Octet16&

struct BTM_GetDeviceDHK {

  static const Octet16 return_value;

  std::function<const Octet16&()> body{[]() { return return_value; }};

  std::function<const Octet16&()> body{

      // Explicit return type is needed otherwise it returns copy of object

      []() -> const Octet16& { return return_value; }};

  const Octet16& operator()() { return body(); };

};

extern struct BTM_GetDeviceDHK BTM_GetDeviceDHK;
@@ -235,7 +237,9 @@ extern struct BTM_GetDeviceDHK BTM_GetDeviceDHK; 
// Return: const Octet16&

struct BTM_GetDeviceEncRoot {

  static const Octet16 return_value;

  std::function<const Octet16&()> body{[]() { return return_value; }};

  std::function<const Octet16&()> body{

      // Explicit return type is needed otherwise it returns copy of object

      []() -> const Octet16& { return return_value; }};

  const Octet16& operator()() { return body(); };

};

extern struct BTM_GetDeviceEncRoot BTM_GetDeviceEncRoot;
@@ -245,7 +249,9 @@ extern struct BTM_GetDeviceEncRoot BTM_GetDeviceEncRoot; 
// Return: const Octet16&

struct BTM_GetDeviceIDRoot {

  static const Octet16 return_value;

  std::function<const Octet16&()> body{[]() { return return_value; }};

  std::function<const Octet16&()> body{

      // Explicit return type is needed otherwise it returns copy of object

      []() -> const Octet16& { return return_value; }};

  const Octet16& operator()() { return body(); };

};

extern struct BTM_GetDeviceIDRoot BTM_GetDeviceIDRoot;