diff options
| -rw-r--r-- | libs/binder/include/binder/ParcelableHolder.h | 18 | ||||
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h | 24 |
2 files changed, 12 insertions, 30 deletions
diff --git a/libs/binder/include/binder/ParcelableHolder.h b/libs/binder/include/binder/ParcelableHolder.h index ce5027eb96..7024a4b07f 100644 --- a/libs/binder/include/binder/ParcelableHolder.h +++ b/libs/binder/include/binder/ParcelableHolder.h @@ -104,28 +104,22 @@ public: Stability getStability() const override { return mStability; } inline bool operator!=(const ParcelableHolder& rhs) const { - return std::tie(mParcelable, mParcelPtr, mStability) != - std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability); + return this != &rhs; } inline bool operator<(const ParcelableHolder& rhs) const { - return std::tie(mParcelable, mParcelPtr, mStability) < - std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability); + return this < &rhs; } inline bool operator<=(const ParcelableHolder& rhs) const { - return std::tie(mParcelable, mParcelPtr, mStability) <= - std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability); + return this <= &rhs; } inline bool operator==(const ParcelableHolder& rhs) const { - return std::tie(mParcelable, mParcelPtr, mStability) == - std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability); + return this == &rhs; } inline bool operator>(const ParcelableHolder& rhs) const { - return std::tie(mParcelable, mParcelPtr, mStability) > - std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability); + return this > &rhs; } inline bool operator>=(const ParcelableHolder& rhs) const { - return std::tie(mParcelable, mParcelPtr, mStability) >= - std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability); + return this >= &rhs; } private: diff --git a/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h b/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h index cf2b9e9745..e1d6c34d1d 100644 --- a/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h @@ -114,24 +114,12 @@ class AParcelableHolder { void reset() { AParcel_reset(mParcel.get()); } - inline bool operator!=(const AParcelableHolder& rhs) const { - return std::tie(mParcel, mStability) != std::tie(rhs.mParcel, rhs.mStability); - } - inline bool operator<(const AParcelableHolder& rhs) const { - return std::tie(mParcel, mStability) < std::tie(rhs.mParcel, rhs.mStability); - } - inline bool operator<=(const AParcelableHolder& rhs) const { - return std::tie(mParcel, mStability) <= std::tie(rhs.mParcel, rhs.mStability); - } - inline bool operator==(const AParcelableHolder& rhs) const { - return std::tie(mParcel, mStability) == std::tie(rhs.mParcel, rhs.mStability); - } - inline bool operator>(const AParcelableHolder& rhs) const { - return std::tie(mParcel, mStability) > std::tie(rhs.mParcel, rhs.mStability); - } - inline bool operator>=(const AParcelableHolder& rhs) const { - return std::tie(mParcel, mStability) >= std::tie(rhs.mParcel, rhs.mStability); - } + inline bool operator!=(const AParcelableHolder& rhs) const { return this != &rhs; } + inline bool operator<(const AParcelableHolder& rhs) const { return this < &rhs; } + inline bool operator<=(const AParcelableHolder& rhs) const { return this <= &rhs; } + inline bool operator==(const AParcelableHolder& rhs) const { return this == &rhs; } + inline bool operator>(const AParcelableHolder& rhs) const { return this > &rhs; } + inline bool operator>=(const AParcelableHolder& rhs) const { return this >= &rhs; } private: mutable ndk::ScopedAParcel mParcel; |