diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-01-31 22:52:25 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-01-31 22:52:25 +0000 |
| commit | 22977dce58648cd7da11e07e4373d974e256663a (patch) | |
| tree | 794c9176f6d2862a3944bbddc03e51589f4b58fa /libstdc++-v3/testsuite/util/exception | |
| parent | 7adac79a3d5420b9683e9fe38b2b526f26c2c225 (diff) | |
| download | gcc-22977dce58648cd7da11e07e4373d974e256663a.zip gcc-22977dce58648cd7da11e07e4373d974e256663a.tar.gz gcc-22977dce58648cd7da11e07e4373d974e256663a.tar.bz2 | |
generation_prohibited.c: Remove, swap can indeed throw (DR 774).
2010-01-31 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/23_containers/array/requirements/exception/
generation_prohibited.c: Remove, swap can indeed throw (DR 774).
* testsuite/util/exception/safety.h (insert_base<__versa_string>): Fix.
* testsuite/util/testsuite_container_traits.h
(traits<__versa_string>): Enable insert tests.
2010-01-31 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/forward_list.h (forward_list<>::insert_after
(const_iterator, size_type, const _Tp&), insert_after(const_iterator,
_InputIterator, _InputIterator), insert_after(const_iterator,
std::initializer_list<>)): Fix return type per N3000.
* testsuite/23_containers/forward_list/ext_pointer/modifiers/2.cc:
Adjust.
* testsuite/23_containers/forward_list/modifiers/2.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Adjust dg-error line numbers.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
From-SVN: r156419
Diffstat (limited to 'libstdc++-v3/testsuite/util/exception')
| -rw-r--r-- | libstdc++-v3/testsuite/util/exception/safety.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libstdc++-v3/testsuite/util/exception/safety.h b/libstdc++-v3/testsuite/util/exception/safety.h index ce9dad4..4be5318 100644 --- a/libstdc++-v3/testsuite/util/exception/safety.h +++ b/libstdc++-v3/testsuite/util/exception/safety.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2009 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -512,10 +512,12 @@ namespace __gnu_test insert_base() : _F_insert_point(&container_type::insert) { } }; - template<typename _Tp1, typename _Tp2, typename _Tp3> - struct insert_base<__gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3>> + template<typename _Tp1, typename _Tp2, typename _Tp3, + template <typename, typename, typename> class _Tp4> + struct insert_base<__gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3, _Tp4>> { - typedef __gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3> container_type; + typedef __gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3, _Tp4> + container_type; typedef typename container_type::iterator iterator; typedef typename container_type::value_type value_type; |