Skip to content

Commit 59fe4f7

Browse files
author
git apple-llvm automerger
committed
Merge commit '87701de72a65' from apple/stable/20200108 into swift/release/5.3
2 parents ad2d85d + 87701de commit 59fe4f7

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

llvm/include/llvm/Support/type_traits.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@ template <typename T>
186186
class is_trivially_copyable<T*> : public std::true_type {
187187
};
188188

189+
// Workaround the resolution to DR1734
190+
#if _MSVC_STL_UPDATE-0l > 202002l
191+
template <>
192+
class is_trivially_copyable<std::pair<void *, size_t>> : public std::true_type {
193+
};
194+
#endif
195+
189196

190197
} // end namespace llvm
191198

0 commit comments

Comments
 (0)