aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc8
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6b713d5..410d65c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2003-09-30 Paolo Carlini <pcarlini@unitus.it>
+ * testsuite/22_locale/locale/cons/12352.cc: Explicitly
+ qualify exception name.
+
+2003-09-30 Paolo Carlini <pcarlini@unitus.it>
+
PR libstdc++/12438
* include/bits/locale_facets.tcc (locale::combine): Don't
leak memory if _M_replace_facet throws.
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
index 71b0413..06e7e0d 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
@@ -91,7 +91,6 @@ void operator delete[](void* p, const std::nothrow_t&) throw()
// libstdc++/12352
void test01(int iters)
{
- using namespace std;
bool test __attribute__((unused)) = true;
for (int j = 0; j < iters; ++j)
@@ -101,10 +100,11 @@ void test01(int iters)
times_to_fail = i;
try
{
- locale loc1("");
- locale loc2(loc1, locale::classic(), locale::numeric);
+ std::locale loc1("");
+ std::locale loc2(loc1, std::locale::classic(),
+ std::locale::numeric);
}
- catch (exception&)
+ catch (std::exception&)
{
}
}