From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id CB5663858404; Mon, 23 Aug 2021 16:08:12 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB5663858404
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 r10-10059] libstdc++: Add default template argument to
 basic_istream_view
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-10
X-Git-Oldrev: f27d2ed875fbddfad1879ea8ea52ff531cb156dd
X-Git-Newrev: 7b100eb97b64e54ac20a6a6438c9d6903d432592
Message-Id: <20210823160812.CB5663858404@sourceware.org>
Date: Mon, 23 Aug 2021 16:08:12 +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, 23 Aug 2021 16:08:12 -0000

https://gcc.gnu.org/g:7b100eb97b64e54ac20a6a6438c9d6903d432592

commit r10-10059-g7b100eb97b64e54ac20a6a6438c9d6903d432592
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Aug 23 16:16:05 2021 +0100

    libstdc++: Add default template argument to basic_istream_view
    
    The standard shows this default template argument in the <ranges>
    synopsis, but it was missing in libstdc++.
    
    libstdc++-v3/ChangeLog:
    
            * include/std/ranges (basic_istream_view): Add default template
            argument.
            * testsuite/std/ranges/istream_view.cc: Check it.
    
    (cherry picked from commit 1a129376bbc26d3c30af3c1ae6036e2e1446db40)

Diff:
---
 libstdc++-v3/include/std/ranges                   |  3 ++-
 libstdc++-v3/testsuite/std/ranges/istream_view.cc | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 29fd613cb8d..dc619fcd494 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -951,7 +951,8 @@ namespace views
 	= requires(basic_istream<_CharT, _Traits>& is, _Val& t) { is >> t; };
   } // namespace __detail
 
-  template<movable _Val, typename _CharT, typename _Traits>
+  template<movable _Val, typename _CharT,
+	   typename _Traits = char_traits<_CharT>>
     requires default_initializable<_Val>
       && __detail::__stream_extractable<_Val, _CharT, _Traits>
     class basic_istream_view
diff --git a/libstdc++-v3/testsuite/std/ranges/istream_view.cc b/libstdc++-v3/testsuite/std/ranges/istream_view.cc
index f74e05e347a..77df686aa4a 100644
--- a/libstdc++-v3/testsuite/std/ranges/istream_view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/istream_view.cc
@@ -83,6 +83,15 @@ test04()
   static_assert(!std::forward_iterator<It>);
 }
 
+void
+test06()
+{
+  // Default template argument
+  using V = std::ranges::basic_istream_view<int, char>;
+  using W = std::ranges::basic_istream_view<int, char, std::char_traits<char>>;
+  static_assert( std::is_same_v<V, W> );
+}
+
 int
 main()
 {
@@ -90,4 +99,5 @@ main()
   test02();
   test03();
   test04();
+  test06();
 }