Hi,
tested x86_64-linux, committed mainline and 4_6-branch.
Paolo.
///////////////////
2011-04-12 Allan McRae <al...@archlinux.org>
PR libstdc++/48566
* testsuite/tr1/6_containers/unordered_map/requirements/
iterator_null_neg.cc: Include <cstddef>.
* testsuite/tr1/6_containers/unordered_set/requirements/
iterator_null_neg.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc: Include
<cstring>.
* testsuite/util/testsuite_common_types.h: Include <limits>.
* testsuite/29_atomics/atomic_integral/cons/assign_neg.cc:
Adjust dg-error line numbers.
* testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Likewise.
* testsuite/29_atomics/atomic_integral/operators/increment_neg.cc:
Likewise.
* testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc:
Likewise.
* testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc:
Likewise.
* testsuite/29_atomics/atomic/cons/assign_neg.cc: Likewise.
* testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise.
Index: testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
===================================================================
--- testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc (revision 172300)
+++ testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc (working copy)
@@ -1,6 +1,6 @@
// { dg-require-fileio "" }
-// Copyright (C) 2010 Free Software Foundation, Inc.
+// Copyright (C) 2010, 2011 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
@@ -21,6 +21,7 @@
#include <fstream>
#include <cwchar>
+#include <cstring>
#include <testsuite_hooks.h>
void test01()
Index:
testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
(revision 172300)
+++ testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
(working copy)
@@ -1,6 +1,6 @@
// 2005-09-10 Paolo Carlini <pcarl...@suse.de>
//
-// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2009, 2011 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
@@ -22,6 +22,7 @@
// libstdc++/23781
#include <tr1/unordered_set>
+#include <cstddef>
std::tr1::unordered_set<int>::iterator it4 = NULL; // { dg-error "conversion" }
std::tr1::unordered_set<int>::const_iterator cit4 = NULL; // { dg-error
"conversion" }
Index:
testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
(revision 172300)
+++ testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
(working copy)
@@ -1,6 +1,6 @@
// 2005-09-10 Paolo Carlini <pcarl...@suse.de>
//
-// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2009, 2011 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
@@ -22,6 +22,7 @@
// libstdc++/23781
#include <tr1/unordered_map>
+#include <cstddef>
std::tr1::unordered_map<int, int>::iterator it1 = NULL; // { dg-error
"conversion" }
std::tr1::unordered_map<int, int>::const_iterator cit1 = NULL; // { dg-error
"conversion" }
Index: testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
===================================================================
--- testsuite/29_atomics/atomic_integral/cons/assign_neg.cc (revision
172300)
+++ testsuite/29_atomics/atomic_integral/cons/assign_neg.cc (working copy)
@@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 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
@@ -29,5 +29,5 @@
return 0;
}
-// { dg-error "deleted" "" { target *-*-* } 571 }
+// { dg-error "deleted" "" { target *-*-* } 572 }
// { dg-prune-output "include" }
Index: testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
===================================================================
--- testsuite/29_atomics/atomic_integral/cons/copy_neg.cc (revision
172300)
+++ testsuite/29_atomics/atomic_integral/cons/copy_neg.cc (working copy)
@@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 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
@@ -29,5 +29,5 @@
return 0;
}
-// { dg-error "deleted" "" { target *-*-* } 610 }
+// { dg-error "deleted" "" { target *-*-* } 611 }
// { dg-prune-output "include" }
Index: testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
===================================================================
--- testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
(revision 172300)
+++ testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
(working copy)
@@ -2,7 +2,7 @@
// { dg-do compile }
// -*- C++ -*-
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@@ -28,6 +28,6 @@
return 0;
}
-// { dg-error "operator" "" { target *-*-* } 362 }
// { dg-error "operator" "" { target *-*-* } 363 }
// { dg-error "operator" "" { target *-*-* } 364 }
+// { dg-error "operator" "" { target *-*-* } 365 }
Index: testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
===================================================================
--- testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
(revision 172300)
+++ testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
(working copy)
@@ -2,7 +2,7 @@
// { dg-do compile }
// -*- C++ -*-
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@@ -27,7 +27,7 @@
return 0;
}
-// { dg-error "operator" "" { target *-*-* } 427 }
// { dg-error "operator" "" { target *-*-* } 428 }
// { dg-error "operator" "" { target *-*-* } 429 }
+// { dg-error "operator" "" { target *-*-* } 430 }
// { dg-excess-errors "In file included from" }
Index: testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
===================================================================
--- testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
(revision 172300)
+++ testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
(working copy)
@@ -2,7 +2,7 @@
// { dg-do compile }
// -*- C++ -*-
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@@ -28,6 +28,6 @@
return 0;
}
-// { dg-error "operator" "" { target *-*-* } 384 }
// { dg-error "operator" "" { target *-*-* } 385 }
// { dg-error "operator" "" { target *-*-* } 386 }
+// { dg-error "operator" "" { target *-*-* } 387 }
Index: testsuite/29_atomics/atomic/cons/assign_neg.cc
===================================================================
--- testsuite/29_atomics/atomic/cons/assign_neg.cc (revision 172300)
+++ testsuite/29_atomics/atomic/cons/assign_neg.cc (working copy)
@@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 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
@@ -28,5 +28,5 @@
return 0;
}
-// { dg-error "deleted" "" { target *-*-* } 571 }
+// { dg-error "deleted" "" { target *-*-* } 572 }
// { dg-prune-output "include" }
Index: testsuite/29_atomics/atomic/cons/copy_neg.cc
===================================================================
--- testsuite/29_atomics/atomic/cons/copy_neg.cc (revision 172300)
+++ testsuite/29_atomics/atomic/cons/copy_neg.cc (working copy)
@@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 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
@@ -28,5 +28,5 @@
return 0;
}
-// { dg-error "deleted" "" { target *-*-* } 610 }
+// { dg-error "deleted" "" { target *-*-* } 611 }
// { dg-prune-output "include" }
Index: testsuite/util/testsuite_common_types.h
===================================================================
--- testsuite/util/testsuite_common_types.h (revision 172300)
+++ testsuite/util/testsuite_common_types.h (working copy)
@@ -1,7 +1,7 @@
// -*- C++ -*-
// typelist for the C++ library testsuite.
//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -37,6 +37,7 @@
#include <list>
#include <deque>
#include <string>
+#include <limits>
#include <map>
#include <set>
