libs/uclibc++/patches/001-lower_bound.patch

   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
   4 @@ -599,7 +599,7 @@
   5                         return retval;
   6                  }
   7
   8 -               retval.first = lower_bound(x.first);
   9 +               retval.first = __base_map<Key, T, Compare, Allocator>::lower_bound(x.first);
  10
  11                 //No match - this should never happen
  12                 if(retval.first == end()){
  13 @@ -616,7 +616,7 @@
  14                 typename deque<pair<Key, T>, allocator<pair<Key, T> > >::iterator q(&data, retval.first.element);
  15                 data.insert(q, x);
  16
  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
  19                 retval.second = true;
  20
  21                 return retval;
  22 @@ -680,7 +680,7 @@
  23                         return end();
  24                 }
  25
  26 -               iterator retval = lower_bound(x);
  27 +               iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
  28
  29                 if(retval == end()){
  30                         return retval;
  31 @@ -702,7 +702,7 @@
  32                         return end();
  33                 }
  34
  35 -               const_iterator retval = lower_bound(x);
  36 +               const_iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
  37
  38                 if(retval == end()){
  39                         return retval;
  40 @@ -730,7 +730,7 @@
  41                 typename map<Key, T, Compare, Allocator>::iterator
  42                 map<Key, T, Compare, Allocator>::upper_bound(const key_type& x)
  43         {
  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) ){
  47                         ++i;
  48                 }
  49 @@ -741,7 +741,7 @@
  50                 typename map<Key, T, Compare, Allocator>::const_iterator
  51                 map<Key, T, Compare, Allocator>::upper_bound(const key_type& x) const
  52         {
  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)){
  56                         ++i;
  57                 }
  58 @@ -757,8 +757,8 @@
  59                 pair<   typename map<Key, T, Compare, Allocator>::iterator,
  60                          typename map<Key, T, Compare, Allocator>::iterator
  61                  > retval;
  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);
  66                 return retval;
  67         }
  68
  69 @@ -770,8 +770,8 @@
  70                 pair<   typename map<Key, T, Compare, Allocator>::const_iterator,
  71                          typename map<Key, T, Compare, Allocator>::const_iterator
  72                  > retval;
  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);
  77                 return retval;
  78         }
  79
  80 @@ -902,7 +902,7 @@
  81                         return end();
  82                  }
  83
  84 -               retval = lower_bound(x.first);
  85 +               retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x.first);
  86
  87                 //No match - this should never happen
  88                 if(retval == end()){
  89 @@ -973,8 +973,8 @@
  90                 typename multimap<Key, T, Compare, Allocator>::size_type
  91                 multimap<Key, T, Compare, Allocator>::erase(const key_type& x)
  92         {
  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;
  98                 erase(f, l);
  99                 return t;
 100 @@ -999,7 +999,7 @@
 101                         return end();
 102                 }
 103
 104 -               iterator retval = lower_bound(x);
 105 +               iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
 106
 107                 if(retval == end()){
 108                         return retval;
 109 @@ -1027,7 +1027,7 @@
 110                 if(data.size() == 0){
 111                         return end();
 112                 }
 113 -               const_iterator retval = lower_bound(x);
 114 +               const_iterator retval = __base_map<Key, T, Compare, Allocator>::lower_bound(x);
 115
 116                 if(retval == end()){
 117                         return retval;
 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)
 121         {
 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);
 124
 125                 while(i != end() && !c(x, i->first)){
 126                         ++i;
 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
 130         {
 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);
 133
 134                 while(i != end() && !c(x, i->first)){
 135                         ++i;
 136 @@ -1094,8 +1094,8 @@
 137                 pair<   typename multimap<Key, T, Compare, Allocator>::iterator,
 138                          typename multimap<Key, T, Compare, Allocator>::iterator
 139                  > retval;
 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);
 144                 return retval;
 145         }
 146
 147 @@ -1107,8 +1107,8 @@
 148                 pair<   typename multimap<Key, T, Compare, Allocator>::const_iterator,
 149                          typename multimap<Key, T, Compare, Allocator>::const_iterator
 150                  > retval;
 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);
 155                 return retval;
 156         }
 157