diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d394f73ad1e..ac4215cc867 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2011-09-09 Paolo Carlini + + 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. + 2011-09-08 Dodji Seketeli PR c++/33255 - Support -Wunused-local-typedefs warning diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index 5540ca146b0..3c8014e89fa 100644 --- a/libstdc++-v3/include/bits/streambuf_iterator.h +++ b/libstdc++-v3/include/bits/streambuf_iterator.h @@ -51,7 +51,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class istreambuf_iterator : public iterator + _CharT*, +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + // LWG 445. + _CharT> +#else + _CharT&> +#endif { public: // Types: diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc new file mode 100644 index 00000000000..88d37bbf7b6 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/dr445.cc @@ -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 +// . + +#include +#include + +using namespace std; + +// DR 445 +static_assert(is_same::reference, char>::value, "");