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

Commit 751c59d2 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Suppress ordered-compare-function-pointers warning" am: 9117f884 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1813695

Change-Id: I5fcd45529202b90996548c8019467735ee30f6d0
parents cb425022 9117f884

camera/ndk/impl/ACameraManager.h

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ class CameraManagerGlobal final : public RefBase { 
            return !(*this == other);

        }

        bool operator < (const Callback& other) const {

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wordered-compare-function-pointers"

            if (*this == other) return false;

            if (mContext != other.mContext) return mContext < other.mContext;

            if (mPhysicalCamAvailable != other.mPhysicalCamAvailable) {
@@ -152,6 +154,7 @@ class CameraManagerGlobal final : public RefBase { 
            }

            if (mAvailable != other.mAvailable) return mAvailable < other.mAvailable;

            return mUnavailable < other.mUnavailable;

#pragma GCC diagnostic pop

        }

        bool operator > (const Callback& other) const {

            return (*this != other && !(*this < other));

camera/ndk/ndk_vendor/impl/ACameraManager.h

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ class CameraManagerGlobal final : public RefBase { 
            return !(*this == other);

        }

        bool operator < (const Callback& other) const {

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wordered-compare-function-pointers"

            if (*this == other) return false;

            if (mContext != other.mContext) return mContext < other.mContext;

            if (mAvailable != other.mAvailable) return mAvailable < other.mAvailable;
@@ -146,6 +148,7 @@ class CameraManagerGlobal final : public RefBase { 
            if (mPhysicalCamUnavailable != other.mPhysicalCamUnavailable)

                    return mPhysicalCamUnavailable < other.mPhysicalCamUnavailable;

            return mUnavailable < other.mUnavailable;

#pragma GCC diagnostic pop

        }

        bool operator > (const Callback& other) const {

            return (*this != other && !(*this < other));