package/uclibc++/patches/010-gcc47x_support.patch

   1 --- a/include/associative_base
   2 +++ b/include/associative_base
   3 @@ -511,7 +511,7 @@
   4
   5         pair<iterator, bool> insert(const value_type& x){
   6                 pair<iterator, bool> retval;
   7 -               iterator location = lower_bound(value_to_key(x));
   8 +               iterator location = lower_bound(this->value_to_key(x));
   9                 retval.second = true;
  10                 //Empty list or need to insert at end
  11                 if(end() == location){
  12 @@ -520,7 +520,7 @@
  13                         return retval;
  14                 }
  15                 //Something in the list
  16 -               if(c(value_to_key(x), value_to_key(*location))){
  17 +               if(c(this->value_to_key(x), this->value_to_key(*location))){
  18                         location = backing.insert(location.base_iterator(), x);
  19                         retval.first = location;
  20                 }else{
  21 @@ -604,7 +604,7 @@
  22         }
  23
  24         iterator insert(const value_type& x){
  25 -               iterator location = lower_bound(value_to_key(x));
  26 +               iterator location = lower_bound(this->value_to_key(x));
  27
  28                 if(location == begin()){
  29                         backing.push_front(x);
  30 --- a/include/fstream
  31 +++ b/include/fstream
  32 @@ -72,9 +72,9 @@
  33                         pbuffer = new char_type[__UCLIBCXX_IOSTREAM_BUFSIZE__];
  34                         gbuffer = new char_type[__UCLIBCXX_IOSTREAM_BUFSIZE__];
  35
  36 -                       setp(pbuffer, pbuffer + __UCLIBCXX_IOSTREAM_BUFSIZE__);
  37 +                       this->setp(pbuffer, pbuffer + __UCLIBCXX_IOSTREAM_BUFSIZE__);
  38                         //Position get buffer so that there is no data available
  39 -                       setg(gbuffer, gbuffer + __UCLIBCXX_IOSTREAM_BUFSIZE__,
  40 +                       this->setg(gbuffer, gbuffer + __UCLIBCXX_IOSTREAM_BUFSIZE__,
  41                                 gbuffer + __UCLIBCXX_IOSTREAM_BUFSIZE__);
  42                 }
  43
  44 --- a/include/string
  45 +++ b/include/string
  46 @@ -426,7 +426,7 @@
  47         }
  48         _UCXXEXPORT size_type find (Ch c, size_type pos = 0) const{
  49                 for(size_type i = pos; i < length(); ++i){
  50 -                       if(operator[](i) == c){
  51 +                       if(this->operator[](i) == c){
  52                                 return i;
  53                         }
  54                 }
  55 @@ -456,7 +456,7 @@
  56         _UCXXEXPORT size_type find_first_of(const basic_string& str, size_type pos = 0) const{
  57                 for(size_type i = pos; i < length(); ++i){
  58                         for(size_type j = 0; j < str.length() ; ++j){
  59 -                               if( Tr::eq(str[j], operator[](i)) ){
  60 +                               if( Tr::eq(str[j], this->operator[](i)) ){
  61                                         return i;
  62                                 }
  63                         }
  64 @@ -472,7 +472,7 @@
  65         }
  66         _UCXXEXPORT size_type find_first_of(Ch c, size_type pos = 0) const{
  67                 for(size_type i = pos; i< length(); ++i){
  68 -                       if( Tr::eq(operator[](i), c) ){
  69 +                       if( Tr::eq(this->operator[](i), c) ){
  70                                 return i;
  71                         }
  72                 }
  73 @@ -485,7 +485,7 @@
  74                 }
  75                 for(size_type i = pos; i >0 ; --i){
  76                         for(size_type j = 0 ; j < str.length(); ++j){
  77 -                               if( Tr::eq(operator[](i-1), str[j]) ){
  78 +                               if( Tr::eq(this->operator[](i-1), str[j]) ){
  79                                         return i-1;
  80                                 }
  81                         }
  82 @@ -503,7 +503,7 @@
  83                         pos = length();
  84                 }
  85                 for(size_type i = pos; i >0 ; --i){
  86 -                       if( Tr::eq(operator[](i-1), c) ){
  87 +                       if( Tr::eq(this->operator[](i-1), c) ){
  88                                 return i-1;
  89                         }
  90                 }
  91 @@ -515,7 +515,7 @@
  92                 for(size_type i = pos; i < length(); ++i){
  93                         foundCharacter = false;
  94                          for(size_type j = 0; j < str.length() ; ++j){
  95 -                                if( Tr::eq(str[j], operator[](i)) ){
  96 +                                if( Tr::eq(str[j], this->operator[](i)) ){
  97                                         foundCharacter = true;
  98                                  }
  99                          }
 100 @@ -534,7 +534,7 @@
 101         }
 102         _UCXXEXPORT size_type find_first_not_of(Ch c, size_type pos = 0) const{
 103                 for(size_type i = pos; i < length() ; ++i){
 104 -                       if(operator[](i) != c){
 105 +                       if(this->operator[](i) != c){
 106                                 return i;
 107                         }
 108                 }
 109 @@ -546,7 +546,7 @@
 110                         xpos = pos;
 111                 }
 112
 113 -               while(xpos != npos && npos != str.find_first_of(at(xpos))){
 114 +               while(xpos != npos && npos != str.find_first_of(this->at(xpos))){
 115                         --xpos;
 116                 }
 117
 118 @@ -564,7 +564,7 @@
 119                 if(xpos > pos){
 120                         xpos = pos;
 121                 }
 122 -               while(xpos != npos && Tr::eq(at(xpos), c)){
 123 +               while(xpos != npos && Tr::eq(this->at(xpos), c)){
 124                         --xpos;
 125                 }
 126                 return xpos;