aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2011-06-11 15:37:17 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2011-06-11 16:37:17 +0100
commita9a76bae8bc5f7d9f73acca95a55bd46c873e65b (patch)
tree429b7aa2a8a5d2935acc5fe3a034180b1cdd52ab
parentea89702bbf97bdff50818f7e57c2d7fbc28b55ba (diff)
downloadgcc-a9a76bae8bc5f7d9f73acca95a55bd46c873e65b.zip
gcc-a9a76bae8bc5f7d9f73acca95a55bd46c873e65b.tar.gz
gcc-a9a76bae8bc5f7d9f73acca95a55bd46c873e65b.tar.bz2
explicit_instantiation.cc: Add another instantiation.
2011-06-11 Jonathan Wakely <jwakely.gcc@gmail.com> * testsuite/20_util/allocator_traits/requirements/ explicit_instantiation.cc: Add another instantiation. From-SVN: r174957
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/20_util/allocator_traits/requirements/explicit_instantiation.cc15
2 files changed, 19 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cb3f5ab..fd39e4a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2011-06-11 Jonathan Wakely <jwakely.gcc@gmail.com>
+ * testsuite/20_util/allocator_traits/requirements/
+ explicit_instantiation.cc: Add another instantiation.
+
+2011-06-11 Jonathan Wakely <jwakely.gcc@gmail.com>
+
* testsuite/20_util/allocator_traits/requirements/typedefs.cc: Check
for allocator_type and value_type.
diff --git a/libstdc++-v3/testsuite/20_util/allocator_traits/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/allocator_traits/requirements/explicit_instantiation.cc
index 13d3135..f734696 100644
--- a/libstdc++-v3/testsuite/20_util/allocator_traits/requirements/explicit_instantiation.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator_traits/requirements/explicit_instantiation.cc
@@ -22,8 +22,21 @@
#include <memory>
+typedef short test_type;
+
+template<typename T>
+ struct minimal_allocator
+ {
+ typedef T value_type;
+ minimal_allocator();
+ template <typename U>
+ minimal_allocator(const minimal_allocator<U>&);
+ T* allocate(std::size_t);
+ void deallocate(T*, std::size_t);
+ };
+
namespace std
{
- typedef short test_type;
template struct allocator_traits<std::allocator<test_type>>;
+ template struct allocator_traits<minimal_allocator<test_type>>;
}