From 22977dce58648cd7da11e07e4373d974e256663a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 31 Jan 2010 22:52:25 +0000 Subject: generation_prohibited.c: Remove, swap can indeed throw (DR 774). 2010-01-31 Paolo Carlini * 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 * 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 --- libstdc++-v3/testsuite/util/exception/safety.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libstdc++-v3/testsuite/util/exception') 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 - struct insert_base<__gnu_cxx::__versa_string<_Tp1, _Tp2, _Tp3>> + template 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; -- cgit v1.1