OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004-11-18 Paolo Carlini <pcarlini@suse.de>
[pf3gnuchains/gcc-fork.git]
/
libstdc++-v3
/
include
/
bits
/
locale_facets.tcc
diff --git
a/libstdc++-v3/include/bits/locale_facets.tcc
b/libstdc++-v3/include/bits/locale_facets.tcc
index
8216978
..
b503c95
100644
(file)
--- a/
libstdc++-v3/include/bits/locale_facets.tcc
+++ b/
libstdc++-v3/include/bits/locale_facets.tcc
@@
-825,8
+825,6
@@
namespace std
if (!(__err & ios_base::failbit))
__v = reinterpret_cast<void*>(__ul);
if (!(__err & ios_base::failbit))
__v = reinterpret_cast<void*>(__ul);
- else
- __err |= ios_base::failbit;
return __beg;
}
return __beg;
}
@@
-1481,16
+1479,15
@@
namespace std
__testvalid = false;
}
__testvalid = false;
}
- // Iff no more characters are available.
- if (__beg == __end)
- __err |= ios_base::eofbit;
-
// Iff valid sequence is not recognized.
if (!__testvalid)
__err |= ios_base::failbit;
else
__units.swap(__res);
// Iff valid sequence is not recognized.
if (!__testvalid)
__err |= ios_base::failbit;
else
__units.swap(__res);
+ // Iff no more characters are available.
+ if (__beg == __end)
+ __err |= ios_base::eofbit;
return __beg;
}
return __beg;
}