OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix typo in std::wbuffer_convert 

Backport from mainline
2017-11-14  Jonathan Wakely  <jwakely@redhat.com>

	* include/bits/locale_conv.h (wbuffer_convert::_M_conv_get): Fix typo.
	* testsuite/22_locale/conversions/buffer/3.cc: New test.

From-SVN: r255323
This commit is contained in:
Jonathan Wakely 2017-12-01 17:11:59 +00:00 committed by Jonathan Wakely
parent 051af3f55f
commit 54482a130a
3 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,11 @@
2017-12-01 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
2017-11-14 Jonathan Wakely <jwakely@redhat.com>
* include/bits/locale_conv.h (wbuffer_convert::_M_conv_get): Fix typo.
* testsuite/22_locale/conversions/buffer/3.cc: New test.
Backport from mainline
2017-11-03 Jonathan Wakely <jwakely@redhat.com>

2
libstdc++-v3/include/bits/locale_conv.h
View File

@ -431,7 +431,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
streamsize __nbytes = sizeof(_M_get_buf) - _M_unconv;
__nbytes = std::min(__nbytes, _M_buf->in_avail());
if (__nbytes < 1)
__nbytes == 1;
__nbytes = 1;
__nbytes = _M_buf->sgetn(_M_get_buf + _M_unconv, __nbytes);
if (__nbytes < 1)
return false;

58
libstdc++-v3/testsuite/22_locale/conversions/buffer/3.cc Normal file
View File

@ -0,0 +1,58 @@
// Copyright (C) 2017 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/>.
// { dg-do run { target c++11 } }
#include <locale>
#include <streambuf>
#include <testsuite_hooks.h>
struct streambuf : std::streambuf
{
int_type underflow() override
{
if (c != '\0')
{
this->setg(&c, &c, &c + 1);
return *this->gptr();
}
c = '\0';
return traits_type::eof();
}
private:
char c = 'a';
};
struct codecvt : std::codecvt<wchar_t, char, std::mbstate_t> { };
void
test01()
{
// https://gcc.gnu.org/ml/libstdc++/2017-11/msg00022.html
streambuf sb;
std::wbuffer_convert<codecvt> conv(&sb);
VERIFY( sb.in_avail() == 0 );
wchar_t c = conv.sgetc();
VERIFY( c == L'a' );
}
int
main()
{
test01();
}