From b7032baaf4303cd0f635598edb30dab5ae1a9ffa Mon Sep 17 00:00:00 2001 From: Christian Mazakas Date: Fri, 3 Feb 2023 10:02:49 -0800 Subject: [PATCH] fixup osx fix --- test/objects/exception.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/objects/exception.hpp b/test/objects/exception.hpp index ff753763..61a4be10 100644 --- a/test/objects/exception.hpp +++ b/test/objects/exception.hpp @@ -259,11 +259,13 @@ namespace test { bool operator()(std::pair const& x1, std::pair const& x2) const { - bool const first_is_eq = - !less_impl(x1.first, x2.first) && !less_impl(x2.first, x1.first); - - return less_impl(x1.first, x2.first) || - (first_is_eq && less_impl(x1.second, x2.second)); + if (less_impl(x1.first, x2.first)) { + return true; + } + if (less_impl(x2.first, x1.first)) { + return false; + } + return less_impl(x1.second, x2.second); } bool less_impl(object const& x1, object const& x2) const