Title: [204302] trunk/Source/WTF
- Revision
- 204302
- Author
- [email protected]
- Date
- 2016-08-09 14:36:54 -0700 (Tue, 09 Aug 2016)
Log Message
Fix windows build.
* wtf/Variant.h:
(std::experimental::__visit_helper2::__visit):
MSVC does not support extended constexpr. Use a ternary operator instead of an if statement.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (204301 => 204302)
--- trunk/Source/WTF/ChangeLog 2016-08-09 21:35:04 UTC (rev 204301)
+++ trunk/Source/WTF/ChangeLog 2016-08-09 21:36:54 UTC (rev 204302)
@@ -1,3 +1,11 @@
+2016-08-09 Sam Weinig <[email protected]>
+
+ Fix windows build.
+
+ * wtf/Variant.h:
+ (std::experimental::__visit_helper2::__visit):
+ MSVC does not support extended constexpr. Use a ternary operator instead of an if statement.
+
2016-08-06 Sam Weinig <[email protected]>
Replace NodeOrString with std::variant<RefPtr<Node>, String>
Modified: trunk/Source/WTF/wtf/Variant.h (204301 => 204302)
--- trunk/Source/WTF/wtf/Variant.h 2016-08-09 21:35:04 UTC (rev 204301)
+++ trunk/Source/WTF/wtf/Variant.h 2016-08-09 21:36:54 UTC (rev 204302)
@@ -1931,16 +1931,9 @@
template<typename _Visitor,typename ... _Variants>
static constexpr typename __multi_visitor_return_type<_Visitor,_Variants...>::__type
__visit(_Visitor& __visitor,_Variants&& ... __v){
- if(__arg_selector<_VariantIndex-1>(__v...).index()==_Index){
- return __visit_helper<
- _VariantIndex-1,__index_sequence<_Index,_Indices...>>::
- __visit(__visitor,std::forward<_Variants>(__v)...);
- }
- else{
- return __visit_helper2<_Index-1,_VariantIndex,_Indices...>::__visit(
- __visitor,std::forward<_Variants>(__v)...);
- }
-
+ return (__arg_selector<_VariantIndex-1>(__v...).index()==_Index)
+ ? __visit_helper<_VariantIndex-1,__index_sequence<_Index,_Indices...>>::__visit(__visitor,std::forward<_Variants>(__v)...)
+ : __visit_helper2<_Index-1,_VariantIndex,_Indices...>::__visit(__visitor,std::forward<_Variants>(__v)...);
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
