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

Commit 01fc0b7f authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress libs/vr google-explicit-constructor warnings" am: dc23aff2 am: faec550a 

am: 2521ef08

Change-Id: I5641a5974159770baef5bbf7a489bbf816f97ca7
parents b9182b15 2521ef08

libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -131,8 +131,8 @@ class BufferHubQueue : public pdx::Client { 
  bool hung_up() const { return hung_up_; }

  bool hung_up() const { return hung_up_; }





 protected:

 protected:

  BufferHubQueue(pdx::LocalChannelHandle channel);

  explicit BufferHubQueue(pdx::LocalChannelHandle channel);

  BufferHubQueue(const std::string& endpoint_path);

  explicit BufferHubQueue(const std::string& endpoint_path);





  // Imports the queue parameters by querying BufferHub for the parameters for

  // Imports the queue parameters by querying BufferHub for the parameters for

  // this channel.

  // this channel.
@@ -458,7 +458,7 @@ class ConsumerQueue : public BufferHubQueue { 
 private:

 private:

  friend BufferHubQueue;

  friend BufferHubQueue;





  ConsumerQueue(pdx::LocalChannelHandle handle);

  explicit ConsumerQueue(pdx::LocalChannelHandle handle);





  // Add a consumer buffer to populate the queue. Once added, a consumer buffer

  // Add a consumer buffer to populate the queue. Once added, a consumer buffer

  // is NOT available to use until the producer side |Post| it. |WaitForBuffers|

  // is NOT available to use until the producer side |Post| it. |WaitForBuffers|

libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_parcelable.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ class BufferHubQueueParcelable : public Parcelable { 
  }

  }





  // Constructs an parcelable contains the channel parcelable.

  // Constructs an parcelable contains the channel parcelable.

  BufferHubQueueParcelable(

  explicit BufferHubQueueParcelable(

      std::unique_ptr<pdx::ChannelParcelable> channel_parcelable)

      std::unique_ptr<pdx::ChannelParcelable> channel_parcelable)

      : channel_parcelable_(std::move(channel_parcelable)) {}

      : channel_parcelable_(std::move(channel_parcelable)) {}

libs/vr/libdisplay/include/private/dvr/display_protocol.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,11 +60,13 @@ class Flags { 
  using Base = Flags<Integer>;

  using Base = Flags<Integer>;

  using Type = Integer;

  using Type = Integer;





  // NOLINTNEXTLINE(google-explicit-constructor)

  Flags(const Integer& value) : value_{value} {}

  Flags(const Integer& value) : value_{value} {}

  Flags(const Flags&) = default;

  Flags(const Flags&) = default;

  Flags& operator=(const Flags&) = default;

  Flags& operator=(const Flags&) = default;





  Integer value() const { return value_; }

  Integer value() const { return value_; }

  // NOLINTNEXTLINE(google-explicit-constructor)

  operator Integer() const { return value_; }

  operator Integer() const { return value_; }





  bool IsSet(Integer bits) const { return (value_ & bits) == bits; }

  bool IsSet(Integer bits) const { return (value_ & bits) == bits; }

libs/vr/libpdx/private/pdx/channel_handle.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ class ChannelManagerInterface { 
class ChannelHandleBase {

class ChannelHandleBase {

 public:

 public:

  ChannelHandleBase() = default;

  ChannelHandleBase() = default;

  ChannelHandleBase(const int32_t& value) : value_{value} {}

  explicit ChannelHandleBase(const int32_t& value) : value_{value} {}





  ChannelHandleBase(const ChannelHandleBase&) = delete;

  ChannelHandleBase(const ChannelHandleBase&) = delete;

  ChannelHandleBase& operator=(const ChannelHandleBase&) = delete;

  ChannelHandleBase& operator=(const ChannelHandleBase&) = delete;

libs/vr/libpdx/private/pdx/client.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -206,7 +206,7 @@ class ClientBase : public ParentClient { 
class Transaction final : public OutputResourceMapper,

class Transaction final : public OutputResourceMapper,

                          public InputResourceMapper {

                          public InputResourceMapper {

 public:

 public:

  Transaction(Client& client);

  explicit Transaction(Client& client);

  ~Transaction();

  ~Transaction();





  template <typename T>

  template <typename T>