git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 Upstream-Status: Inappropriate [Backport]
   2 From 872b1920a12548af70c3866daadc4a67d05416b1 Mon Sep 17 00:00:00 2001
   3 From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
   4 Date: Tue, 12 Apr 2011 09:05:41 +0000
   5 Subject: [PATCH 107/200] 2011-04-12  Allan McRae  <allan@archlinux.org>
   6
   7         PR libstdc++/48566
   8         * testsuite/tr1/6_containers/unordered_map/requirements/
   9         iterator_null_neg.cc: Include <cstddef>.
  10         * testsuite/tr1/6_containers/unordered_set/requirements/
  11         iterator_null_neg.cc: Likewise.
  12         * testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc: Include
  13         <cstring>.
  14         * testsuite/util/testsuite_common_types.h: Include <limits>.
  15         * testsuite/29_atomics/atomic_integral/cons/assign_neg.cc:
  16         Adjust dg-error line numbers.
  17         * testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Likewise.
  18         * testsuite/29_atomics/atomic_integral/operators/increment_neg.cc:
  19         Likewise.
  20         * testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc:
  21         Likewise.
  22         * testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc:
  23         Likewise.
  24         * testsuite/29_atomics/atomic/cons/assign_neg.cc: Likewise.
  25         * testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise.
  26
  27
  28 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172304 138bc75d-0d04-0410-961f-82ee72b054a4
  29
  30 index a6bba98..245f18f 100644
  31 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
  32 +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
  33 @@ -1,6 +1,6 @@
  34  // { dg-require-fileio "" }
  35
  36 -// Copyright (C) 2010 Free Software Foundation, Inc.
  37 +// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
  38  //
  39  // This file is part of the GNU ISO C++ Library.  This library is free
  40  // software; you can redistribute it and/or modify it under the
  41 @@ -21,6 +21,7 @@
  42
  43  #include <fstream>
  44  #include <cwchar>
  45 +#include <cstring>
  46  #include <testsuite_hooks.h>
  47
  48  void test01()
  49 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
  50 index 6b04cf8..68b64f0 100644
  51 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
  52 +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
  53 @@ -1,7 +1,7 @@
  54  // { dg-options "-std=gnu++0x" }
  55  // { dg-do compile }
  56
  57 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
  58 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  59  //
  60  // This file is part of the GNU ISO C++ Library.  This library is free
  61  // software; you can redistribute it and/or modify it under the
  62 @@ -28,5 +28,5 @@ int main()
  63    return 0;
  64  }
  65
  66 -// { dg-error "deleted" "" { target *-*-* } 571 }
  67 +// { dg-error "deleted" "" { target *-*-* } 572 }
  68  // { dg-prune-output "include" }
  69 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
  70 index cdd95fd..79182bb 100644
  71 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
  72 +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
  73 @@ -1,7 +1,7 @@
  74  // { dg-options "-std=gnu++0x" }
  75  // { dg-do compile }
  76
  77 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
  78 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  79  //
  80  // This file is part of the GNU ISO C++ Library.  This library is free
  81  // software; you can redistribute it and/or modify it under the
  82 @@ -28,5 +28,5 @@ int main()
  83    return 0;
  84  }
  85
  86 -// { dg-error "deleted" "" { target *-*-* } 610 }
  87 +// { dg-error "deleted" "" { target *-*-* } 611 }
  88  // { dg-prune-output "include" }
  89 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
  90 index 265878d..306fd4c 100644
  91 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
  92 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
  93 @@ -1,7 +1,7 @@
  94  // { dg-options "-std=gnu++0x" }
  95  // { dg-do compile }
  96
  97 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
  98 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  99  //
 100  // This file is part of the GNU ISO C++ Library.  This library is free
 101  // software; you can redistribute it and/or modify it under the
 102 @@ -29,5 +29,5 @@ int main()
 103    return 0;
 104  }
 105
 106 -// { dg-error "deleted" "" { target *-*-* } 571 }
 107 +// { dg-error "deleted" "" { target *-*-* } 572 }
 108  // { dg-prune-output "include" }
 109 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
 110 index acb8006..56a41d1 100644
 111 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
 112 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
 113 @@ -1,7 +1,7 @@
 114  // { dg-options "-std=gnu++0x" }
 115  // { dg-do compile }
 116
 117 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 118 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 119  //
 120  // This file is part of the GNU ISO C++ Library.  This library is free
 121  // software; you can redistribute it and/or modify it under the
 122 @@ -29,5 +29,5 @@ int main()
 123    return 0;
 124  }
 125
 126 -// { dg-error "deleted" "" { target *-*-* } 610 }
 127 +// { dg-error "deleted" "" { target *-*-* } 611 }
 128  // { dg-prune-output "include" }
 129 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
 130 index b2f1ea4..4ee4e7f 100644
 131 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
 132 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc
 133 @@ -2,7 +2,7 @@
 134  // { dg-do compile }
 135  // -*- C++ -*-
 136
 137 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 138 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 139
 140  // This library is free software; you can redistribute it and/or
 141  // modify it under the terms of the GNU General Public License as
 142 @@ -27,7 +27,7 @@ int main()
 143    return 0;
 144  }
 145
 146 -// { dg-error "operator" "" { target *-*-* } 427 }
 147  // { dg-error "operator" "" { target *-*-* } 428 }
 148  // { dg-error "operator" "" { target *-*-* } 429 }
 149 +// { dg-error "operator" "" { target *-*-* } 430 }
 150  // { dg-excess-errors "In file included from" }
 151 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
 152 index dd84c83..3e0a975 100644
 153 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
 154 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc
 155 @@ -2,7 +2,7 @@
 156  // { dg-do compile }
 157  // -*- C++ -*-
 158
 159 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 160 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 161
 162  // This library is free software; you can redistribute it and/or
 163  // modify it under the terms of the GNU General Public License as
 164 @@ -28,6 +28,6 @@ int main()
 165    return 0;
 166  }
 167
 168 -// { dg-error "operator" "" { target *-*-* } 384 }
 169  // { dg-error "operator" "" { target *-*-* } 385 }
 170  // { dg-error "operator" "" { target *-*-* } 386 }
 171 +// { dg-error "operator" "" { target *-*-* } 387 }
 172 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
 173 index 90b7555..5047be7 100644
 174 --- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
 175 +++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/operators/increment_neg.cc
 176 @@ -2,7 +2,7 @@
 177  // { dg-do compile }
 178  // -*- C++ -*-
 179
 180 -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 181 +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 182
 183  // This library is free software; you can redistribute it and/or
 184  // modify it under the terms of the GNU General Public License as
 185 @@ -28,6 +28,6 @@ int main()
 186    return 0;
 187  }
 188
 189 -// { dg-error "operator" "" { target *-*-* } 362 }
 190  // { dg-error "operator" "" { target *-*-* } 363 }
 191  // { dg-error "operator" "" { target *-*-* } 364 }
 192 +// { dg-error "operator" "" { target *-*-* } 365 }
 193 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
 194 index 97b4b67..882ca36 100644
 195 --- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
 196 +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc
 197 @@ -1,6 +1,6 @@
 198  // 2005-09-10  Paolo Carlini  <pcarlini@suse.de>
 199  //
 200 -// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
 201 +// Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
 202  //
 203  // This file is part of the GNU ISO C++ Library.  This library is free
 204  // software; you can redistribute it and/or modify it under the
 205 @@ -22,6 +22,7 @@
 206
 207  // libstdc++/23781
 208  #include <tr1/unordered_map>
 209 +#include <cstddef>
 210
 211  std::tr1::unordered_map<int, int>::iterator it1 = NULL; // { dg-error "conversion" }
 212  std::tr1::unordered_map<int, int>::const_iterator cit1 = NULL; // { dg-error "conversion" }
 213 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
 214 index bf2f4ff..a0747ec 100644
 215 --- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
 216 +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc
 217 @@ -1,6 +1,6 @@
 218  // 2005-09-10  Paolo Carlini  <pcarlini@suse.de>
 219  //
 220 -// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
 221 +// Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
 222  //
 223  // This file is part of the GNU ISO C++ Library.  This library is free
 224  // software; you can redistribute it and/or modify it under the
 225 @@ -22,6 +22,7 @@
 226
 227  // libstdc++/23781
 228  #include <tr1/unordered_set>
 229 +#include <cstddef>
 230
 231  std::tr1::unordered_set<int>::iterator it4 = NULL; // { dg-error "conversion" }
 232  std::tr1::unordered_set<int>::const_iterator cit4 = NULL; // { dg-error "conversion" }
 233 diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
 234 index f597da2..a4f59ac 100644
 235 --- a/libstdc++-v3/testsuite/util/testsuite_common_types.h
 236 +++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
 237 @@ -1,7 +1,7 @@
 238  // -*- C++ -*-
 239  // typelist for the C++ library testsuite.
 240  //
 241 -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
 242 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 243  // Free Software Foundation, Inc.
 244  //
 245  // This file is part of the GNU ISO C++ Library.  This library is free
 246 @@ -37,6 +37,7 @@
 247  #include <list>
 248  #include <deque>
 249  #include <string>
 250 +#include <limits>
 251
 252  #include <map>
 253  #include <set>
 254 --
 255 1.7.0.4
 256