include/basegfx/point/b2dpoint.hxx | 9 ---------
1 file changed, 9 deletions(-)
New commits:
commit e1e6f5c7d029af3e2942a6cc5a5aff26d1971904
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Feb 27 09:49:06 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu Feb 27 13:38:07 2025 +0100
Remove workaround for old Android NDK
...which had been added with 41ab6a5dfa0bbc67c726ba872e9ef85fde67a394
"struct SN
needs a strict weak ordering operator <" and should no longer be necessary
since2b68bf57789714bf79b5bd1fc3e4e9ad586b7c31 "android: Update minimum NDK
version to 27"
Change-Id: I8a2fb01804ed6220bb927175992b4d5015b0d7e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182281
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/include/basegfx/point/b2dpoint.hxx
b/include/basegfx/point/b2dpoint.hxx
index 94140aa6f5e1..14687d5e87d5 100644
--- a/include/basegfx/point/b2dpoint.hxx
+++ b/include/basegfx/point/b2dpoint.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <compare>
#include <ostream>
#include <tuple>
@@ -127,15 +126,7 @@ namespace basegfx
friend auto operator <=>(B2DPoint const & a, B2DPoint const & b)
{
- // Avoid compilation failure with Android NDK 23.2, where
std::tuple operator <=> isn't
- // yet implemented (and where __cpp_lib_three_way_comparison
happens to not be defined
- // in <compare>, so discriminate on that):
-#if defined __cpp_lib_three_way_comparison
return std::tie(a.mnX, a.mnY) <=> std::tie(b.mnX, b.mnY);
-#else
- auto const comp = a.mnX <=> b.mnX;
- return comp == 0 ? a.mnY <=> b.mnY : comp;
-#endif
}
};
