summaryrefslogtreecommitdiffstats
path: root/libcxx/test/support/min_allocator.h
diff options
context:
space:
mode:
authorZoe Carver <z.zoelec2@gmail.com>2019-09-24 20:55:54 +0000
committerZoe Carver <z.zoelec2@gmail.com>2019-09-24 20:55:54 +0000
commit4278a9e6b5025d9480532c687ab57e3a50c21fae (patch)
tree5d26a75db6bd959a234bc1e23c664d2bbf6a8bec /libcxx/test/support/min_allocator.h
parent937b95583787086df2e9030d670ae4759b46c566 (diff)
downloadbcm5719-llvm-4278a9e6b5025d9480532c687ab57e3a50c21fae.tar.gz
bcm5719-llvm-4278a9e6b5025d9480532c687ab57e3a50c21fae.zip
[libc++] Remove C++03 variadics in shared_ptr
Summary: As suggested by @ldionne in D66178, this patch removes C++03 variadics //only//. Following patches will apply more updates. Reviewers: ldionne, EricWF, mclow.lists Subscribers: christof, dexonsmith, libcxx-commits, ldionne Tags: #libc Differential Revision: https://reviews.llvm.org/D67675 llvm-svn: 372780
Diffstat (limited to 'libcxx/test/support/min_allocator.h')
-rw-r--r--libcxx/test/support/min_allocator.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/libcxx/test/support/min_allocator.h b/libcxx/test/support/min_allocator.h
index 5228fab2e70..fd23fc4383f 100644
--- a/libcxx/test/support/min_allocator.h
+++ b/libcxx/test/support/min_allocator.h
@@ -14,6 +14,7 @@
#include <cstddef>
#include <cassert>
#include <climits>
+#include <memory>
#include "test_macros.h"
@@ -190,11 +191,6 @@ struct cpp03_overload_allocator : bare_allocator<T>
};
template <class T> bool cpp03_overload_allocator<T>::construct_called = false;
-
-#if TEST_STD_VER >= 11
-
-#include <memory>
-
template <class T, class = std::integral_constant<size_t, 0> > class min_pointer;
template <class T, class ID> class min_pointer<const T, ID>;
template <class ID> class min_pointer<void, ID>;
@@ -462,6 +458,4 @@ public:
friend bool operator!=(explicit_allocator x, explicit_allocator y) {return !(x == y);}
};
-#endif // TEST_STD_VER >= 11
-
#endif // MIN_ALLOCATOR_H
OpenPOWER on IntegriCloud