commit 72c8d6ac47e4276a90b6dc85d3e50d355181da65
author Michael Gottesman <gottesmm@users.noreply.github.com> Sat Jul 08 23:45:06 2017 -0700
committer GitHub <noreply@github.com> Sat Jul 08 23:45:06 2017 -0700
tree c3e8b6341a77a21fc21e7c7bef8a09ea6b5f1e0e
parent 32658080aaaf80c77f448b1f020da4fc1cef8572
parent ae2bb3e49f6387ca1898319ea2804034d0073c84

Merge pull request #10831 from gottesmm/fix_createunsafecopyunowned_value

[silgen] Fix createUnsafeCopyUnownedValue to be correct from an ownership perspective.

include/swift/Basic/ExternalUnion.h

diff --git a/include/swift/Basic/ExternalUnion.h b/include/swift/Basic/ExternalUnion.h
index 9901707..74381d3 100644
--- a/include/swift/Basic/ExternalUnion.h
+++ b/include/swift/Basic/ExternalUnion.h
@@ -23,7 +23,7 @@
 #define SWIFT_BASIC_EXTERNALUNION_H
 
 #include "llvm/Support/Compiler.h"
-#include <type_traits>
+#include "swift/Basic/type_traits.h"
 #include <utility>
 #include <assert.h>
 
@@ -339,7 +339,7 @@
 struct SpecialMembers<T, Others...> {
   enum : bool {
     is_trivially_copyable =
-      std::is_trivially_copyable<T>::value &&
+      IsTriviallyCopyable<T>::value &&
       SpecialMembers<Others...>::is_trivially_copyable
   };