diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-08-12 18:10:29 +0000 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-08-12 18:10:29 +0000 |
| commit | ad9a5951d9c5503b88426b3ea2f620fa657fd046 (patch) | |
| tree | 8701f86dfee9157ed8efbd8b8db6c0593db79815 | |
| parent | ef07ac9584cf615c1cf5ffaf544b19f728a50b5d (diff) | |
| download | bcm5719-llvm-ad9a5951d9c5503b88426b3ea2f620fa657fd046.tar.gz bcm5719-llvm-ad9a5951d9c5503b88426b3ea2f620fa657fd046.zip | |
Hide type trait from r278532 from MSVC
The fixup from r278537 was insufficient. Just #ifdef it out for MSVC.
llvm-svn: 278539
| -rw-r--r-- | llvm/include/llvm/ADT/ilist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/include/llvm/ADT/ilist.h b/llvm/include/llvm/ADT/ilist.h index 43429e9e856..0e92e400fab 100644 --- a/llvm/include/llvm/ADT/ilist.h +++ b/llvm/include/llvm/ADT/ilist.h @@ -390,8 +390,12 @@ template<typename NodeTy> struct simplify_type<const ilist_iterator<NodeTy> > { /// template <typename NodeTy, typename Traits = ilist_traits<NodeTy>> class iplist : public Traits, ilist_node_access { +#if !defined(_MSC_VER) + // FIXME: This fails in MSVC, but it's worth keeping around to help + // non-Windows users root out bugs in their ilist_traits. static_assert(!ilist_detail::HasGetNext<Traits, NodeTy>::value, "ilist next and prev links are not customizable!"); +#endif mutable NodeTy *Head; |
