locale_facets.tcc: Formatting tweaks.

2001-11-27  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/locale_facets.tcc: Formatting tweaks.

	* testsuite/23_containers/map_operators.cc: Don't xfail.
	* testsuite/23_containers/set_operators.cc: Same.

From-SVN: r47400
This commit is contained in:
Benjamin Kosnik 2001-11-28 06:35:00 +00:00 committed by Benjamin Kosnik
parent ec9d6e9f45
commit 5fd0af8754
4 changed files with 14 additions and 20 deletions

View File

@ -1,3 +1,10 @@
2001-11-27 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.tcc: Formatting tweaks.
* testsuite/23_containers/map_operators.cc: Don't xfail.
* testsuite/23_containers/set_operators.cc: Same.
2001-11-27 Loren J. Rittle <ljrittle@acm.org>
Paolo Carlini <pcarlini@unitus.it>

View File

@ -403,7 +403,6 @@ namespace std
if (__beg == __end)
__err |= ios_base::eofbit;
}
return __beg;
}
#endif
@ -430,7 +429,6 @@ namespace std
__v = __l;
else
__err |= ios_base::failbit;
return __beg;
}
@ -457,7 +455,6 @@ namespace std
__v = static_cast<unsigned short>(__ul);
else
__err |= ios_base::failbit;
return __beg;
}
@ -484,7 +481,6 @@ namespace std
__v = static_cast<unsigned int>(__ul);
else
__err |= ios_base::failbit;
return __beg;
}
@ -510,7 +506,6 @@ namespace std
__v = __ul;
else
__err |= ios_base::failbit;
return __beg;
}
@ -537,7 +532,6 @@ namespace std
__v = __ll;
else
__err |= ios_base::failbit;
return __beg;
}
@ -563,7 +557,6 @@ namespace std
__v = __ull;
else
__err |= ios_base::failbit;
return __beg;
}
#endif
@ -593,7 +586,6 @@ namespace std
__v = __f;
else
__err |= ios_base::failbit;
return __beg;
}
@ -618,7 +610,6 @@ namespace std
__v = __d;
else
__err |= ios_base::failbit;
return __beg;
}
@ -665,7 +656,6 @@ namespace std
#endif
else
__err |= ios_base::failbit;
return __beg;
}
@ -1147,7 +1137,6 @@ namespace std
// Iff valid sequence is not recognized.
if (!__testvalid || !__units.size())
__err |= ios_base::failbit;
return __beg;
}

View File

@ -40,10 +40,10 @@ void test01()
std::map<unsigned, int>::iterator itr(mapByIndex.begin());
// NB: notice, it's not mapByIndex!!
test &= itr != mapByName.end(); // { dg-error "match" "" { xfail *-*-* } }
test &= itr == mapByName.end(); // { dg-error "match" "" { xfail *-*-* } }
test &= itr != mapByName.end(); // { dg-error "no" }
test &= itr == mapByName.end(); // { dg-error "no" }
}
// http://gcc.gnu.org/ml/libstdc++/2000-11/msg00093.html
void test02()
{

View File

@ -22,7 +22,7 @@
#include <set>
#include <string>
make
// { dg-do compile }
// { dg-excess-errors "" }
@ -36,11 +36,9 @@ int main(void)
std::set<unsigned int>::iterator itr(setByIndex.begin());
// NB: it's not setByIndex!!
test &= itr != setByName.end();
// { dg-error "no match for" "" { xfail *-*-* } 41 }
test &= itr == setByName.end();
// { dg-error "no match for" "" { xfail *-*-* } 43 }
test &= itr != setByName.end(); // { dg-error "no" }
test &= itr == setByName.end(); // { dg-error "no" }
return 0;
}