From 8eb60b2f2254eee16d44ed5169837743b0debd5a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 26 Sep 2019 17:08:24 +0100 Subject: [PATCH] Remove include directives for deleted Profile Mode headers * include/std/array: Remove references to profile mode. * include/std/bitset: Likewise. * include/std/deque: Likewise. * include/std/forward_list: Likewise. * include/std/list: Likewise. * include/std/map: Likewise. * include/std/set: Likewise. * include/std/unordered_map: Likewise. * include/std/unordered_set: Likewise. * include/std/vector: Likewise. * testsuite/17_intro/headers/c++1998/profile_mode.cc: New test. * testsuite/17_intro/headers/c++2011/profile_mode.cc: New test. From-SVN: r276152 --- libstdc++-v3/ChangeLog | 15 ++++++++++++ libstdc++-v3/include/std/array | 4 ---- libstdc++-v3/include/std/bitset | 4 ---- libstdc++-v3/include/std/deque | 4 ---- libstdc++-v3/include/std/forward_list | 4 ---- libstdc++-v3/include/std/list | 4 ---- libstdc++-v3/include/std/map | 4 ---- libstdc++-v3/include/std/set | 4 ---- libstdc++-v3/include/std/unordered_map | 4 ---- libstdc++-v3/include/std/unordered_set | 4 ---- libstdc++-v3/include/std/vector | 4 ---- .../17_intro/headers/c++1998/profile_mode.cc | 23 +++++++++++++++++++ .../17_intro/headers/c++2011/profile_mode.cc | 23 +++++++++++++++++++ 13 files changed, 61 insertions(+), 40 deletions(-) create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd46ef31eab..5d2349bcb7b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2019-09-26 Jonathan Wakely + + * include/std/array: Remove references to profile mode. + * include/std/bitset: Likewise. + * include/std/deque: Likewise. + * include/std/forward_list: Likewise. + * include/std/list: Likewise. + * include/std/map: Likewise. + * include/std/set: Likewise. + * include/std/unordered_map: Likewise. + * include/std/unordered_set: Likewise. + * include/std/vector: Likewise. + * testsuite/17_intro/headers/c++1998/profile_mode.cc: New test. + * testsuite/17_intro/headers/c++2011/profile_mode.cc: New test. + 2019-09-25 Jonathan Wakely * include/bits/regex.h diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index a380f523d44..b1dc8887787 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -422,10 +422,6 @@ _GLIBCXX_END_NAMESPACE_VERSION # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #endif // C++11 #endif // _GLIBCXX_ARRAY diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index d6958301e8a..ef4a91a0c15 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -1593,8 +1593,4 @@ _GLIBCXX_END_NAMESPACE_VERSION # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #endif /* _GLIBCXX_BITSET */ diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque index ed4927e13b7..3f8e9abe032 100644 --- a/libstdc++-v3/include/std/deque +++ b/libstdc++-v3/include/std/deque @@ -72,10 +72,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list index 9d6cc40593b..39c3f4438de 100644 --- a/libstdc++-v3/include/std/forward_list +++ b/libstdc++-v3/include/std/forward_list @@ -43,10 +43,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list index 8d6ac198c9a..35c9d44a39e 100644 --- a/libstdc++-v3/include/std/list +++ b/libstdc++-v3/include/std/list @@ -67,10 +67,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/map b/libstdc++-v3/include/std/map index 0da7c895aac..0eb4f80f93f 100644 --- a/libstdc++-v3/include/std/map +++ b/libstdc++-v3/include/std/map @@ -67,10 +67,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/set b/libstdc++-v3/include/std/set index a9ce58c4574..4213a4a01b8 100644 --- a/libstdc++-v3/include/std/set +++ b/libstdc++-v3/include/std/set @@ -67,10 +67,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map index 60f9bd7a6a6..eb69240a94f 100644 --- a/libstdc++-v3/include/std/unordered_map +++ b/libstdc++-v3/include/std/unordered_map @@ -52,10 +52,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set index 90438738614..a28b840c136 100644 --- a/libstdc++-v3/include/std/unordered_set +++ b/libstdc++-v3/include/std/unordered_set @@ -52,10 +52,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vector index e5e13ab3ef7..c15faf1da9a 100644 --- a/libstdc++-v3/include/std/vector +++ b/libstdc++-v3/include/std/vector @@ -76,10 +76,6 @@ # include #endif -#ifdef _GLIBCXX_PROFILE -# include -#endif - #if __cplusplus >= 201703L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc new file mode 100644 index 00000000000..d8749f817f7 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc @@ -0,0 +1,23 @@ +// Copyright (C) 2019 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 +// . + +// { dg-options "-std=gnu++98" } +// { dg-do compile } + +// This macro should have no effect now +#define _GLIBCXX_PROFILE 1 +#include diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc new file mode 100644 index 00000000000..4cf7c5dd104 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc @@ -0,0 +1,23 @@ +// Copyright (C) 2019 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 +// . + +// { dg-options "-std=gnu++11" } +// { dg-do compile { target c++11 } } + +// This macro should have no effect now +#define _GLIBCXX_PROFILE 1 +#include