From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id 6BF98386F0FF; Mon, 27 Jun 2022 10:16:42 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6BF98386F0FF
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-1286] libstdc++: Simplify fs::path construction using
 variable template
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 48099f7dafe8d10e92ddfc88c0fd5bfbb435d3d6
X-Git-Newrev: 6177f60d914abcb8520b87ae62658e70a7c13759
Message-Id: <20220627101642.6BF98386F0FF@sourceware.org>
Date: Mon, 27 Jun 2022 10:16:42 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2022 10:16:42 -0000

https://gcc.gnu.org/g:6177f60d914abcb8520b87ae62658e70a7c13759

commit r13-1286-g6177f60d914abcb8520b87ae62658e70a7c13759
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Jun 23 18:39:50 2022 +0100

    libstdc++: Simplify fs::path construction using variable template
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/fs_path.h (__is_path_iter_src): Replace class
            template with variable template.

Diff:
---
 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>