summaryrefslogtreecommitdiff
path: root/include/memory
diff options
context:
space:
mode:
Diffstat (limited to 'include/memory')
-rw-r--r--include/memory5
1 files changed, 4 insertions, 1 deletions
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);