aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2003-10-24 20:21:48 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2003-10-24 20:21:48 +0000
commiteebf21ef9940f507365b505fcd2fb290cc7c38b7 (patch)
treebb9b727a8c29b45955f6b757c5a9d970afeb4dbf
parentf2d0e05d4ea16b313d4779b1a00311da98ffe178 (diff)
downloadgcc-eebf21ef9940f507365b505fcd2fb290cc7c38b7.zip
gcc-eebf21ef9940f507365b505fcd2fb290cc7c38b7.tar.gz
gcc-eebf21ef9940f507365b505fcd2fb290cc7c38b7.tar.bz2
locale_facets.tcc (__verify_grouping): Prefer '=' to an unnecessary '&='.
2003-10-24 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (__verify_grouping): Prefer '=' to an unnecessary '&='. From-SVN: r72908
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/locale_facets.tcc4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index eecb7bc..999cadb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2003-10-24 Paolo Carlini <pcarlini@suse.de>
+ * include/bits/locale_facets.tcc (__verify_grouping):
+ Prefer '=' to an unnecessary '&='.
+
+2003-10-24 Paolo Carlini <pcarlini@suse.de>
+
* include/bits/basic_ios.tcc (copyfmt(const basic_ios&)):
Tweak my fix for libstdc++/12657.
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 5e8128e..4804e9b 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -2264,8 +2264,8 @@ namespace std
// numpunct::grouping string exactly, starting at the
// right-most point of the parsed sequence of elements ...
while (__test && __i < __n - 1)
- for (__j = 0; __test && __j < __len && __i < __n - 1; ++__j,++__i)
- __test &= __grouping[__j] == __grouping_tmp[__n - __i - 1];
+ for (__j = 0; __test && __j < __len && __i < __n - 1; ++__j, ++__i)
+ __test = __grouping[__j] == __grouping_tmp[__n - __i - 1];
// ... but the last parsed grouping can be <= numpunct
// grouping.
__j == __len ? __j = 0 : __j;