aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/23_containers/multiset/14340.cc2
-rw-r--r--libstdc++-v3/testsuite/23_containers/set/14340.cc2
3 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6dba489..83dcc26 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-05 Jonathan Wakely <redi@gcc.gnu.org>
+
+ * testsuite/23_containers/{set,multiset}/14340.cc: Fix typos in
+ instantiation of set and multiset (functor param given as int).
+
2004-07-04 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h: Trivial formatting fixes and/or
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/14340.cc b/libstdc++-v3/testsuite/23_containers/multiset/14340.cc
index 354c515..f026130 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/14340.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/14340.cc
@@ -36,7 +36,7 @@
// libstdc++/14340
int main()
{
- typedef std::multiset<int, int> container;
+ typedef std::multiset<int> container;
__gnu_test::conversion<container>::iterator_to_const_iterator();
return 0;
}
diff --git a/libstdc++-v3/testsuite/23_containers/set/14340.cc b/libstdc++-v3/testsuite/23_containers/set/14340.cc
index b24fb4c..d8f403e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/14340.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/14340.cc
@@ -36,7 +36,7 @@
// libstdc++/14340
int main()
{
- typedef std::set<int, int> container;
+ typedef std::set<int> container;
__gnu_test::conversion<container>::iterator_to_const_iterator();
return 0;
}