summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorg Brown <jorg@google.com>2022-12-22 13:47:17 -0800
committerGravatar Copybara-Service <copybara-worker@google.com>2022-12-22 13:48:16 -0800
commit8d77ac515bdd189b27d5006ee058c8898ceb756b (patch)
treedb15ecfe64499f50872e86cde648cf3da60fc090
parent3d646b088503bbc2b9bd48edeea343b31421abe4 (diff)
Change Bool to BoolT in order to avoid a macro conflict from X11/Xlib.h
PiperOrigin-RevId: 497232675 Change-Id: Ic3cabbb85d90eb4f32a4bee17207e73475258e4b
-rw-r--r--absl/types/compare.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/absl/types/compare.h b/absl/types/compare.h
index 19b076e7..78aa26de 100644
--- a/absl/types/compare.h
+++ b/absl/types/compare.h
@@ -544,9 +544,9 @@ namespace compare_internal {
// Helper functions to do a boolean comparison of two keys given a boolean
// or three-way comparator.
// SFINAE prevents implicit conversions to bool (such as from int).
-template <typename Bool,
- absl::enable_if_t<std::is_same<bool, Bool>::value, int> = 0>
-constexpr bool compare_result_as_less_than(const Bool r) { return r; }
+template <typename BoolT,
+ absl::enable_if_t<std::is_same<bool, BoolT>::value, int> = 0>
+constexpr bool compare_result_as_less_than(const BoolT r) { return r; }
constexpr bool compare_result_as_less_than(const absl::weak_ordering r) {
return r < 0;
}