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

Commit 7a03f2e5 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Add noexcept to move constructors and assignment operators." am: a45f6e6c am: d9f469b0 

am: 11bc273c

Change-Id: Id02b5052bb0d20367fad5c9b75b6eba934223787
parents 4be77b7b 11bc273c

libs/gui/FrameTimestamps.cpp

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ status_t FrameEventsDelta::unflatten(void const*& buffer, size_t& size, 
// ============================================================================



FrameEventHistoryDelta& FrameEventHistoryDelta::operator=(

        FrameEventHistoryDelta&& src) {

        FrameEventHistoryDelta&& src) noexcept {

    mCompositorTiming = src.mCompositorTiming;



    if (CC_UNLIKELY(!mDeltas.empty())) {

libs/gui/include/gui/FrameTimestamps.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public: 


    // Movable.

    FrameEventHistoryDelta(FrameEventHistoryDelta&& src) = default;

    FrameEventHistoryDelta& operator=(FrameEventHistoryDelta&& src);

    FrameEventHistoryDelta& operator=(FrameEventHistoryDelta&& src) noexcept;

    // Not copyable.

    FrameEventHistoryDelta(const FrameEventHistoryDelta& src) = delete;

    FrameEventHistoryDelta& operator=(

libs/ui/HdrCapabilities.cpp

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ namespace android { 
#endif



HdrCapabilities::~HdrCapabilities() = default;

HdrCapabilities::HdrCapabilities(HdrCapabilities&& other) = default;

HdrCapabilities& HdrCapabilities::operator=(HdrCapabilities&& other) = default;

HdrCapabilities::HdrCapabilities(HdrCapabilities&& other) noexcept = default;

HdrCapabilities& HdrCapabilities::operator=(HdrCapabilities&& other) noexcept = default;



size_t HdrCapabilities::getFlattenedSize() const {

    return  sizeof(mMaxLuminance) +

libs/ui/include/ui/HdrCapabilities.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ public: 
        mMinLuminance(minLuminance) {}



    // Make this move-constructable and move-assignable

    HdrCapabilities(HdrCapabilities&& other);

    HdrCapabilities& operator=(HdrCapabilities&& other);

    HdrCapabilities(HdrCapabilities&& other) noexcept;

    HdrCapabilities& operator=(HdrCapabilities&& other) noexcept;



    HdrCapabilities()

      : mSupportedHdrTypes(),

libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h

+6 −6
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ class NativeBufferHandle { 
      opaque_ints_.push_back(buffer.handle()->data[fd_count + i]);

    }

  }

  NativeBufferHandle(NativeBufferHandle&& other) = default;

  NativeBufferHandle& operator=(NativeBufferHandle&& other) = default;

  NativeBufferHandle(NativeBufferHandle&& other) noexcept = default;

  NativeBufferHandle& operator=(NativeBufferHandle&& other) noexcept = default;



  // Imports the native handle into the given IonBuffer instance.

  int Import(IonBuffer* buffer) {
@@ -110,8 +110,8 @@ class BufferDescription { 
        acquire_fence_fd_(acquire_fence_fd.Borrow()),

        release_fence_fd_(release_fence_fd.Borrow()) {}



  BufferDescription(BufferDescription&& other) = default;

  BufferDescription& operator=(BufferDescription&& other) = default;

  BufferDescription(BufferDescription&& other) noexcept = default;

  BufferDescription& operator=(BufferDescription&& other) noexcept = default;



  // ID of the buffer client. All BufferHub clients derived from the same buffer

  // in bufferhubd share the same buffer id.
@@ -161,8 +161,8 @@ class FenceHandle { 
  FenceHandle() = default;

  explicit FenceHandle(int fence) : fence_{fence} {}

  explicit FenceHandle(FileHandleType&& fence) : fence_{std::move(fence)} {}

  FenceHandle(FenceHandle&&) = default;

  FenceHandle& operator=(FenceHandle&&) = default;

  FenceHandle(FenceHandle&&) noexcept = default;

  FenceHandle& operator=(FenceHandle&&) noexcept = default;



  explicit operator bool() const { return fence_.IsValid(); }