1 From 872b1920a12548af70c3866daadc4a67d05416b1 Mon Sep 17 00:00:00 2001
2 From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
3 Date: Tue, 12 Apr 2011 09:05:41 +0000
4 Subject: [PATCH 107/200] 2011-04-12 Allan McRae <allan@archlinux.org>
7 * testsuite/tr1/6_containers/unordered_map/requirements/
8 iterator_null_neg.cc: Include <cstddef>.
9 * testsuite/tr1/6_containers/unordered_set/requirements/
10 iterator_null_neg.cc: Likewise.
11 * testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc: Include
13 * testsuite/util/testsuite_common_types.h: Include <limits>.
14 * testsuite/29_atomics/atomic_integral/cons/assign_neg.cc:
15 Adjust dg-error line numbers.
16 * testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Likewise.
17 * testsuite/29_atomics/atomic_integral/operators/increment_neg.cc:
19 * testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc:
21 * testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc:
23 * testsuite/29_atomics/atomic/cons/assign_neg.cc: Likewise.
24 * testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise.
27 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172304 138bc75d-0d04-0410-961f-82ee72b054a4
29 index a6bba98..245f18f 100644
30 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
31 +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
33 // { dg-require-fileio "" }
35 -// Copyright (C) 2010 Free Software Foundation, Inc.
36 +// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
38 // This file is part of the GNU ISO C++ Library. This library is free
39 // software; you can redistribute it and/or modify it under the
45 #include <testsuite_hooks.h>
48 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
49 index 6b04cf8..68b64f0 100644
50 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
51 +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
53 // { dg-options "-std=gnu++0x" }
56 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
57 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
59 // This file is part of the GNU ISO C++ Library. This library is free
60 // software; you can redistribute it and/or modify it under the
61 @@ -28,5 +28,5 @@ int main()
65 -// { dg-error "deleted" "" { target *-*-* } 571 }
66 +// { dg-error "deleted" "" { target *-*-* } 572 }
67 // { dg-prune-output "include" }
68 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
69 index cdd95fd..79182bb 100644
70 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
71 +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
73 // { dg-options "-std=gnu++0x" }
76 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
77 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
79 // This file is part of the GNU ISO C++ Library. This library is free
80 // software; you can redistribute it and/or modify it under the
81 @@ -28,5 +28,5 @@ int main()
85 -// { dg-error "deleted" "" { target *-*-* } 610 }
86 +// { dg-error "deleted" "" { target *-*-* } 611 }
87 // { dg-prune-output "include" }
88 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
89 index 265878d..306fd4c 100644
90 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
91 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
93 // { dg-options "-std=gnu++0x" }
96 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
97 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
99 // This file is part of the GNU ISO C++ Library. This library is free
100 // software; you can redistribute it and/or modify it under the
101 @@ -29,5 +29,5 @@ int main()
105 -// { dg-error "deleted" "" { target *-*-* } 571 }
106 +// { dg-error "deleted" "" { target *-*-* } 572 }
107 // { dg-prune-output "include" }
108 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
109 index acb8006..56a41d1 100644
110 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
111 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
113 // { dg-options "-std=gnu++0x" }
116 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
117 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
119 // This file is part of the GNU ISO C++ Library. This library is free
120 // software; you can redistribute it and/or modify it under the
121 @@ -29,5 +29,5 @@ int main()
125 -// { dg-error "deleted" "" { target *-*-* } 610 }
126 +// { dg-error "deleted" "" { target *-*-* } 611 }
127 // { dg-prune-output "include" }
128 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
129 index b2f1ea4..4ee4e7f 100644
130 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
131 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
136 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
137 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
139 // This library is free software; you can redistribute it and/or
140 // modify it under the terms of the GNU General Public License as
141 @@ -27,7 +27,7 @@ int main()
145 -// { dg-error "operator" "" { target *-*-* } 427 }
146 // { dg-error "operator" "" { target *-*-* } 428 }
147 // { dg-error "operator" "" { target *-*-* } 429 }
148 +// { dg-error "operator" "" { target *-*-* } 430 }
149 // { dg-excess-errors "In file included from" }
150 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
151 index dd84c83..3e0a975 100644
152 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
153 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
158 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
159 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
161 // This library is free software; you can redistribute it and/or
162 // modify it under the terms of the GNU General Public License as
163 @@ -28,6 +28,6 @@ int main()
167 -// { dg-error "operator" "" { target *-*-* } 384 }
168 // { dg-error "operator" "" { target *-*-* } 385 }
169 // { dg-error "operator" "" { target *-*-* } 386 }
170 +// { dg-error "operator" "" { target *-*-* } 387 }
171 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
172 index 90b7555..5047be7 100644
173 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
174 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
179 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
180 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
182 // This library is free software; you can redistribute it and/or
183 // modify it under the terms of the GNU General Public License as
184 @@ -28,6 +28,6 @@ int main()
188 -// { dg-error "operator" "" { target *-*-* } 362 }
189 // { dg-error "operator" "" { target *-*-* } 363 }
190 // { dg-error "operator" "" { target *-*-* } 364 }
191 +// { dg-error "operator" "" { target *-*-* } 365 }
192 diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
193 index 97b4b67..882ca36 100644
194 --- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
195 +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
197 // 2005-09-10 Paolo Carlini <pcarlini@suse.de>
199 -// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
200 +// Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
202 // This file is part of the GNU ISO C++ Library. This library is free
203 // software; you can redistribute it and/or modify it under the
207 #include <tr1/unordered_map>
210 std::tr1::unordered_map<int, int>::iterator it1 = NULL; // { dg-error "conversion" }
211 std::tr1::unordered_map<int, int>::const_iterator cit1 = NULL; // { dg-error "conversion" }
212 diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
213 index bf2f4ff..a0747ec 100644
214 --- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
215 +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
217 // 2005-09-10 Paolo Carlini <pcarlini@suse.de>
219 -// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
220 +// Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
222 // This file is part of the GNU ISO C++ Library. This library is free
223 // software; you can redistribute it and/or modify it under the
227 #include <tr1/unordered_set>
230 std::tr1::unordered_set<int>::iterator it4 = NULL; // { dg-error "conversion" }
231 std::tr1::unordered_set<int>::const_iterator cit4 = NULL; // { dg-error "conversion" }
232 diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
233 index f597da2..a4f59ac 100644
234 --- a/libstdc++-v3/testsuite/util/testsuite_common_types.h
235 +++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
238 // typelist for the C++ library testsuite.
240 -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
241 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
242 // Free Software Foundation, Inc.
244 // This file is part of the GNU ISO C++ Library. This library is free