1 diff -Nur uClibc++-0.2.0/include/map uClibc++-0.2.0-patched/include/map
2 --- uClibc++-0.2.0/include/map 2006-02-28 17:35:16.000000000 -0800
3 +++ uClibc++-0.2.0-patched/include/map 2006-09-06 00:42:25.000000000 -0700
8 - retval.first = lower_bound(x.first);
9 + retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x.first);
11 //No match - this should never happen
12 if(retval.first == end()){
14 typename deque<pair<Key, T>, allocator<pair<Key, T> > >::iterator q(&data, retval.first.element);
17 - retval.first = lower_bound(x.first); //Need to refind because insert can move data around
18 + retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x.first); //Need to refind because insert can move data around
26 - iterator retval = lower_bound(x);
27 + iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
35 - const_iterator retval = lower_bound(x);
36 + const_iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
41 typename map<Key, T, Compare, Allocator>::iterator
42 map<Key, T, Compare, Allocator>::upper_bound(const key_type& x)
44 - typename map<Key, T, Compare, Allocator>::iterator i = lower_bound(x);
45 + typename map<Key, T, Compare, Allocator>::iterator i = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
46 if( i != end() && !c(x, i->first) ){
50 typename map<Key, T, Compare, Allocator>::const_iterator
51 map<Key, T, Compare, Allocator>::upper_bound(const key_type& x) const
53 - typename map<Key, T, Compare, Allocator>::const_iterator i = lower_bound(x);
54 + typename map<Key, T, Compare, Allocator>::const_iterator i = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
55 if(i != end() && !c(x, i->first)){
59 pair< typename map<Key, T, Compare, Allocator>::iterator,
60 typename map<Key, T, Compare, Allocator>::iterator
62 - retval.first = lower_bound(x);
63 - retval.second = upper_bound(x);
64 + retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
65 + retval.second = __base_map<Key, T, Compare, Allocator>::upper_bound(x);
70 pair< typename map<Key, T, Compare, Allocator>::const_iterator,
71 typename map<Key, T, Compare, Allocator>::const_iterator
73 - retval.first = lower_bound(x);
74 - retval.second = upper_bound(x);
75 + retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
76 + retval.second = __base_map<Key, T, Compare, Allocator>::upper_bound(x);
84 - retval = lower_bound(x.first);
85 + retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x.first);
87 //No match - this should never happen
90 typename multimap<Key, T, Compare, Allocator>::size_type
91 multimap<Key, T, Compare, Allocator>::erase(const key_type& x)
93 - typename multimap<Key, T, Compare, Allocator>::iterator f = lower_bound(x);
94 - typename multimap<Key, T, Compare, Allocator>::iterator l = upper_bound(x);
95 + typename multimap<Key, T, Compare, Allocator>::iterator f = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
96 + typename multimap<Key, T, Compare, Allocator>::iterator l = __base_map<Key, T, Compare, Allocator>::upper_bound(x);
97 size_type t = l.element - f.element;
104 - iterator retval = lower_bound(x);
105 + iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
109 @@ -1027,7 +1027,7 @@
110 if(data.size() == 0){
113 - const_iterator retval = lower_bound(x);
114 + const_iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
118 @@ -1065,7 +1065,7 @@
119 typename multimap<Key, T, Compare, Allocator>::iterator
120 multimap<Key, T, Compare, Allocator>::upper_bound(const key_type& x)
122 - typename multimap<Key, T, Compare, Allocator>::iterator i = lower_bound(x);
123 + typename multimap<Key, T, Compare, Allocator>::iterator i = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
125 while(i != end() && !c(x, i->first)){
127 @@ -1077,7 +1077,7 @@
128 typename multimap<Key, T, Compare, Allocator>::const_iterator
129 multimap<Key, T, Compare, Allocator>::upper_bound(const key_type& x) const
131 - typename multimap<Key, T, Compare, Allocator>::const_iterator i = lower_bound(x);
132 + typename multimap<Key, T, Compare, Allocator>::const_iterator i = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
134 while(i != end() && !c(x, i->first)){
136 @@ -1094,8 +1094,8 @@
137 pair< typename multimap<Key, T, Compare, Allocator>::iterator,
138 typename multimap<Key, T, Compare, Allocator>::iterator
140 - retval.first = lower_bound(x);
141 - retval.second = upper_bound(x);
142 + retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
143 + retval.second = __base_map<Key, T, Compare, Allocator>::upper_bound(x);
147 @@ -1107,8 +1107,8 @@
148 pair< typename multimap<Key, T, Compare, Allocator>::const_iterator,
149 typename multimap<Key, T, Compare, Allocator>::const_iterator
151 - retval.first = lower_bound(x);
152 - retval.second = upper_bound(x);
153 + retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
154 + retval.second = __base_map<Key, T, Compare, Allocator>::upper_bound(x);