Author: Jonas Devlieghere Date: 2025-04-09T21:08:00-07:00 New Revision: 3e7df27c1d3a9c1a430b2cf471517f8f059d59ed
URL: https://github.com/llvm/llvm-project/commit/3e7df27c1d3a9c1a430b2cf471517f8f059d59ed DIFF: https://github.com/llvm/llvm-project/commit/3e7df27c1d3a9c1a430b2cf471517f8f059d59ed.diff LOG: Revert "Fix ambiguous reversed operator error in sanitizer_mac.h (#135068)" This reverts commit 433a63e117ebf22365ef1f3f595a49cbe9f0c88e. Added: Modified: compiler-rt/lib/sanitizer_common/sanitizer_mac.h Removed: ################################################################################ diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.h b/compiler-rt/lib/sanitizer_common/sanitizer_mac.h index 4de0605e18f03..f0a97d098eea0 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.h @@ -37,6 +37,9 @@ struct VersionBase { VersionBase(u16 major, u16 minor) : major(major), minor(minor) {} + bool operator==(const VersionType &other) const { + return major == other.major && minor == other.minor; + } bool operator>=(const VersionType &other) const { return major > other.major || (major == other.major && minor >= other.minor); @@ -44,11 +47,6 @@ struct VersionBase { bool operator<(const VersionType &other) const { return !(*this >= other); } }; -template <typename VersionType> -bool operator==(const VersionType &self, const VersionType &other) { - return self.major == other.major && self.minor == other.minor; -} - struct MacosVersion : VersionBase<MacosVersion> { MacosVersion(u16 major, u16 minor) : VersionBase(major, minor) {} }; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
