From a52d35650620a60c2f0fecf7a39fcd414eddf1bf Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Sun, 9 Dec 2018 20:04:54 +0000
Subject: [PATCH] Speculatively fixing the build; it seems add_pointer_t and
 add_const_t are not implemented everywhere.

llvm-svn: 348731
---
 llvm/include/llvm/ADT/STLExtras.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
index 789b09f..8685f0e 100644
--- a/llvm/include/llvm/ADT/STLExtras.h
+++ b/llvm/include/llvm/ADT/STLExtras.h
@@ -72,7 +72,8 @@ struct conjunction<B1, Bn...>
     : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
 
 template <typename T> struct make_const_ptr {
-  using type = std::add_pointer_t<std::add_const_t<T>>;
+  using type =
+      typename std::add_pointer<typename std::add_const<T>::type>::type;
 };
 //===----------------------------------------------------------------------===//
 //     Extra additions to <functional>
-- 
2.7.4