From cb2168c9660ac9d920b4c68a8b31a411fe6abe42 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik <bkoz@redhat.com> Date: Thu, 16 Dec 2010 22:02:38 +0000 Subject: testsuite_iterators.h: Guard move.h includes. 2010-11-16 Benjamin Kosnik <bkoz@redhat.com> * testsuite/util/testsuite_iterators.h: Guard move.h includes. * testsuite/util/testsuite_allocator.h: Same. * testsuite/20_util/temporary_buffer.cc: Use typedef, qualify. * testsuite/ext/pb_ds/regression/hash_data_map_rand.cc: Define PB_DS_REGRESSION in the source file. * testsuite/ext/pb_ds/regression/trie_data_map_rand.cc: Same. * testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc: Same. * testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc: Same. * testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Same. * testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc: Same. * testsuite/ext/pb_ds/regression/priority_queue_rand.cc: Same. * testsuite/ext/pb_ds/regression/tree_data_map_rand.cc: Same. * testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc: Same. * testsuite/21_strings/c_strings/wchar_t/3_neg.cc: Move to this. Use _neg suffix. * testsuite/21_strings/c_strings/wchar_t/3.cc: ...from this. * testsuite/21_strings/c_strings/char/3_neg.cc: Same. * testsuite/21_strings/c_strings/char/3.cc: Same. * testsuite/ext/slist/23781_neg.cc: Same. * testsuite/ext/slist/23781.cc: Same. * testsuite/ext/profile/mutex_extensions.cc: Same. * testsuite/ext/profile/mutex_extensions_neg.cc: Same. * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc: Same. * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same. * testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc: Same. * testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc: Same. * testsuite/23_containers/multimap/23781_neg.cc: Same. * testsuite/23_containers/multimap/23781.cc: Same. * testsuite/23_containers/set/23781_neg.cc: Same. * testsuite/23_containers/set/23781.cc: Same. * testsuite/23_containers/multiset/23781_neg.cc: Same. * testsuite/23_containers/multiset/23781.cc: Same. * testsuite/23_containers/list/23781_neg.cc: Same. * testsuite/23_containers/list/23781.cc: Same. * testsuite/23_containers/map/23781_neg.cc: Same. * testsuite/23_containers/map/23781.cc: Same. * testsuite/20_util/duration/cons/dr974_neg.cc: Same. * testsuite/20_util/duration/cons/dr974.cc: Same. * testsuite/20_util/tuple/comparison_operators/35480_neg.cc: Same. * testsuite/20_util/tuple/comparison_operators/35480.cc: Same. * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same. * testsuite/20_util/shared_ptr/cons/43820.cc: Same. * testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc: Same. * testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc: Same. From-SVN: r167956 --- .../testsuite/21_strings/c_strings/char/3.cc | 54 ---------------------- .../testsuite/21_strings/c_strings/char/3_neg.cc | 54 ++++++++++++++++++++++ .../testsuite/21_strings/c_strings/wchar_t/3.cc | 52 --------------------- .../21_strings/c_strings/wchar_t/3_neg.cc | 52 +++++++++++++++++++++ 4 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc create mode 100644 libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc delete mode 100644 libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc create mode 100644 libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc (limited to 'libstdc++-v3/testsuite/21_strings') diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc deleted file mode 100644 index 3b25438..0000000 --- a/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc +++ /dev/null @@ -1,54 +0,0 @@ -// { dg-do compile { target correct_iso_cpp_string_wchar_protos } } -// { dg-options "-O2" } - -// Copyright (C) 2009 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 of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <cstring> - -const char *cc1, *cc2; -char *c1, *c2; -const void *cv1, *cv2; -void *v1, *v2; - -void -test01 () -{ - v1 = std::memchr (v2, '/', 3); - c1 = std::strchr (c2, '/'); - c1 = std::strrchr (c2, 'c'); - c1 = std::strpbrk (c2, "abc"); - c1 = std::strstr (c2, "abc"); - - cv1 = std::memchr (v2, '/', 3); - cc1 = std::strchr (c2, '/'); - cc1 = std::strrchr (c2, 'c'); - cc1 = std::strpbrk (c2, "abc"); - cc1 = std::strstr (c2, "abc"); - - v1 = std::memchr (cv2, '/', 3); // { dg-error "invalid conversion" } - c1 = std::strchr (cc2, '/'); // { dg-error "invalid conversion" } - c1 = std::strrchr (cc2, 'c'); // { dg-error "invalid conversion" } - c1 = std::strpbrk (cc2, "abc"); // { dg-error "invalid conversion" } - c1 = std::strstr (cc2, "abc"); // { dg-error "invalid conversion" } - - cv1 = std::memchr (cv2, '/', 3); - cc1 = std::strchr (cc2, '/'); - cc1 = std::strrchr (cc2, 'c'); - cc1 = std::strpbrk (cc2, "abc"); - cc1 = std::strstr (cc2, "abc"); -} diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc new file mode 100644 index 0000000..3b25438 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc @@ -0,0 +1,54 @@ +// { dg-do compile { target correct_iso_cpp_string_wchar_protos } } +// { dg-options "-O2" } + +// Copyright (C) 2009 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 of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <cstring> + +const char *cc1, *cc2; +char *c1, *c2; +const void *cv1, *cv2; +void *v1, *v2; + +void +test01 () +{ + v1 = std::memchr (v2, '/', 3); + c1 = std::strchr (c2, '/'); + c1 = std::strrchr (c2, 'c'); + c1 = std::strpbrk (c2, "abc"); + c1 = std::strstr (c2, "abc"); + + cv1 = std::memchr (v2, '/', 3); + cc1 = std::strchr (c2, '/'); + cc1 = std::strrchr (c2, 'c'); + cc1 = std::strpbrk (c2, "abc"); + cc1 = std::strstr (c2, "abc"); + + v1 = std::memchr (cv2, '/', 3); // { dg-error "invalid conversion" } + c1 = std::strchr (cc2, '/'); // { dg-error "invalid conversion" } + c1 = std::strrchr (cc2, 'c'); // { dg-error "invalid conversion" } + c1 = std::strpbrk (cc2, "abc"); // { dg-error "invalid conversion" } + c1 = std::strstr (cc2, "abc"); // { dg-error "invalid conversion" } + + cv1 = std::memchr (cv2, '/', 3); + cc1 = std::strchr (cc2, '/'); + cc1 = std::strrchr (cc2, 'c'); + cc1 = std::strpbrk (cc2, "abc"); + cc1 = std::strstr (cc2, "abc"); +} diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc deleted file mode 100644 index 2c875fd..0000000 --- a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc +++ /dev/null @@ -1,52 +0,0 @@ -// { dg-do compile { target correct_iso_cpp_string_wchar_protos } } -// { dg-options "-O2" } - -// Copyright (C) 2009 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 of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <cwchar> - -const wchar_t *cw1, *cw2; -wchar_t *w1, *w2; - -void -test01 () -{ - w1 = wmemchr (w2, L'/', 3); - w1 = wcschr (w2, L'/'); - w1 = wcspbrk (w2, L"abc"); - w1 = wcsrchr (w2, L'c'); - w1 = wcsstr (w2, L"abc"); - - cw1 = wmemchr (w2, L'/', 3); - cw1 = wcschr (w2, L'/'); - cw1 = wcspbrk (w2, L"abc"); - cw1 = wcsrchr (w2, L'c'); - cw1 = wcsstr (w2, L"abc"); - - w1 = wmemchr (cw2, L'/', 3); // { dg-error "invalid conversion" } - w1 = wcschr (cw2, L'/'); // { dg-error "invalid conversion" } - w1 = wcsrchr (cw2, L'c'); // { dg-error "invalid conversion" } - w1 = wcspbrk (cw2, L"abc"); // { dg-error "invalid conversion" } - w1 = wcsstr (cw2, L"abc"); // { dg-error "invalid conversion" } - - cw1 = wmemchr (cw2, L'/', 3); - cw1 = wcschr (cw2, L'/'); - cw1 = wcspbrk (cw2, L"abc"); - cw1 = wcsrchr (cw2, L'c'); - cw1 = wcsstr (cw2, L"abc"); -} diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc new file mode 100644 index 0000000..2c875fd --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc @@ -0,0 +1,52 @@ +// { dg-do compile { target correct_iso_cpp_string_wchar_protos } } +// { dg-options "-O2" } + +// Copyright (C) 2009 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 of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <cwchar> + +const wchar_t *cw1, *cw2; +wchar_t *w1, *w2; + +void +test01 () +{ + w1 = wmemchr (w2, L'/', 3); + w1 = wcschr (w2, L'/'); + w1 = wcspbrk (w2, L"abc"); + w1 = wcsrchr (w2, L'c'); + w1 = wcsstr (w2, L"abc"); + + cw1 = wmemchr (w2, L'/', 3); + cw1 = wcschr (w2, L'/'); + cw1 = wcspbrk (w2, L"abc"); + cw1 = wcsrchr (w2, L'c'); + cw1 = wcsstr (w2, L"abc"); + + w1 = wmemchr (cw2, L'/', 3); // { dg-error "invalid conversion" } + w1 = wcschr (cw2, L'/'); // { dg-error "invalid conversion" } + w1 = wcsrchr (cw2, L'c'); // { dg-error "invalid conversion" } + w1 = wcspbrk (cw2, L"abc"); // { dg-error "invalid conversion" } + w1 = wcsstr (cw2, L"abc"); // { dg-error "invalid conversion" } + + cw1 = wmemchr (cw2, L'/', 3); + cw1 = wcschr (cw2, L'/'); + cw1 = wcspbrk (cw2, L"abc"); + cw1 = wcsrchr (cw2, L'c'); + cw1 = wcsstr (cw2, L"abc"); +} -- cgit v1.1