From 882162cc2a882b8e63079ad26c825ec4d4530b56 Mon Sep 17 00:00:00 2001 From: greg Date: Sun, 29 Mar 2020 08:28:37 -0400 Subject: [PATCH] Rename template parameter name Bool which conflicts with X11 headers --- parallel_hashmap/btree.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parallel_hashmap/btree.h b/parallel_hashmap/btree.h index 2886094..1e6ea36 100644 --- a/parallel_hashmap/btree.h +++ b/parallel_hashmap/btree.h @@ -682,9 +682,9 @@ namespace phmap { // 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 ::value, int> = 0> - constexpr bool compare_result_as_less_than(const Bool r) { return r; } + template ::value, int> = 0> + constexpr bool compare_result_as_less_than(const BoolType r) { return r; } constexpr bool compare_result_as_less_than(const phmap::weak_ordering r) { return r < 0; }