Patchwork [v3] libstdc++/50336

login
register
mail settings
Submitter Paolo Carlini
Date Sept. 8, 2011, 10:43 p.m.
Message ID <4E694527.2040507@oracle.com>
Download mbox | patch
Permalink /patch/113995/
State New
Headers show

Comments

Paolo Carlini - Sept. 8, 2011, 10:43 p.m.
Hi,

tested x86_64-linux, committed to mainline.

Thanks,
Paolo.

/////////////////////
2011-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/50336
	* include/bits/streambuf_iterator.h (class istreambuf_iterator):
	Implement LWG 445 in C++0x mode.
	* testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc:
	New.

Patch

Index: include/bits/streambuf_iterator.h
===================================================================
--- include/bits/streambuf_iterator.h	(revision 178712)
+++ include/bits/streambuf_iterator.h	(working copy)
@@ -51,7 +51,13 @@ 
   template<typename _CharT, typename _Traits>
     class istreambuf_iterator
     : public iterator<input_iterator_tag, _CharT, typename _Traits::off_type,
-		      _CharT*, _CharT&>
+                      _CharT*,
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+    // LWG 445.
+		      _CharT>
+#else
+		      _CharT&>
+#endif
     {
     public:
       // Types:
Index: testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc
===================================================================
--- testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc	(revision 0)
+++ testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc	(revision 0)
@@ -0,0 +1,27 @@ 
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// Copyright (C) 2011 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
+// <http://www.gnu.org/licenses/>.
+
+#include <type_traits>
+#include <iterator>
+
+using namespace std;
+
+// DR 445
+static_assert(is_same<istreambuf_iterator<char>::reference, char>::value, "");