Virgin import of GCC 2.95.1's libstdc++

1 files changed, 111 insertions, 93 deletions

diff --git a/contrib/libstdc++/stl/stl_set.h b/contrib/libstdc++/stl/stl_set.h
index 9ffeaa7..003069c 100644
--- a/contrib/libstdc++/stl/stl_set.h
+++ b/contrib/libstdc++/stl/stl_set.h
@@ -35,158 +35,176 @@ __STL_BEGIN_NAMESPACE
 
 #if defined(__sgi) && !defined(__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32)
 #pragma set woff 1174
+#pragma set woff 1375
 #endif
 
 #ifndef __STL_LIMITED_DEFAULT_TEMPLATES
-template <class Key, class Compare = less<Key>, class Alloc = alloc>
+template <class _Key, class _Compare = less<_Key>,
+          class _Alloc = __STL_DEFAULT_ALLOCATOR(_Key) >
 #else
-template <class Key, class Compare, class Alloc = alloc>
+template <class _Key, class _Compare,
+          class _Alloc = __STL_DEFAULT_ALLOCATOR(_Key) >
 #endif
 class set {
 public:
   // typedefs:
 
-  typedef Key key_type;
-  typedef Key value_type;
-  typedef Compare key_compare;
-  typedef Compare value_compare;
+  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 set
+  typedef _Rb_tree<key_type, value_type, 
+                  _Identity<value_type>, key_compare, _Alloc> _Rep_type;
+  _Rep_type _M_t;  // red-black tree representing set
 public:
-  typedef typename rep_type::const_pointer pointer;
-  typedef typename rep_type::const_pointer const_pointer;
-  typedef typename rep_type::const_reference reference;
-  typedef typename rep_type::const_reference const_reference;
-  typedef typename rep_type::const_iterator iterator;
-  typedef typename rep_type::const_iterator const_iterator;
-  typedef typename rep_type::const_reverse_iterator reverse_iterator;
-  typedef typename rep_type::const_reverse_iterator const_reverse_iterator;
-  typedef typename rep_type::size_type size_type;
-  typedef typename rep_type::difference_type difference_type;
+  typedef typename _Rep_type::const_pointer pointer;
+  typedef typename _Rep_type::const_pointer const_pointer;
+  typedef typename _Rep_type::const_reference reference;
+  typedef typename _Rep_type::const_reference const_reference;
+  typedef typename _Rep_type::const_iterator iterator;
+  typedef typename _Rep_type::const_iterator const_iterator;
+  typedef typename _Rep_type::const_reverse_iterator reverse_iterator;
+  typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
+  typedef typename _Rep_type::size_type size_type;
+  typedef typename _Rep_type::difference_type difference_type;
+  typedef typename _Rep_type::allocator_type allocator_type;
 
   // allocation/deallocation
 
-  set() : t(Compare()) {}
-  explicit set(const Compare& comp) : t(comp) {}
+  set() : _M_t(_Compare(), allocator_type()) {}
+  explicit set(const _Compare& __comp,
+               const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) {}
 
 #ifdef __STL_MEMBER_TEMPLATES
-  template <class InputIterator>
-  set(InputIterator first, InputIterator last)
-    : t(Compare()) { t.insert_unique(first, last); }
-
-  template <class InputIterator>
-  set(InputIterator first, InputIterator last, const Compare& comp)
-    : t(comp) { t.insert_unique(first, last); }
+  template <class _InputIterator>
+  set(_InputIterator __first, _InputIterator __last)
+    : _M_t(_Compare(), allocator_type())
+    { _M_t.insert_unique(__first, __last); }
+
+  template <class _InputIterator>
+  set(_InputIterator __first, _InputIterator __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
 #else
-  set(const value_type* first, const value_type* last) 
-    : t(Compare()) { t.insert_unique(first, last); }
-  set(const value_type* first, const value_type* last, const Compare& comp)
-    : t(comp) { t.insert_unique(first, last); }
-
-  set(const_iterator first, const_iterator last)
-    : t(Compare()) { t.insert_unique(first, last); }
-  set(const_iterator first, const_iterator last, const Compare& comp)
-    : t(comp) { t.insert_unique(first, last); }
+  set(const value_type* __first, const value_type* __last) 
+    : _M_t(_Compare(), allocator_type()) 
+    { _M_t.insert_unique(__first, __last); }
+
+  set(const value_type* __first, 
+      const value_type* __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
+
+  set(const_iterator __first, const_iterator __last)
+    : _M_t(_Compare(), allocator_type()) 
+    { _M_t.insert_unique(__first, __last); }
+
+  set(const_iterator __first, const_iterator __last, const _Compare& __comp,
+      const allocator_type& __a = allocator_type())
+    : _M_t(__comp, __a) { _M_t.insert_unique(__first, __last); }
 #endif /* __STL_MEMBER_TEMPLATES */
 
-  set(const set<Key, Compare, Alloc>& x) : t(x.t) {}
-  set<Key, Compare, Alloc>& operator=(const set<Key, Compare, Alloc>& x) { 
-    t = x.t; 
+  set(const set<_Key,_Compare,_Alloc>& __x) : _M_t(__x._M_t) {}
+  set<_Key,_Compare,_Alloc>& operator=(const set<_Key, _Compare, _Alloc>& __x)
+  { 
+    _M_t = __x._M_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(set<Key, Compare, Alloc>& x) { t.swap(x.t); }
+  key_compare key_comp() const { return _M_t.key_comp(); }
+  value_compare value_comp() const { return _M_t.key_comp(); }
+  allocator_type get_allocator() const { return _M_t.get_allocator(); }
+
+  iterator begin() const { return _M_t.begin(); }
+  iterator end() const { return _M_t.end(); }
+  reverse_iterator rbegin() const { return _M_t.rbegin(); } 
+  reverse_iterator rend() const { return _M_t.rend(); }
+  bool empty() const { return _M_t.empty(); }
+  size_type size() const { return _M_t.size(); }
+  size_type max_size() const { return _M_t.max_size(); }
+  void swap(set<_Key,_Compare,_Alloc>& __x) { _M_t.swap(__x._M_t); }
 
   // insert/erase
-  typedef  pair<iterator, bool> pair_iterator_bool; 
-  pair<iterator,bool> insert(const value_type& x) { 
-    pair<typename rep_type::iterator, bool> p = t.insert_unique(x); 
-    return pair<iterator, bool>(p.first, p.second);
+  pair<iterator,bool> insert(const value_type& __x) { 
+    pair<typename _Rep_type::iterator, bool> __p = _M_t.insert_unique(__x); 
+    return pair<iterator, bool>(__p.first, __p.second);
   }
-  iterator insert(iterator position, const value_type& x) {
-    typedef typename rep_type::iterator rep_iterator;
-    return t.insert_unique((rep_iterator&)position, x);
+  iterator insert(iterator __position, const value_type& __x) {
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    return _M_t.insert_unique((_Rep_iterator&)__position, __x);
   }
 #ifdef __STL_MEMBER_TEMPLATES
-  template <class InputIterator>
-  void insert(InputIterator first, InputIterator last) {
-    t.insert_unique(first, last);
+  template <class _InputIterator>
+  void insert(_InputIterator __first, _InputIterator __last) {
+    _M_t.insert_unique(__first, __last);
   }
 #else
-  void insert(const_iterator first, const_iterator last) {
-    t.insert_unique(first, last);
+  void insert(const_iterator __first, const_iterator __last) {
+    _M_t.insert_unique(__first, __last);
   }
-  void insert(const value_type* first, const value_type* last) {
-    t.insert_unique(first, last);
+  void insert(const value_type* __first, const value_type* __last) {
+    _M_t.insert_unique(__first, __last);
   }
 #endif /* __STL_MEMBER_TEMPLATES */
-  void erase(iterator position) { 
-    typedef typename rep_type::iterator rep_iterator;
-    t.erase((rep_iterator&)position); 
+  void erase(iterator __position) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    _M_t.erase((_Rep_iterator&)__position); 
   }
-  size_type erase(const key_type& x) { 
-    return t.erase(x); 
+  size_type erase(const key_type& __x) { 
+    return _M_t.erase(__x); 
   }
-  void erase(iterator first, iterator last) { 
-    typedef typename rep_type::iterator rep_iterator;
-    t.erase((rep_iterator&)first, (rep_iterator&)last); 
+  void erase(iterator __first, iterator __last) { 
+    typedef typename _Rep_type::iterator _Rep_iterator;
+    _M_t.erase((_Rep_iterator&)__first, (_Rep_iterator&)__last); 
   }
-  void clear() { t.clear(); }
+  void clear() { _M_t.clear(); }
 
   // set 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 find(const key_type& __x) const { return _M_t.find(__x); }
+  size_type count(const key_type& __x) const { return _M_t.count(__x); }
+  iterator lower_bound(const key_type& __x) const {
+    return _M_t.lower_bound(__x);
   }
-  iterator upper_bound(const key_type& x) const {
-    return t.upper_bound(x); 
+  iterator upper_bound(const key_type& __x) const {
+    return _M_t.upper_bound(__x); 
   }
-  pair<iterator,iterator> equal_range(const key_type& x) const {
-    return t.equal_range(x);
+  pair<iterator,iterator> equal_range(const key_type& __x) const {
+    return _M_t.equal_range(__x);
   }
   friend bool operator== __STL_NULL_TMPL_ARGS (const set&, const set&);
   friend bool operator< __STL_NULL_TMPL_ARGS (const set&, const set&);
 };
 
-template <class Key, class Compare, class Alloc>
-inline bool operator==(const set<Key, Compare, Alloc>& x, 
-                       const set<Key, Compare, Alloc>& y) {
-  return x.t == y.t;
+template <class _Key, class _Compare, class _Alloc>
+inline bool operator==(const set<_Key,_Compare,_Alloc>& __x, 
+                       const set<_Key,_Compare,_Alloc>& __y) {
+  return __x._M_t == __y._M_t;
 }
 
-template <class Key, class Compare, class Alloc>
-inline bool operator<(const set<Key, Compare, Alloc>& x, 
-                      const set<Key, Compare, Alloc>& y) {
-  return x.t < y.t;
+template <class _Key, class _Compare, class _Alloc>
+inline bool operator<(const set<_Key,_Compare,_Alloc>& __x, 
+                      const set<_Key,_Compare,_Alloc>& __y) {
+  return __x._M_t < __y._M_t;
 }
 
 #ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER
 
-template <class Key, class Compare, class Alloc>
-inline void swap(set<Key, Compare, Alloc>& x, 
-                 set<Key, Compare, Alloc>& y) {
-  x.swap(y);
+template <class _Key, class _Compare, class _Alloc>
+inline void swap(set<_Key,_Compare,_Alloc>& __x, 
+                 set<_Key,_Compare,_Alloc>& __y) {
+  __x.swap(__y);
 }
 
 #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
 
 #if defined(__sgi) && !defined(__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32)
 #pragma reset woff 1174
+#pragma reset woff 1375
 #endif
 
 __STL_END_NAMESPACE