diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-07-22 14:48:27 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-07-27 12:04:18 +0100 |
| commit | 16158c96496b537194111526d25e19f268d613b6 (patch) | |
| tree | 4b77042b0fb21913b7a7e550b24390a5940b8aae /libstdc++-v3/include/std/regex | |
| parent | 261d5a4a459bd49942e53bc83334ccc7154a09d5 (diff) | |
| download | gcc-16158c96496b537194111526d25e19f268d613b6.zip gcc-16158c96496b537194111526d25e19f268d613b6.tar.gz gcc-16158c96496b537194111526d25e19f268d613b6.tar.bz2 | |
libstdc++: Remove unnecessary uses of <utility>
The <algorithm> header includes <utility>, with a comment referring to
UK-300, a National Body comment on the C++11 draft. That comment
proposed to move std::swap to <utility> and then require <algorithm> to
include <utility>. The comment was rejected, so we do not need to
implement the suggestion. For backwards compatibility with C++03 we do
want <algorithm> to define std::swap, but it does so anyway via
<bits/move.h>. We don't need the whole of <utility> to do that.
A few other headers that need std::swap can include <bits/move.h> to
get it, instead of <utility>.
There are several headers that include <utility> to get std::pair, but
they can use <bits/stl_pair.h> to get it without also including the
rel_ops namespace and other contents of <utility>.
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* include/std/algorithm: Do not include <utility>.
* include/std/functional: Likewise.
* include/std/regex: Include <bits/stl_pair.h> instead of
<utility>.
* include/debug/map.h: Likewise.
* include/debug/multimap.h: Likewise.
* include/debug/multiset.h: Likewise.
* include/debug/set.h: Likewise.
* include/debug/vector: Likewise.
* include/bits/fs_path.h: Likewise.
* include/bits/unique_ptr.h: Do not include <utility>.
* include/experimental/any: Likewise.
* include/experimental/executor: Likewise.
* include/experimental/memory: Likewise.
* include/experimental/optional: Likewise.
* include/experimental/socket: Use __exchange instead
of std::exchange.
* src/filesystem/ops-common.h: Likewise.
* testsuite/20_util/default_delete/48631_neg.cc: Adjust expected
errors to not use a hardcoded line number.
* testsuite/20_util/default_delete/void_neg.cc: Likewise.
* testsuite/20_util/specialized_algorithms/uninitialized_copy/constrained.cc:
Include <utility> for std::as_const.
* testsuite/20_util/specialized_algorithms/uninitialized_default_construct/constrained.cc:
Likewise.
* testsuite/20_util/specialized_algorithms/uninitialized_move/constrained.cc:
Likewise.
* testsuite/20_util/specialized_algorithms/uninitialized_value_construct/constrained.cc:
Likewise.
* testsuite/23_containers/vector/cons/destructible_debug_neg.cc:
Adjust dg-error line number.
Diffstat (limited to 'libstdc++-v3/include/std/regex')
| -rw-r--r-- | libstdc++-v3/include/std/regex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex index cd33f26..e623a6e 100644 --- a/libstdc++-v3/include/std/regex +++ b/libstdc++-v3/include/std/regex @@ -47,7 +47,6 @@ #include <stack> #include <stdexcept> #include <string> -#include <utility> #include <vector> #include <map> #include <cstring> @@ -55,6 +54,7 @@ #include <ext/aligned_buffer.h> #include <ext/numeric_traits.h> #include <bits/std_function.h> +#include <bits/stl_pair.h> #include <bits/regex_constants.h> #include <bits/regex_error.h> #include <bits/regex_automaton.h> |