From bb84e66919817020267815eed4304e543688e722 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@yorick.cygnus.com>
Date: Sun, 2 Nov 1997 20:28:22 +0000
Subject: Makefile.in (install): Some of HEADERS come from the stl dir now.
* Makefile.in (install): Some of HEADERS come from the stl dir now.
* algorithm, deque, functional, iterator, list, map, memory, numeric,
queue, set, stack, utility, vector: Now in stl dir.
stl/:
* algo.h, algobase.h, alloc.h, bvector.h, defalloc.h, deque.h,
function.h, hash_map.h, hash_set.h, hashtable.h, heap.h, iterator.h,
list.h, map.h, multimap.h, multiset.h, pair.h, pthread_alloc.h,
rope.h, ropeimpl.h, set.h, slist.h, stack.h, stl_config.h, tempbuf.h,
tree.h, type_traits.h, vector.h: Update to October 27 SGI snapshot.
* algorithm, deque, functional, hash_map, hash_set, iterator, list,
map, memory, numeric, pthread_alloc, queue, rope, set, slist, stack,
stl_algo.h, stl_algobase.h, stl_alloc.h, stl_bvector.h,
stl_construct.h, stl_deque.h, stl_function.h, stl_hash_fun.h,
stl_hash_map.h, stl_hash_set.h, stl_hashtable.h, stl_heap.h,
stl_iterator.h, stl_list.h, stl_map.h, stl_multimap.h, stl_multiset.h,
stl_numeric.h, stl_pair.h, stl_queue.h, stl_raw_storage_iter.h,
stl_relops.h, stl_rope.h, stl_set.h, stl_slist.h, stl_stack.h,
stl_tempbuf.h, stl_tree.h, stl_uninitialized.h, stl_vector.h,
utility, vector: New files in October 27 SGI snapshot.
From-SVN: r16277
---
libstdc++/stl/multiset.h | 144 +++--------------------------------------------
1 file changed, 9 insertions(+), 135 deletions(-)
(limited to 'libstdc++/stl/multiset.h')
diff --git a/libstdc++/stl/multiset.h b/libstdc++/stl/multiset.h
index 3df4557..3024fd7 100644
--- a/libstdc++/stl/multiset.h
+++ b/libstdc++/stl/multiset.h
@@ -12,7 +12,7 @@
* purpose. It is provided "as is" without express or implied warranty.
*
*
- * Copyright (c) 1996
+ * Copyright (c) 1996,1997
* Silicon Graphics Computer Systems, Inc.
*
* Permission to use, copy, modify, distribute and sell this software
@@ -28,140 +28,14 @@
#define __SGI_STL_MULTISET_H
#include <tree.h>
+#include <stl_multiset.h>
-#ifndef __STL_LIMITED_DEFAULT_TEMPLATES
-template <class Key, class Compare = less<Key>, class Alloc = alloc>
-#else
-template <class Key, class Compare, class Alloc = alloc>
-#endif
-class multiset {
-public:
- // typedefs:
-
- typedef Key key_type;
- typedef Key value_type;
- typedef Compare key_compare;
- typedef Compare value_compare;
-private:
- typedef rb_tree<key_type, value_type,
- identity<value_type>, key_compare, Alloc> rep_type;
- rep_type t; // red-black tree representing multiset
-public:
- typedef rep_type::const_pointer pointer;
- typedef rep_type::const_reference reference;
- typedef rep_type::const_reference const_reference;
- typedef rep_type::const_iterator iterator;
- typedef rep_type::const_iterator const_iterator;
- typedef rep_type::const_reverse_iterator reverse_iterator;
- typedef rep_type::const_reverse_iterator const_reverse_iterator;
- typedef rep_type::size_type size_type;
- typedef rep_type::difference_type difference_type;
-
- // allocation/deallocation
-
- multiset() : t(Compare()) {}
- explicit multiset(const Compare& comp) : t(comp) {}
-
-#ifdef __STL_MEMBER_TEMPLATES
- template <class InputIterator>
- multiset(InputIterator first, InputIterator last)
- : t(Compare()) { t.insert_equal(first, last); }
- template <class InputIterator>
- multiset(InputIterator first, InputIterator last, const Compare& comp)
- : t(comp) { t.insert_equal(first, last); }
-#else
- multiset(const value_type* first, const value_type* last)
- : t(Compare()) { t.insert_equal(first, last); }
- multiset(const value_type* first, const value_type* last,
- const Compare& comp)
- : t(comp) { t.insert_equal(first, last); }
-
- multiset(const_iterator first, const_iterator last)
- : t(Compare()) { t.insert_equal(first, last); }
- multiset(const_iterator first, const_iterator last, const Compare& comp)
- : t(comp) { t.insert_equal(first, last); }
-#endif /* __STL_MEMBER_TEMPLATES */
-
- multiset(const multiset<Key, Compare, Alloc>& x) : t(x.t) {}
- multiset<Key, Compare, Alloc>&
- operator=(const multiset<Key, Compare, Alloc>& x) {
- t = x.t;
- return *this;
- }
-
- // accessors:
-
- key_compare key_comp() const { return t.key_comp(); }
- value_compare value_comp() const { return t.key_comp(); }
- iterator begin() const { return t.begin(); }
- iterator end() const { return t.end(); }
- reverse_iterator rbegin() const { return t.rbegin(); }
- reverse_iterator rend() const { return t.rend(); }
- bool empty() const { return t.empty(); }
- size_type size() const { return t.size(); }
- size_type max_size() const { return t.max_size(); }
- void swap(multiset<Key, Compare, Alloc>& x) { t.swap(x.t); }
-
- // insert/erase
- iterator insert(const value_type& x) {
- return t.insert_equal(x);
- }
- iterator insert(iterator position, const value_type& x) {
- return t.insert_equal((rep_type::iterator&)position, x);
- }
-
-#ifdef __STL_MEMBER_TEMPLATES
- template <class InputIterator>
- void insert(InputIterator first, InputIterator last) {
- t.insert_equal(first, last);
- }
-#else
- void insert(const value_type* first, const value_type* last) {
- t.insert_equal(first, last);
- }
- void insert(const_iterator first, const_iterator last) {
- t.insert_equal(first, last);
- }
-#endif /* __STL_MEMBER_TEMPLATES */
- void erase(iterator position) {
- t.erase((rep_type::iterator&)position);
- }
- size_type erase(const key_type& x) {
- return t.erase(x);
- }
- void erase(iterator first, iterator last) {
- t.erase((rep_type::iterator&)first,
- (rep_type::iterator&)last);
- }
- void clear() { t.clear(); }
-
- // multiset operations:
-
- iterator find(const key_type& x) const { return t.find(x); }
- size_type count(const key_type& x) const { return t.count(x); }
- iterator lower_bound(const key_type& x) const {
- return t.lower_bound(x);
- }
- iterator upper_bound(const key_type& x) const {
- return t.upper_bound(x);
- }
- pair<iterator,iterator> equal_range(const key_type& x) const {
- return t.equal_range(x);
- }
- friend bool operator==(const multiset&, const multiset&);
- friend bool operator<(const multiset&, const multiset&);
-};
-
-template <class Key, class Compare, class Alloc>
-inline bool operator==(const multiset<Key, Compare, Alloc>& x,
- const multiset<Key, Compare, Alloc>& y) {
- return x.t == y.t;
-}
-
-template <class Key, class Compare, class Alloc>
-inline bool operator<(const multiset<Key, Compare, Alloc>& x,
- const multiset<Key, Compare, Alloc>& y) {
- return x.t < y.t;
-}
+#ifdef __STL_USE_NAMESPACES
+using __STD::multiset;
+#endif /* __STL_USE_NAMESPACES */
#endif /* __SGI_STL_MULTISET_H */
+
+// Local Variables:
+// mode:C++
+// End:
--
cgit v1.1