From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Simplify fs::path construction using variable template
Date: Mon, 27 Jun 2022 11:17:07 +0100 [thread overview]
Message-ID: <20220627101707.33885-1-jwakely@redhat.com> (raw)
Tested powerpc64le-linux, pushed to trunk.
-- >8 --
libstdc++-v3/ChangeLog:
* include/bits/fs_path.h (__is_path_iter_src): Replace class
template with variable template.
---
libstdc++-v3/include/bits/fs_path.h | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h
index d6202fd275a..6e7b366d104 100644
--- a/libstdc++-v3/include/bits/fs_path.h
+++ b/libstdc++-v3/include/bits/fs_path.h
@@ -102,19 +102,16 @@ namespace __detail
#endif
template<typename _Iter_traits, typename = void>
- struct __is_path_iter_src
- : false_type
- { };
+ inline constexpr bool __is_path_iter_src = false;
template<typename _Iter_traits>
- struct __is_path_iter_src<_Iter_traits,
- void_t<typename _Iter_traits::value_type>>
- : bool_constant<__is_encoded_char<typename _Iter_traits::value_type>>
- { };
+ inline constexpr bool
+ __is_path_iter_src<_Iter_traits, void_t<typename _Iter_traits::value_type>>
+ = __is_encoded_char<typename _Iter_traits::value_type>;
template<typename _Source>
inline constexpr bool __is_path_src
- = __is_path_iter_src<iterator_traits<decay_t<_Source>>>::value;
+ = __is_path_iter_src<iterator_traits<decay_t<_Source>>>;
template<>
inline constexpr bool __is_path_src<path> = false;
@@ -150,7 +147,7 @@ namespace __detail
// SFINAE constraint for InputIterator parameters as required by [fs.req].
template<typename _Iter, typename _Tr = __safe_iterator_traits<_Iter>>
- using _Path2 = enable_if_t<__is_path_iter_src<_Tr>::value, path>;
+ using _Path2 = enable_if_t<__is_path_iter_src<_Tr>, path>;
#if __cpp_lib_concepts
template<typename _Iter>
--
2.36.1
reply other threads:[~2022-06-27 10:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220627101707.33885-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).