summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/std
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-31 18:46:23 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-31 18:46:23 +0000
commit39706bc97269366073d2eb4cf3ecf7872513627d (patch)
tree96e975b37b34c43a58b8e1ab99672bfa8c0daf77 /libstdc++-v3/include/std
parentaeebd7a5d8e91d309070757e9732127e28527512 (diff)
downloadppe42-gcc-39706bc97269366073d2eb4cf3ecf7872513627d.tar.gz
ppe42-gcc-39706bc97269366073d2eb4cf3ecf7872513627d.zip
2014-03-31 Lars Gullik Bjønnes <larsbj@gullik.org>
Jonathan Wakely <jwakely@redhat.com> PR libstdc++/60270 * include/std/iomanip (_Quoted_string operator>>): Do not clear string if input is not quoted. * testsuite/27_io/manipulators/standard/char/60270.cc: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208966 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std')
-rw-r--r--libstdc++-v3/include/std/iomanip3
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip
index b2c7b951bc2..73822db9b20 100644
--- a/libstdc++-v3/include/std/iomanip
+++ b/libstdc++-v3/include/std/iomanip
@@ -415,8 +415,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
const _Quoted_string<basic_string<_CharT, _Traits, _Alloc>&,
_CharT>& __str)
{
- __str._M_string.clear();
-
_CharT __c;
__is >> __c;
if (!__is.good())
@@ -427,6 +425,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
__is >> __str._M_string;
return __is;
}
+ __str._M_string.clear();
std::ios_base::fmtflags __flags
= __is.flags(__is.flags() & ~std::ios_base::skipws);
do
OpenPOWER on IntegriCloud