From bbb901fa67d0cd47565bb9972beb367ae264ec69 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 6 Jan 2018 21:36:34 +0000
Subject: Vendor import of libc++ release_60 branch r321788:
 https://llvm.org/svn/llvm-project/libcxx/branches/release_60@321788

---
 include/memory | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include/memory')

diff --git a/include/memory b/include/memory
index df221ffa7510..d6b427b941b5 100644
--- a/include/memory
+++ b/include/memory
@@ -18,7 +18,7 @@ namespace std
 {
 
 struct allocator_arg_t { };
-constexpr allocator_arg_t allocator_arg = allocator_arg_t();
+inline constexpr allocator_arg_t allocator_arg = allocator_arg_t();
 
 template <class T, class Alloc> struct uses_allocator;
 
@@ -631,6 +631,9 @@ template <class T> struct hash;
 template <class T, class D> struct hash<unique_ptr<T, D> >;
 template <class T> struct hash<shared_ptr<T> >;
 
+template <class T, class Alloc>
+  inline constexpr bool uses_allocator_v = uses_allocator<T, Alloc>::value;
+
 // Pointer safety
 enum class pointer_safety { relaxed, preferred, strict };
 void declare_reachable(void *p);
-- 
cgit v1.3