Title: [212992] trunk/Source/WTF
- Revision
- 212992
- Author
- keith_mil...@apple.com
- Date
- 2017-02-24 20:54:36 -0800 (Fri, 24 Feb 2017)
Log Message
Rubber-stamped by Chris Dumez.
Replace typename Bool with typename BoolType because X11 has
#define Bool int for some unknown reason...
* wtf/HashFunctions.h:
(WTF::TupleHash::allTrue):
* wtf/HashTraits.h:
(WTF::TupleHashTraits::allTrue):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (212991 => 212992)
--- trunk/Source/WTF/ChangeLog 2017-02-25 04:27:09 UTC (rev 212991)
+++ trunk/Source/WTF/ChangeLog 2017-02-25 04:54:36 UTC (rev 212992)
@@ -1,3 +1,15 @@
+2017-02-24 Keith Miller <keith_mil...@apple.com>
+
+ Rubber-stamped by Chris Dumez.
+
+ Replace typename Bool with typename BoolType because X11 has
+ #define Bool int for some unknown reason...
+
+ * wtf/HashFunctions.h:
+ (WTF::TupleHash::allTrue):
+ * wtf/HashTraits.h:
+ (WTF::TupleHashTraits::allTrue):
+
2017-02-24 Chris Dumez <cdu...@apple.com>
Unreviewed, rolling out r212944.
Modified: trunk/Source/WTF/wtf/HashFunctions.h (212991 => 212992)
--- trunk/Source/WTF/wtf/HashFunctions.h 2017-02-25 04:27:09 UTC (rev 212991)
+++ trunk/Source/WTF/wtf/HashFunctions.h 2017-02-25 04:54:36 UTC (rev 212992)
@@ -207,10 +207,10 @@
// We should use safeToCompareToEmptyOrDeleted = DefaultHash<Types>::Hash::safeToCompareToEmptyOrDeleted &&... whenever
// we switch to C++17. We can't do anything better here right now because GCC can't do C++.
- template<typename Bool>
- static constexpr bool allTrue(Bool value) { return value; }
- template<typename Bool, typename... Bools>
- static constexpr bool allTrue(Bool value, Bools... values) { return value && allTrue(values...); }
+ template<typename BoolType>
+ static constexpr bool allTrue(BoolType value) { return value; }
+ template<typename BoolType, typename... BoolTypes>
+ static constexpr bool allTrue(BoolType value, BoolTypes... values) { return value && allTrue(values...); }
static const bool safeToCompareToEmptyOrDeleted = allTrue(DefaultHash<Types>::Hash::safeToCompareToEmptyOrDeleted...);
};
Modified: trunk/Source/WTF/wtf/HashTraits.h (212991 => 212992)
--- trunk/Source/WTF/wtf/HashTraits.h 2017-02-25 04:27:09 UTC (rev 212991)
+++ trunk/Source/WTF/wtf/HashTraits.h 2017-02-25 04:54:36 UTC (rev 212992)
@@ -263,10 +263,10 @@
// We should use emptyValueIsZero = Traits::emptyValueIsZero &&... whenever we switch to C++17. We can't do anything
// better here right now because GCC can't do C++.
- template<typename Bool>
- static constexpr bool allTrue(Bool value) { return value; }
- template<typename Bool, typename... Bools>
- static constexpr bool allTrue(Bool value, Bools... values) { return value && allTrue(values...); }
+ template<typename BoolType>
+ static constexpr bool allTrue(BoolType value) { return value; }
+ template<typename BoolType, typename... BoolTypes>
+ static constexpr bool allTrue(BoolType value, BoolTypes... values) { return value && allTrue(values...); }
static const bool emptyValueIsZero = allTrue(FirstTrait::emptyValueIsZero, Traits::emptyValueIsZero...);
static EmptyValueType emptyValue() { return std::make_tuple(FirstTrait::emptyValue(), Traits::emptyValue()...); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
