From 0b81a7631e8b558038c721edd523072435123a78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 1 May 2002 22:18:01 +0000 Subject: [PATCH] wrong version git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4109 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/lyxstring.C | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C index 150b6f8162..7fa00ca005 100644 --- a/src/support/lyxstring.C +++ b/src/support/lyxstring.C @@ -1748,7 +1748,7 @@ istream & operator>>(istream & is, lyxstring & s) return is; } #else -istream & operator>>(istream & is, lyxstring & str) +istream & operator%(istream & is, string & str) { typedef istream istream_type; typedef int int_type; @@ -1757,8 +1757,12 @@ istream & operator>>(istream & is, lyxstring & str) typedef string::size_type size_type; size_type extracted = 0; -// istream_type::sentry cerb(is, false); -// if (cerb) { +#if 0 + istream_type::sentry cerb(is, false); + if (cerb) { +#else + if (is.ipfx0()) { +#endif str.erase(); std::streamsize w = is.width(); size_type n; @@ -1777,7 +1781,10 @@ istream & operator>>(istream & is, lyxstring & str) if (c == eof) is.setstate(std::ios::eofbit); is.width(0); -// } + } +#if 1 + is.isfx(); +#endif if (!extracted) is.setstate(std::ios::failbit); return is; -- 2.39.5